From b57b9b610a38a10e09c6dd61ce2a92013cf66807 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 19 Sep 2023 13:20:23 +0200 Subject: [PATCH 01/16] Fix #448: Update to develop version 1.6.0-SNAPSHOT --- pom.xml | 2 +- powerauth-restful-model/pom.xml | 2 +- powerauth-restful-security-spring-annotation/pom.xml | 2 +- powerauth-restful-security-spring/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c2303f8b..24807c6e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ io.getlime.security powerauth-restful-integration-parent - 1.5.0 + 1.6.0-SNAPSHOT pom 2017 diff --git a/powerauth-restful-model/pom.xml b/powerauth-restful-model/pom.xml index 3ee6c82c..054e4b75 100644 --- a/powerauth-restful-model/pom.xml +++ b/powerauth-restful-model/pom.xml @@ -30,7 +30,7 @@ io.getlime.security powerauth-restful-integration-parent - 1.5.0 + 1.6.0-SNAPSHOT diff --git a/powerauth-restful-security-spring-annotation/pom.xml b/powerauth-restful-security-spring-annotation/pom.xml index e9f4a62f..13ab801f 100644 --- a/powerauth-restful-security-spring-annotation/pom.xml +++ b/powerauth-restful-security-spring-annotation/pom.xml @@ -30,7 +30,7 @@ io.getlime.security powerauth-restful-integration-parent - 1.5.0 + 1.6.0-SNAPSHOT diff --git a/powerauth-restful-security-spring/pom.xml b/powerauth-restful-security-spring/pom.xml index 8c6df5bc..c11b4ed3 100644 --- a/powerauth-restful-security-spring/pom.xml +++ b/powerauth-restful-security-spring/pom.xml @@ -30,7 +30,7 @@ io.getlime.security powerauth-restful-integration-parent - 1.5.0 + 1.6.0-SNAPSHOT From cbf8ea9850bd21792844c8c8c958943407aa7ad4 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Wed, 20 Sep 2023 10:46:57 +0200 Subject: [PATCH 02/16] Fix #450: Restrict import of javax.annotation --- pom.xml | 33 ++++++++++++++++++- .../ResettableStreamHttpServletRequest.java | 4 +-- .../MinimalClaimsUserInfoProvider.java | 2 +- .../PowerAuthAuthenticationProvider.java | 4 +-- .../PowerAuthAuthenticationProviderBase.java | 6 ++-- .../provider/PowerAuthEncryptionProvider.java | 5 ++- .../PowerAuthEncryptionProviderBase.java | 10 +++--- .../api/spring/provider/UserInfoProvider.java | 2 +- 8 files changed, 49 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 24807c6e..4e78e19b 100644 --- a/pom.xml +++ b/pom.xml @@ -78,8 +78,9 @@ 17 ${java.version} ${java.version} - 3.3.0 3.1.1 + 3.4.1 + 3.3.0 3.6.0 3.3.0 3.4.0 @@ -190,6 +191,36 @@ maven-deploy-plugin ${maven-deploy-plugin.version} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + de.skuzzle.enforcer + restrict-imports-enforcer-rule + 2.4.0 + + + + + enforce-banned-java-imports + + enforce + + + + + + Guava depends on jsr305 but we prefer jakarta in our code + javax.annotation.** + + + + + + diff --git a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/filter/ResettableStreamHttpServletRequest.java b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/filter/ResettableStreamHttpServletRequest.java index ee6d03d1..3cc869de 100644 --- a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/filter/ResettableStreamHttpServletRequest.java +++ b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/filter/ResettableStreamHttpServletRequest.java @@ -20,12 +20,12 @@ package io.getlime.security.powerauth.rest.api.spring.filter; import com.google.common.io.ByteStreams; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; + import java.io.*; import java.util.Arrays; diff --git a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/MinimalClaimsUserInfoProvider.java b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/MinimalClaimsUserInfoProvider.java index 6d457291..8ed9a9c4 100644 --- a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/MinimalClaimsUserInfoProvider.java +++ b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/MinimalClaimsUserInfoProvider.java @@ -21,8 +21,8 @@ import com.wultra.core.annotations.PublicSpi; import io.getlime.security.powerauth.rest.api.spring.model.UserInfoContext; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.time.Instant; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthAuthenticationProvider.java b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthAuthenticationProvider.java index e7ce01d4..18cd5556 100644 --- a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthAuthenticationProvider.java +++ b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthAuthenticationProvider.java @@ -50,6 +50,8 @@ import io.getlime.security.powerauth.rest.api.spring.model.ActivationStatus; import io.getlime.security.powerauth.rest.api.spring.model.AuthenticationContext; import io.getlime.security.powerauth.rest.api.spring.service.HttpCustomizationService; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -57,8 +59,6 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.stereotype.Component; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Base64; import java.util.List; diff --git a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthAuthenticationProviderBase.java b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthAuthenticationProviderBase.java index ee04280c..59d3d59e 100644 --- a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthAuthenticationProviderBase.java +++ b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthAuthenticationProviderBase.java @@ -26,12 +26,12 @@ import io.getlime.security.powerauth.rest.api.spring.exception.authentication.PowerAuthRequestFilterException; import io.getlime.security.powerauth.rest.api.spring.model.PowerAuthRequestBody; import io.getlime.security.powerauth.rest.api.spring.model.PowerAuthRequestObjects; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import jakarta.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; diff --git a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthEncryptionProvider.java b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthEncryptionProvider.java index 9b04439d..53e05116 100644 --- a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthEncryptionProvider.java +++ b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthEncryptionProvider.java @@ -25,14 +25,13 @@ import io.getlime.security.powerauth.rest.api.spring.encryption.PowerAuthEncryptorParameters; import io.getlime.security.powerauth.rest.api.spring.exception.PowerAuthEncryptionException; import io.getlime.security.powerauth.rest.api.spring.service.HttpCustomizationService; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - /** * Implementation of PowerAuth encryption provider. * diff --git a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthEncryptionProviderBase.java b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthEncryptionProviderBase.java index 5376a3da..bab6972e 100644 --- a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthEncryptionProviderBase.java +++ b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/PowerAuthEncryptionProviderBase.java @@ -25,7 +25,9 @@ import com.fasterxml.jackson.databind.type.TypeFactory; import io.getlime.security.powerauth.crypto.lib.encryptor.EncryptorFactory; import io.getlime.security.powerauth.crypto.lib.encryptor.ServerEncryptor; -import io.getlime.security.powerauth.crypto.lib.encryptor.model.*; +import io.getlime.security.powerauth.crypto.lib.encryptor.model.EncryptedRequest; +import io.getlime.security.powerauth.crypto.lib.encryptor.model.EncryptedResponse; +import io.getlime.security.powerauth.crypto.lib.encryptor.model.EncryptorParameters; import io.getlime.security.powerauth.crypto.lib.encryptor.model.v3.ServerEncryptorSecrets; import io.getlime.security.powerauth.http.PowerAuthEncryptionHttpHeader; import io.getlime.security.powerauth.http.PowerAuthSignatureHttpHeader; @@ -36,17 +38,17 @@ import io.getlime.security.powerauth.rest.api.model.response.EciesEncryptedResponse; import io.getlime.security.powerauth.rest.api.spring.encryption.EncryptionContext; import io.getlime.security.powerauth.rest.api.spring.encryption.EncryptionScope; -import io.getlime.security.powerauth.rest.api.spring.encryption.PowerAuthEncryptorParameters; import io.getlime.security.powerauth.rest.api.spring.encryption.PowerAuthEncryptorData; +import io.getlime.security.powerauth.rest.api.spring.encryption.PowerAuthEncryptorParameters; import io.getlime.security.powerauth.rest.api.spring.exception.PowerAuthEncryptionException; import io.getlime.security.powerauth.rest.api.spring.model.PowerAuthRequestBody; import io.getlime.security.powerauth.rest.api.spring.model.PowerAuthRequestObjects; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.io.IOException; import java.lang.reflect.Type; import java.util.Base64; diff --git a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/UserInfoProvider.java b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/UserInfoProvider.java index ae7be0f4..d425b8e4 100644 --- a/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/UserInfoProvider.java +++ b/powerauth-restful-security-spring-annotation/src/main/java/io/getlime/security/powerauth/rest/api/spring/provider/UserInfoProvider.java @@ -22,8 +22,8 @@ import com.wultra.core.annotations.PublicSpi; import io.getlime.security.powerauth.rest.api.model.entity.UserInfoStage; import io.getlime.security.powerauth.rest.api.spring.model.UserInfoContext; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.util.Collections; import java.util.Map; From eeb17a0f5da58830159d03786972406349d6a7ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 07:33:06 +0000 Subject: [PATCH 03/16] Bump org.springframework.boot:spring-boot-dependencies Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.3...v3.1.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24807c6e..f639ea2b 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 3.6.0 3.3.0 3.4.0 - 3.1.3 + 3.1.4 1.10.0 1.76 1.7.0 From ee22456c76b79a08ce6a4fbc801f5d9bbe67eab0 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Thu, 19 Oct 2023 15:02:27 +0200 Subject: [PATCH 04/16] Fix #455: PowerAuthClientException#getPowerAuthError is nullable --- pom.xml | 3 ++- .../powerauth/rest/api/spring/service/ActivationService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 24807c6e..e3c8f5c4 100644 --- a/pom.xml +++ b/pom.xml @@ -86,8 +86,9 @@ 3.1.3 1.10.0 1.76 + 1.7.0 - 1.5.0 + 1.6.0-SNAPSHOT 1.5.1 diff --git a/powerauth-restful-security-spring/src/main/java/io/getlime/security/powerauth/rest/api/spring/service/ActivationService.java b/powerauth-restful-security-spring/src/main/java/io/getlime/security/powerauth/rest/api/spring/service/ActivationService.java index 1d2b9cf0..f5a2a95c 100644 --- a/powerauth-restful-security-spring/src/main/java/io/getlime/security/powerauth/rest/api/spring/service/ActivationService.java +++ b/powerauth-restful-security-spring/src/main/java/io/getlime/security/powerauth/rest/api/spring/service/ActivationService.java @@ -469,7 +469,7 @@ public ActivationLayer1Response createActivation(ActivationLayer1Request request } } } catch (PowerAuthClientException ex) { - if (ex.getPowerAuthError() instanceof final PowerAuthErrorRecovery errorRecovery) { + if (ex.getPowerAuthError().orElse(null) instanceof final PowerAuthErrorRecovery errorRecovery) { logger.debug("Invalid recovery code, current PUK index: {}", errorRecovery.getCurrentRecoveryPukIndex()); throw new PowerAuthRecoveryException(ex.getMessage(), "INVALID_RECOVERY_CODE", errorRecovery.getCurrentRecoveryPukIndex()); } From dec1a88fd9b9d5da1de4fb774a4ebdda66491338 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 08:10:41 +0000 Subject: [PATCH 05/16] Bump org.springframework.boot:spring-boot-dependencies Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.4...v3.1.5) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0b2d9f7..f206e1a1 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 3.6.0 3.3.0 3.4.0 - 3.1.4 + 3.1.5 1.10.0 1.76 From 6f02c2a5be4f9391fed380ad37af62f480287e57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 07:22:06 +0000 Subject: [PATCH 06/16] Bump org.apache.commons:commons-text from 1.10.0 to 1.11.0 Bumps org.apache.commons:commons-text from 1.10.0 to 1.11.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f206e1a1..3b12c716 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 3.3.0 3.4.0 3.1.5 - 1.10.0 + 1.11.0 1.76 1.7.0 From 9e68e52c32242dc55a71d03b5439b32bfa04629b Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Mon, 30 Oct 2023 10:10:06 +0100 Subject: [PATCH 07/16] Fix #459: Update Wultra dependencies to SNAPSHOT version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3b12c716..3945babc 100644 --- a/pom.xml +++ b/pom.xml @@ -88,9 +88,9 @@ 1.11.0 1.76 - 1.7.0 + 1.8.0-SNAPSHOT 1.6.0-SNAPSHOT - 1.5.1 + 1.6.0-SNAPSHOT From ec9a55f0c5cf8cc3dbf54500777ce54311731355 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Thu, 21 Sep 2023 13:42:34 +0200 Subject: [PATCH 08/16] Fix #452: Use core-bom --- pom.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 3945babc..f112671f 100644 --- a/pom.xml +++ b/pom.xml @@ -118,14 +118,10 @@ io.getlime.core - annotations - ${wultra-core.version} - - - - io.getlime.core - rest-model-base + core-bom ${wultra-core.version} + pom + import From 1cbc34a96af3a8a486e429b418e9296e9e03d32a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 07:10:05 +0000 Subject: [PATCH 09/16] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to 3.6.2 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.0 to 3.6.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.0...maven-javadoc-plugin-3.6.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f112671f..aa5acdb8 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 3.1.1 3.4.1 3.3.0 - 3.6.0 + 3.6.2 3.3.0 3.4.0 3.1.5 From 149b99f87b70685b14b841f35652fe23f8ae6ff9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 08:00:30 +0000 Subject: [PATCH 10/16] Bump org.bouncycastle:bcprov-jdk18on from 1.76 to 1.77 Bumps [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) from 1.76 to 1.77. - [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcprov-jdk18on dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa5acdb8..aed32381 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 3.4.0 3.1.5 1.11.0 - 1.76 + 1.77 1.8.0-SNAPSHOT 1.6.0-SNAPSHOT From ad19219f1a25229d5626e88e6a6379c4fe598391 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 06:15:49 +0000 Subject: [PATCH 11/16] Bump org.springframework.boot:spring-boot-dependencies Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.1.5 to 3.1.6. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.5...v3.1.6) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aed32381..109c9fbc 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 3.6.2 3.3.0 3.4.0 - 3.1.5 + 3.1.6 1.11.0 1.77 From 69a6cd54dbaf290f55cd6393621f125d1ef25919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Ra=C4=8Dansk=C3=BD?= Date: Mon, 27 Nov 2023 13:07:07 +0100 Subject: [PATCH 12/16] Fix #465: Update Spring Security configuration in the documentation (#466) * Fix #465: Update Spring Security configuration in the documentation --- docs/RESTful-API-for-Spring.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/docs/RESTful-API-for-Spring.md b/docs/RESTful-API-for-Spring.md index 81ff89e9..99c67405 100644 --- a/docs/RESTful-API-for-Spring.md +++ b/docs/RESTful-API-for-Spring.md @@ -194,7 +194,7 @@ public class ApplicationConfiguration implements PowerAuthApplicationConfigurati _(optional)_ -Create a security configuration class `SecurityConfig` extending `WebSecurityConfigurerAdapter`. The configuration we will use: +Create a security configuration class `SecurityConfig` configuring a bean `SecurityFilterChain`. The configuration we will use: - disable default Basic HTTP authentication - disables CSRF (we don't need it for REST) @@ -205,17 +205,18 @@ Create a security configuration class `SecurityConfig` extending `WebSecurityCon ```java @Configuration @EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { +public class SecurityConfig { - @Autowired - private PowerAuthApiAuthenticationEntryPoint apiAuthenticationEntryPoint; - - @Override - protected void configure(HttpSecurity http) throws Exception { - http.authorizeRequests().antMatchers("/secured/**").fullyAuthenticated(); - http.httpBasic().disable(); - http.csrf().disable(); - http.exceptionHandling().authenticationEntryPoint(apiAuthenticationEntryPoint); + @Bean + public SecurityFilterChain filterChain(final HttpSecurity http, final PowerAuthApiAuthenticationEntryPoint apiAuthenticationEntryPoint) throws Exception { + return http + .authorizeHttpRequests(authorize -> authorize + .requestMatchers("/secured/**").fullyAuthenticated()) + .exceptionHandling(exceptionHandling -> + exceptionHandling.authenticationEntryPoint(apiAuthenticationEntryPoint)) + .httpBasic(AbstractHttpConfigurer::disable) + .csrf(AbstractHttpConfigurer::disable) + .build(); } } From cf2aa726e1139525ce2b69633635c5b0d5fc9114 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 07:51:59 +0000 Subject: [PATCH 13/16] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.2 to 3.6.3. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.2...maven-javadoc-plugin-3.6.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 109c9fbc..65e40ae2 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 3.1.1 3.4.1 3.3.0 - 3.6.2 + 3.6.3 3.3.0 3.4.0 3.1.6 From 03e76899c6bca99a3ca060008364360e718629ec Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Fri, 8 Dec 2023 18:08:08 +0100 Subject: [PATCH 14/16] Fix #468: Update logback --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index 65e40ae2..72e43715 100644 --- a/pom.xml +++ b/pom.xml @@ -87,6 +87,8 @@ 3.1.6 1.11.0 1.77 + + 1.4.14 1.8.0-SNAPSHOT 1.6.0-SNAPSHOT @@ -103,6 +105,18 @@ import + + + ch.qos.logback + logback-classic + ${logback.version} + + + ch.qos.logback + logback-core + ${logback.version} + + io.getlime.security From 4b7fb3ce78720735ce0f1a4be8dd31055d7c7a1c Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Wed, 13 Dec 2023 08:13:49 +0100 Subject: [PATCH 15/16] Fix #470: Set release version to 1.6.0 --- pom.xml | 2 +- powerauth-restful-model/pom.xml | 2 +- powerauth-restful-security-spring-annotation/pom.xml | 2 +- powerauth-restful-security-spring/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 72e43715..ec6c6ecd 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ io.getlime.security powerauth-restful-integration-parent - 1.6.0-SNAPSHOT + 1.6.0 pom 2017 diff --git a/powerauth-restful-model/pom.xml b/powerauth-restful-model/pom.xml index 054e4b75..47ad376c 100644 --- a/powerauth-restful-model/pom.xml +++ b/powerauth-restful-model/pom.xml @@ -30,7 +30,7 @@ io.getlime.security powerauth-restful-integration-parent - 1.6.0-SNAPSHOT + 1.6.0 diff --git a/powerauth-restful-security-spring-annotation/pom.xml b/powerauth-restful-security-spring-annotation/pom.xml index 13ab801f..e83175fc 100644 --- a/powerauth-restful-security-spring-annotation/pom.xml +++ b/powerauth-restful-security-spring-annotation/pom.xml @@ -30,7 +30,7 @@ io.getlime.security powerauth-restful-integration-parent - 1.6.0-SNAPSHOT + 1.6.0 diff --git a/powerauth-restful-security-spring/pom.xml b/powerauth-restful-security-spring/pom.xml index c11b4ed3..64707a51 100644 --- a/powerauth-restful-security-spring/pom.xml +++ b/powerauth-restful-security-spring/pom.xml @@ -30,7 +30,7 @@ io.getlime.security powerauth-restful-integration-parent - 1.6.0-SNAPSHOT + 1.6.0 From 6ee0838cab9cc989b28400e35116b46ffd49f60e Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Wed, 13 Dec 2023 08:15:38 +0100 Subject: [PATCH 16/16] Fix #473: Update Wultra dependencies --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 72e43715..01ca3b28 100644 --- a/pom.xml +++ b/pom.xml @@ -90,9 +90,9 @@ 1.4.14 - 1.8.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT + 1.8.0 + 1.6.0 + 1.6.0