Merge branch 'release-1.1.24'

adorsys · May 3, 2024 · 6b1f660 · 6b1f660
2 parents 076b090 + f9c74e1
commit 6b1f660
Show file tree

Hide file tree

Showing 32 changed files with 67 additions and 89 deletions.
diff --git a/.github/workflows/release-scripts.yml b/.github/workflows/release-scripts.yml
@@ -11,6 +11,8 @@ name: Release
 jobs:
   release_workflow:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Step 1 - Checkout repository code
         uses: actions/checkout@v4

diff --git a/keycloak-storage-provider/pom.xml b/keycloak-storage-provider/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.adorsys.sts</groupId>
         <artifactId>secure-token-service</artifactId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
 
     <artifactId>keycloak-storage-provider</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>de.adorsys.sts</groupId>
     <artifactId>secure-token-service</artifactId>
-    <version>1.1.23</version>
+    <version>1.1.24</version>
     <packaging>pom</packaging>
 
     <name>SecureTokenService</name>
@@ -49,14 +49,13 @@
         <maven.build-timestamp>${maven.build.timestamp}</maven.build-timestamp>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>3.2.4</spring-boot.version>
-        <keystore-management.version>0.0.10</keystore-management.version>
+        <spring-boot.version>3.2.5</spring-boot.version>
+        <keystore-management.version>0.0.11</keystore-management.version>
         <shedlock.version>5.3.0</shedlock.version>
         <openapi.version>2.4.0</openapi.version>
         <swagger-annotations.version>2.2.20</swagger-annotations.version>
         <jackson.version>2.15.1</jackson.version>
         <jackson-databind.version>2.15.1</jackson-databind.version>
-        <bouncycastle.version>1.64</bouncycastle.version>
         <keycloak.version>22.0.4</keycloak.version>
         <surefire.version>3.0.0-M4</surefire.version>
         <jacoco.version>0.8.8</jacoco.version>
@@ -275,20 +274,6 @@
                 <version>${nimbus-jose-jwt.version}</version>
             </dependency>
 
