Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: did truslist generator v2.0.0 #26

Merged
merged 17 commits into from
May 23, 2024
Merged

feat: did truslist generator v2.0.0 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1dc68f3
feat(trustlist): added trustlist v2 generation (WIP)
May 10, 2024
fdc1be8
feat(trustlist-v2): added did for domain and participant
May 10, 2024
50756a0
feat(trustlist-v2): use lowercase alpha 3 countrycode for participants
May 10, 2024
5435817
feat(trustlist-v2): adapted trust list entry id gen fixed checkstyle
May 13, 2024
77c3970
Refactor Key Distribution Service
f11h May 14, 2024
1e04a40
Fix Checkstyle config
f11h May 14, 2024
6ffd812
Replace \ with / inb Fiel saver
f11h May 14, 2024
b1ec223
Downgrade to Java 17
f11h May 14, 2024
09f93b2
Fix Country and Domain Specific DID
f11h May 14, 2024
19d10b6
Fix Dependencies
f11h May 14, 2024
e4ec390
Uppercase Participant Codes
f11h May 17, 2024
f1326d7
Add Group Name Mapping
f11h May 17, 2024
4616d2d
Add randomly generated nonce
f11h May 21, 2024
7e61c39
Cleanup Pom-file
f11h May 21, 2024
dd91266
Add missing DID Specifications
f11h May 21, 2024
525e48a
Add trust chain resolving
f11h May 22, 2024
a072319
Fix Unit-Tests
f11h May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion codestyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
</module>

<module name="TreeWalker">
<module name="SuppressionCommentFilter" />
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
Expand Down Expand Up @@ -315,4 +316,4 @@
<property name="optional" value="true"/>
</module>
</module>
</module>
</module>
100 changes: 19 additions & 81 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- dependencies -->
<owasp.version>8.3.1</owasp.version>
<springdoc.version>2.1.0</springdoc.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<shedlock.version>5.12.0</shedlock.version>
<bcpkix.version>1.77</bcpkix.version>
<bcpkix.version>1.78.1</bcpkix.version>
<!-- plugins -->
<plugin.checkstyle.version>3.3.0</plugin.checkstyle.version>
<plugin.jacoco.version>0.8.10</plugin.jacoco.version>
Expand Down Expand Up @@ -72,45 +71,6 @@
<url>https://github.com/WorldHealthOrganization/tng-key-distribution</url>
</scm>

<profiles>
<profile>
<id>docker</id>
<properties>
<build.profile.id>docker</build.profile.id>
<packaging.format>jar</packaging.format>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<outputDirectory>${project.build.directory}/docker</outputDirectory>
<finalName>ddccg</finalName>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-zip-ACC</id>
<phase>none</phase>
</execution>
<execution>
<id>make-zip-test</id>
<phase>none</phase>
</execution>
<execution>
<id>make-zip-PRD</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
<repository>
<id>who-github</id>
Expand All @@ -137,23 +97,10 @@
</dependency>

<!-- Spring Boot Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>6.1.6</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
Expand All @@ -164,13 +111,23 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>6.1.6</version>
</dependency>

<!-- Persistence Dependencies -->
Expand Down Expand Up @@ -226,6 +183,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.1.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
Expand All @@ -252,14 +214,6 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
<goal>build-info</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -351,22 +305,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
<apiDocsUrl>http://localhost:8080/api/docs</apiDocsUrl>
</configuration>
<executions>
<execution>
<phase>integration-test</phase>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tng/trustnetwork/keydistribution/KeyDistributionServiceApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
@SpringBootApplication
@EnableConfigurationProperties(KdsConfigProperties.class)
@EnableFeignClients
public class KeyDistributionServiceApplication extends SpringBootServletInitializer {
public class KeyDistributionServiceApplication {

/**
* The main Method.
Expand Down
79 changes: 0 additions & 79 deletions src/main/java/tng/trustnetwork/keydistribution/config/ErrorHandler.java
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions src/main/java/tng/trustnetwork/keydistribution/config/KdsConfigProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ public class KdsConfigProperties {

private final DidConfig did = new DidConfig();

private String context = "";

/**
* Http-Proxy Configuration.
*/
Expand Down Expand Up @@ -100,12 +98,14 @@ public static class DidConfig {
private String didId;
private String didController;

private String trustListPath;
private String trustListRefPath;

private String trustListIdPrefix;
private String trustListControllerPrefix;

private String ldProofVerificationMethod;
private String ldProofDomain;
private String ldProofNonce;

private String didSigningProvider;
private String didUploadProvider;
Expand All @@ -118,6 +118,9 @@ public static class DidConfig {

private DgcGatewayConnectorConfigProperties.KeyStoreWithAlias localKeyStore =
new DgcGatewayConnectorConfigProperties.KeyStoreWithAlias();

private List<String> groupDenyList = new ArrayList<>();
private Map<String, String> groupNameMapping = new HashMap<>();

@Getter
@Setter
Expand Down
55 changes: 0 additions & 55 deletions src/main/java/tng/trustnetwork/keydistribution/config/OpenApiConfig.java
View file
Open in desktop

This file was deleted.

Loading
Loading