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.

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(jans-config-api): security issue fix #883

Merged
merged 8 commits into from
Feb 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions jans-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.23.jre7</version>
<version>42.3.2</version>
</dependency>

<!-- SQL Query -->
Expand All @@ -662,7 +662,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner</artifactId>
<version>6.17.3</version>
<version>6.17.4</version>
</dependency>
<!-- Force to use latest grpc libs. We need to remove this once google-cloud-spanner will depend on grpc >= 1.43.0 -->
<dependency>
Expand Down
10 changes: 0 additions & 10 deletions jans-config-api/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,10 @@
<groupId>io.jans</groupId>
<artifactId>jans-config-api-shared</artifactId>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-core-util</artifactId>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-core-model</artifactId>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-auth-common</artifactId>
</dependency>


<!-- RestEasy -->
<dependency>
Expand All @@ -53,7 +44,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>

</dependencies>
Expand Down
13 changes: 13 additions & 0 deletions jans-config-api/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,17 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
1 change: 0 additions & 1 deletion jans-config-api/plugins/scim-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>deploy-to-local-folder</id>
Expand Down
2 changes: 1 addition & 1 deletion jans-config-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<jans.version>1.0.0-SNAPSHOT</jans.version>
<weld.version>3.1.2.Final</weld.version>
<jetty.version>9.4.44.v20210927</jetty.version>
<jetty.version>11.0.1</jetty.version>
<resteasy.version>4.5.10.Final</resteasy.version>
<jackson.version>2.10.1</jackson.version>
<microprofile.version>3.0</microprofile.version>
Expand Down
20 changes: 10 additions & 10 deletions jans-config-api/profiles/local/test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ test.scopes=https://jans.io/oauth/config/acrs.readonly https://jans.io/oauth/con
#test.issuer=https:// pujavs.jans.server3

# jans.server1
#token.endpoint=https://jans.server1/jans-auth/restv1/token
#token.grant.type=client_credentials
#test.client.id=1800.df97feac-c94e-468d-9e22-48946da45403
#test.client.secret=OL13IYRG0IjV
#test.issuer=https://jans.server1
token.endpoint=https://jans.server1/jans-auth/restv1/token
token.grant.type=client_credentials
test.client.id=1800.d166622d-6771-4d5a-8fab-555566b20091
test.client.secret=slkveBOhwJn5
test.issuer=https://jans.server1

# jans.server2
#token.endpoint=https://jans.server2/jans-auth/restv1/token
Expand All @@ -60,10 +60,10 @@ test.scopes=https://jans.io/oauth/config/acrs.readonly https://jans.io/oauth/con
#test.issuer=https://jans.server3

# jans.server4
token.endpoint=https://jans.server4/jans-auth/restv1/token
token.grant.type=client_credentials
test.client.id=1800.7e78990f-fdae-40e9-9433-4fe20645851d
test.client.secret=GfUrIapPM71X
test.issuer=https://jans.server4
#token.endpoint=https://jans.server4/jans-auth/restv1/token
#token.grant.type=client_credentials
#test.client.id=1800.7e78990f-fdae-40e9-9433-4fe20645851d
#test.client.secret=GfUrIapPM71X
#test.issuer=https://jans.server4


6 changes: 4 additions & 2 deletions jans-config-api/server/src/main/resources/log4j2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,11 @@
<AppenderRef ref="JANS_CONFIGAPI_SCRIPT_LOG_FILE" />
</logger>

<Root level="ERROR">
<AppenderRef ref="Console" />
<Root level="INFO">
<AppenderRef ref="FILE" />
<AppenderRef ref="STDOUT" />
</Root>

</Loggers>

</Configuration>
9 changes: 0 additions & 9 deletions jans-config-api/shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
<dependencies>

<!-- jans -->
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-core-util</artifactId>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-core-model</artifactId>
Expand All @@ -35,11 +31,6 @@
<groupId>io.jans</groupId>
<artifactId>jans-core-service</artifactId>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-client-api</artifactId>
</dependency>


<!-- Weld -->
<dependency>
Expand Down