-            <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
-                <version>${bouncycastle.version}</version>
-            </dependency>
-
-            <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on -->
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15on</artifactId>
-                <version>${bouncycastle.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>net.javacrumbs.shedlock</groupId>
                 <artifactId>shedlock-core</artifactId>

diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASS
+echo "$DOCKERHUB_PASS" | docker login -u $DOCKERHUB_USER --password-stdin
 
 # ----- push sts-example -----
 

diff --git a/sts-client-example/package-lock.json b/sts-client-example/package-lock.json
diff --git a/sts-client-example/package.json b/sts-client-example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sts-client-example",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "license": "MIT",
   "scripts": {
     "ng": "npx ng ",

diff --git a/sts-common/pom.xml b/sts-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.adorsys.sts</groupId>
 		<artifactId>secure-token-service</artifactId>
-		<version>1.1.23</version>
+		<version>1.1.24</version>
 	</parent>
 
 	<artifactId>sts-common</artifactId>

diff --git a/sts-e2e-tests/pom.xml b/sts-e2e-tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-e2e-tests/src/test/java/de/adorsys/sts/tests/e2e/testcomponents/AuthServerTestable.java b/sts-e2e-tests/src/test/java/de/adorsys/sts/tests/e2e/testcomponents/AuthServerTestable.java
@@ -7,8 +7,8 @@
 
 public class AuthServerTestable extends LoggingAuthServer {
 
-    public AuthServerTestable(String name, String issUrl, String jwksUrl, int refreshIntervalSeconds) {
-        super(name, issUrl, jwksUrl, refreshIntervalSeconds);
+    public AuthServerTestable(String name, String issUrl, String jwksUrl, int refreshIntervalSeconds, String keyCloakUrl) {
+        super(name, issUrl, jwksUrl, refreshIntervalSeconds, keyCloakUrl);
     }
 
     @Override

diff --git a/...ts/src/test/java/de/adorsys/sts/tests/e2e/testcomponents/AuthServersProviderTestable.java b/...ts/src/test/java/de/adorsys/sts/tests/e2e/testcomponents/AuthServersProviderTestable.java
@@ -46,7 +46,8 @@ private AuthServer mapFromProperties(AuthServerConfigurationProperties.AuthServe
                 properties.getName(),
                 properties.getIssUrl(),
                 properties.getJwksUrl(),
-                properties.getRefreshIntervalSeconds()
+                properties.getRefreshIntervalSeconds(),
+                properties.getKeyCloakUrl()
         );
     }
 }
diff --git a/sts-example/pom.xml b/sts-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-example/src/main/resources/application-dev.yml b/sts-example/src/main/resources/application-dev.yml
@@ -26,9 +26,11 @@ sts:
   - name: local keycloak
     iss-url : http://localhost:8080/auth/realms/moped
     jwks-url: http://localhost:8080/auth/realms/moped/protocol/openid-connect/certs
+    key-cloak-url: http://localhost:8080/auth/realms/moped
   - name: secret-server
     iss-url : http://localhost:8885
     jwks-url: http://localhost:8885/pop
+    key-cloak-url: http://localhost:8085/realms/moped
   resource-servers:
   - audience: sts
     jwks-url: http://localhost:8888/pop

diff --git a/sts-keymanagement/pom.xml b/sts-keymanagement/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-keymanagement/sts-keymanagement-api/pom.xml b/sts-keymanagement/sts-keymanagement-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sts-keymanagement</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-keymanagement/sts-keymanagement-impl/pom.xml b/sts-keymanagement/sts-keymanagement-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sts-keymanagement</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-persistence-jpa/pom.xml b/sts-persistence-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-persistence-mongo/pom.xml b/sts-persistence-mongo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-pop/pom.xml b/sts-pop/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-resource-server/pom.xml b/sts-resource-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-secret-server/pom.xml b/sts-secret-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
 
 

diff --git a/sts-secret/pom.xml b/sts-secret/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-server-info/pom.xml b/sts-server-info/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-service-component-example/pom.xml b/sts-service-component-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-simple-encryption/pom.xml b/sts-simple-encryption/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sts-spring/pom.xml b/sts-spring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/.../src/main/java/de/adorsys/sts/token/authentication/AuthServerConfigurationProperties.java b/.../src/main/java/de/adorsys/sts/token/authentication/AuthServerConfigurationProperties.java
@@ -1,5 +1,7 @@
 package de.adorsys.sts.token.authentication;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
@@ -22,42 +24,13 @@ public void setAuthservers(List<AuthServerProperties> authservers) {
         this.authservers = authservers;
     }
 
+    @Getter
+    @Setter
     public static class AuthServerProperties {
         private String name;
         private String issUrl;
         private String jwksUrl;
         private Integer refreshIntervalSeconds = 600;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getIssUrl() {
-            return issUrl;
-        }
-
-        public void setIssUrl(String issUrl) {
-            this.issUrl = issUrl;
-        }
-
-        public String getJwksUrl() {
-            return jwksUrl;
-        }
-
-        public void setJwksUrl(String jwksUrl) {
-            this.jwksUrl = jwksUrl;
-        }
-
-        public Integer getRefreshIntervalSeconds() {
-            return refreshIntervalSeconds;
-        }
-
-        public void setRefreshIntervalSeconds(Integer refreshIntervalSeconds) {
-            this.refreshIntervalSeconds = refreshIntervalSeconds;
-        }
+        private String keyCloakUrl;
     }
 }
diff --git a/...n/java/de/adorsys/sts/token/authentication/ConfigurationPropertiesAuthServerProvider.java b/...n/java/de/adorsys/sts/token/authentication/ConfigurationPropertiesAuthServerProvider.java
@@ -44,7 +44,8 @@ private AuthServer mapFromProperties(AuthServerConfigurationProperties.AuthServe
                 properties.getName(),
                 properties.getIssUrl(),
                 properties.getJwksUrl(),
-                properties.getRefreshIntervalSeconds()
+                properties.getRefreshIntervalSeconds(),
+                properties.getKeyCloakUrl()
         );
     }
 }
diff --git a/sts-spring/src/main/java/de/adorsys/sts/token/authentication/LoggingAuthServer.java b/sts-spring/src/main/java/de/adorsys/sts/token/authentication/LoggingAuthServer.java
@@ -1,18 +1,14 @@
 package de.adorsys.sts.token.authentication;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jose.jwk.JWK;
 import de.adorsys.sts.tokenauth.AuthServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 public class LoggingAuthServer extends AuthServer {
 
-    public LoggingAuthServer(String name, String issUrl, String jwksUrl, int refreshIntervalSeconds) {
-        super(name, issUrl, jwksUrl, refreshIntervalSeconds);
+    public LoggingAuthServer(String name, String issUrl, String jwksUrl, int refreshIntervalSeconds, String keyCloakUrl) {
+        super(name, issUrl, jwksUrl, refreshIntervalSeconds, keyCloakUrl);
     }
 
     @Override

diff --git a/sts-token-auth/pom.xml b/sts-token-auth/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>secure-token-service</artifactId>
         <groupId>de.adorsys.sts</groupId>
-        <version>1.1.23</version>
+        <version>1.1.24</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>