From 4687b2afb4bf47c18f1d5e51d961084e8974f6f1 Mon Sep 17 00:00:00 2001 From: Roman Strobl Date: Thu, 16 Dec 2021 09:52:34 +0100 Subject: [PATCH 1/2] Fix #645: Update version to 1.2.0 --- pom.xml | 12 ++++++------ powerauth-client-model/pom.xml | 6 +++--- powerauth-java-server/pom.xml | 6 +++--- powerauth-rest-client-spring/pom.xml | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index ccddfffdc..ba9a8a7f9 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ io.getlime.security powerauth-server-parent - 1.2.0-SNAPSHOT + 1.2.0 pom @@ -86,8 +86,8 @@ 1.8 3.2.0 3.0.0-M1 - 3.2.0 - 3.3.1 + 3.3.1 + 3.3.2 3.1.0 @@ -107,17 +107,17 @@ 1.5.3 - 1.6.0 + 1.6.1 4.30.0 - 5.7.2 + 5.8.2 1.4.197 - 1.7.9 + 2.13.0 1.9 diff --git a/powerauth-client-model/pom.xml b/powerauth-client-model/pom.xml index 41f07055e..e7f3d70a1 100644 --- a/powerauth-client-model/pom.xml +++ b/powerauth-client-model/pom.xml @@ -22,14 +22,14 @@ 4.0.0 powerauth-client-model - 1.2.0-SNAPSHOT + 1.2.0 powerauth-client-model PowerAuth Server Client Model io.getlime.security powerauth-server-parent - 1.2.0-SNAPSHOT + 1.2.0 ../pom.xml @@ -42,7 +42,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + ${jackson.version} javax.xml.bind diff --git a/powerauth-java-server/pom.xml b/powerauth-java-server/pom.xml index 3ba797b57..3f842d73d 100644 --- a/powerauth-java-server/pom.xml +++ b/powerauth-java-server/pom.xml @@ -24,13 +24,13 @@ powerauth-java-server PowerAuth Server powerauth-java-server - 1.2.0-SNAPSHOT + 1.2.0 war io.getlime.security powerauth-server-parent - 1.2.0-SNAPSHOT + 1.2.0 ../pom.xml @@ -112,7 +112,7 @@ io.getlime.security powerauth-client-model - 1.2.0-SNAPSHOT + 1.2.0 io.getlime.security diff --git a/powerauth-rest-client-spring/pom.xml b/powerauth-rest-client-spring/pom.xml index d036453c3..954ccc624 100644 --- a/powerauth-rest-client-spring/pom.xml +++ b/powerauth-rest-client-spring/pom.xml @@ -22,14 +22,14 @@ 4.0.0 powerauth-rest-client-spring - 1.2.0-SNAPSHOT + 1.2.0 powerauth-rest-client-spring PowerAuth Server REST Service Client io.getlime.security powerauth-server-parent - 1.2.0-SNAPSHOT + 1.2.0 ../pom.xml @@ -38,7 +38,7 @@ io.getlime.security powerauth-client-model - 1.2.0-SNAPSHOT + 1.2.0 io.getlime.core From e3ec845603e91606d8bc1165fb22f1606472ceaf Mon Sep 17 00:00:00 2001 From: Roman Strobl Date: Thu, 16 Dec 2021 10:04:54 +0100 Subject: [PATCH 2/2] Fix null pointer exception --- .../tasks/v3/CallbackUrlBehavior.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/powerauth-java-server/src/main/java/io/getlime/security/powerauth/app/server/service/behavior/tasks/v3/CallbackUrlBehavior.java b/powerauth-java-server/src/main/java/io/getlime/security/powerauth/app/server/service/behavior/tasks/v3/CallbackUrlBehavior.java index 186591b54..a98418142 100644 --- a/powerauth-java-server/src/main/java/io/getlime/security/powerauth/app/server/service/behavior/tasks/v3/CallbackUrlBehavior.java +++ b/powerauth-java-server/src/main/java/io/getlime/security/powerauth/app/server/service/behavior/tasks/v3/CallbackUrlBehavior.java @@ -158,20 +158,22 @@ public UpdateCallbackUrlResponse updateCallbackUrl(UpdateCallbackUrlRequest requ // Retain existing passwords in case new password is not set HttpAuthenticationPrivate authRequest = request.getAuthentication(); HttpAuthenticationPrivate authExisting = entity.getAuthentication(); - if (authRequest.getCertificate() != null && authExisting.getCertificate() != null) { - if (authExisting.getCertificate().getKeyStorePassword() != null && authRequest.getCertificate().getKeyStorePassword() == null) { - authRequest.getCertificate().setKeyStorePassword(authExisting.getCertificate().getKeyStorePassword()); - } - if (authExisting.getCertificate().getKeyPassword() != null && authRequest.getCertificate().getKeyPassword() == null) { - authRequest.getCertificate().setKeyPassword(authExisting.getCertificate().getKeyPassword()); - } - if (authExisting.getCertificate().getTrustStorePassword() != null && authRequest.getCertificate().getTrustStorePassword() == null) { - authRequest.getCertificate().setTrustStorePassword(authExisting.getCertificate().getTrustStorePassword()); + if (authRequest != null) { + if (authRequest.getCertificate() != null && authExisting.getCertificate() != null) { + if (authExisting.getCertificate().getKeyStorePassword() != null && authRequest.getCertificate().getKeyStorePassword() == null) { + authRequest.getCertificate().setKeyStorePassword(authExisting.getCertificate().getKeyStorePassword()); + } + if (authExisting.getCertificate().getKeyPassword() != null && authRequest.getCertificate().getKeyPassword() == null) { + authRequest.getCertificate().setKeyPassword(authExisting.getCertificate().getKeyPassword()); + } + if (authExisting.getCertificate().getTrustStorePassword() != null && authRequest.getCertificate().getTrustStorePassword() == null) { + authRequest.getCertificate().setTrustStorePassword(authExisting.getCertificate().getTrustStorePassword()); + } } - } - if (authRequest.getHttpBasic() != null && authExisting.getHttpBasic() != null) { - if (authExisting.getHttpBasic().getPassword() != null && authRequest.getHttpBasic().getPassword() == null) { - authRequest.getHttpBasic().setPassword(authExisting.getHttpBasic().getPassword()); + if (authRequest.getHttpBasic() != null && authExisting.getHttpBasic() != null) { + if (authExisting.getHttpBasic().getPassword() != null && authRequest.getHttpBasic().getPassword() == null) { + authRequest.getHttpBasic().setPassword(authExisting.getHttpBasic().getPassword()); + } } } entity.setAuthentication(authRequest);