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

Jump to bottom

Adex : consent logs for adex RSP #56

Merged
merged 9 commits into from
Jan 19, 2024
Merged

Adex : consent logs for adex RSP #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a181ada
split authentication & authorization
ananjaykumar2 Dec 1, 2023
3d64afd
Adex : consent logs for adex RSP
kailash Oct 16, 2023
4ef89fd
split authentication & authorization
ananjaykumar2 Dec 1, 2023
a608b65
consent logs for adex RSP
ananjaykumar2 Dec 13, 2023
bcfd3db
updated config file
ananjaykumar2 Dec 13, 2023
716b18f
Resolved conflicts
ananjaykumar2 Dec 13, 2023
3ca6172
code refactor and added Junit
ananjaykumar2 Dec 20, 2023
632812c
excluded non PII data from consentLog
ananjaykumar2 Jan 19, 2024
9b64dec
fix vertx instance issue
ananjaykumar2 Jan 19, 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: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
secrets/all-verticles-configs/*.json
secrets/one-verticle-configs/*.json
secrets/*.jks
src/main/resources/*.jks
src/main/resources/*.p12
src/main/resources/*.pfx
.*.env
docker-compose.temp.yml
config.properties
Expand Down
3 changes: 2 additions & 1 deletion examples/configs/config-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"verticleInstances": 8,
"catServerHost": "",
"catServerPort": 1,
"port": 1
"port": 1,
"isAdexInstance": false
},
{
"id": "iudx.rs.proxy.authenticator.AuthenticationVerticle",
Expand Down
67 changes: 57 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>eu.europa.ec.joinup.sd-dss</groupId>
<artifactId>dss-bom</artifactId>
<version>5.12.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -86,6 +93,16 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -198,6 +215,24 @@
<artifactId>client</artifactId>
<version>2.1</version>
</dependency>

<!--cert signing utility-->
<dependency>
<groupId>eu.europa.ec.joinup.sd-dss</groupId>
<artifactId>dss-utils-apache-commons</artifactId>
</dependency>
<dependency>
<groupId>eu.europa.ec.joinup.sd-dss</groupId>
<artifactId>dss-xades</artifactId>
</dependency>
<dependency>
<groupId>eu.europa.ec.joinup.sd-dss</groupId>
<artifactId>dss-cades</artifactId>
</dependency>
<dependency>
<groupId>eu.europa.ec.joinup.sd-dss</groupId>
<artifactId>dss-token</artifactId>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -245,18 +280,22 @@
<exclude>iudx/rs/proxy/deploy/*.class</exclude>
<exclude>**/*AuthenticationService.class</exclude>
<exclude>**/*MeteringService.class</exclude>
<exclude>**/*CacheService.class</exclude>
<exclude>**/*CacheService.class</exclude>
<exclude>**/*Method.class</exclude>
<exclude>**/*DatabaseService.class</exclude>
<exclude>**/*ApiServerConstants.class</exclude>
<exclude>**/*CacheServiceVertxProxyHandler.class</exclude>
<exclude>**/*MeteringServiceVertxProxyHandler.class</exclude>
<exclude>**/*AuthenticationServiceVertxProxyHandler.class</exclude>
<exclude>
**/*AuthenticationServiceVertxProxyHandler.class</exclude>
<exclude>**/ConsentLoggingServiceVertxProxyHandler.class</exclude>
<exclude>**/database/**</exclude>
<!--<exclude>**/metering/**</exclude>-->
<exclude>**/databroker/**</exclude>
<!-- class present in generated-sources -->
<exclude>**/JwtDataConverter.class</exclude>
<exclude>**/PayloadSigningManager.class</exclude>



</excludes>
Expand Down Expand Up @@ -333,14 +372,17 @@
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/io.vertx.core.spi.VerticleFactory
<resource>
META-INF/services/io.vertx.core.spi.VerticleFactory
</resource>
<resource>META-INF/services/io.vertx.core.spi.VertxServiceProvider
<resource>
META-INF/services/io.vertx.core.spi.VertxServiceProvider
</resource>
</transformer>
</transformers>
<artifactSet></artifactSet>
<outputFile>${project.build.directory}/${project.artifactId}-dev-${project.version}-fat.jar
<outputFile>
${project.build.directory}/${project.artifactId}-dev-${project.version}-fat.jar
</outputFile>
</configuration>
</execution>
Expand Down Expand Up @@ -372,14 +414,17 @@
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/io.vertx.core.spi.VerticleFactory
<resource>
META-INF/services/io.vertx.core.spi.VerticleFactory
</resource>
<resource>META-INF/services/io.vertx.core.spi.VertxServiceProvider
<resource>
META-INF/services/io.vertx.core.spi.VertxServiceProvider
</resource>
</transformer>
</transformers>
<artifactSet></artifactSet>
<outputFile>${project.build.directory}/${project.artifactId}-cluster-${project.version}-fat.jar
<outputFile>
${project.build.directory}/${project.artifactId}-cluster-${project.version}-fat.jar
</outputFile>
</configuration>
</execution>
Expand All @@ -405,10 +450,12 @@
<mainClass>iudx.rs.proxy.deploy.DeployerDev </mainClass>
<arguments>
<argument>-jar</argument>
<argument>{project.build.directory}/${project.artifactId}-dev-${project.version}-fat.jar
<argument>
{project.build.directory}/${project.artifactId}-dev-${project.version}-fat.jar
</argument>
<argument>-c</argument>
<argument>./secrets/all-verticles-configs/${config-dev.file}</argument>
<argument>
./secrets/all-verticles-configs/${config-dev.file}</argument>
</arguments>
</configuration>
</execution>
Expand Down
Loading