From 3173fcd792ecd5c7fd1aed1163374131ac81cdfc Mon Sep 17 00:00:00 2001 From: yurem Date: Tue, 9 Nov 2021 23:14:33 +0300 Subject: [PATCH 01/18] Update Gluu maven repository --- Server/integrations.deprecatred/toopher/sdk/pom.xml | 6 +++--- Server/integrations/pingid/pom.xml | 2 +- oxAuthStatic/pom.xml | 2 +- persistence-model/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Server/integrations.deprecatred/toopher/sdk/pom.xml b/Server/integrations.deprecatred/toopher/sdk/pom.xml index 1d731c5acf..e8ba223f43 100644 --- a/Server/integrations.deprecatred/toopher/sdk/pom.xml +++ b/Server/integrations.deprecatred/toopher/sdk/pom.xml @@ -14,17 +14,17 @@ repository.jboss.org JBoss Repository - http://repository.jboss.org/nexus/content/groups/public-jboss/ + https://repository.jboss.org/nexus/content/groups/public-jboss/ bouncycastle Bouncy Castle - http://repo2.maven.org/maven2/org/bouncycastle + https://repo2.maven.org/maven2/org/bouncycastle gluu Gluu repository - http://ox.gluu.org/maven + https://maven.gluu.org/maven diff --git a/Server/integrations/pingid/pom.xml b/Server/integrations/pingid/pom.xml index eb4f4f9623..a96b6f1af7 100644 --- a/Server/integrations/pingid/pom.xml +++ b/Server/integrations/pingid/pom.xml @@ -73,7 +73,7 @@ gluu Gluu repository - https://ox.gluu.org/maven + https://maven.gluu.org/maven diff --git a/oxAuthStatic/pom.xml b/oxAuthStatic/pom.xml index 07e033a0e5..ba71cd0493 100644 --- a/oxAuthStatic/pom.xml +++ b/oxAuthStatic/pom.xml @@ -8,7 +8,7 @@ jar oxauth-static - http://ox.gluu.org + https://www.gluu.org UTF-8 diff --git a/persistence-model/pom.xml b/persistence-model/pom.xml index 67b8ad7574..695cd032d7 100644 --- a/persistence-model/pom.xml +++ b/persistence-model/pom.xml @@ -11,7 +11,7 @@ oxauth-persistence-model Persistence model - http://maven.apache.org + https://maven.apache.org UTF-8 diff --git a/pom.xml b/pom.xml index a588838504..674362615b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ pom 4.3.1-SNAPSHOT oxAuth - http://www.gluu.org + https://www.gluu.org UTF-8 @@ -67,7 +67,7 @@ gluu Gluu repository - https://ox.gluu.org/maven + https://maven.gluu.org/maven bouncycastle From 656b67966fb908d7fd93455e44ea5c16b9c9f887 Mon Sep 17 00:00:00 2001 From: yurem Date: Thu, 2 Dec 2021 20:29:14 +0300 Subject: [PATCH 02/18] fix: fido2 and U2f auth script are failing in 4.3.1 #1589 --- .../fido2/Fido2ExternalAuthenticator.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Server/integrations/fido2/Fido2ExternalAuthenticator.py b/Server/integrations/fido2/Fido2ExternalAuthenticator.py index 797b4913c0..3aaf43ee84 100644 --- a/Server/integrations/fido2/Fido2ExternalAuthenticator.py +++ b/Server/integrations/fido2/Fido2ExternalAuthenticator.py @@ -4,9 +4,7 @@ # Author: Yuriy Movchan # -from javax.ws.rs.core import Response -from org.jboss.resteasy.client import ClientResponseFailure -from org.jboss.resteasy.client.exception import ResteasyClientException +from javax.ws.rs import ClientErrorException from javax.ws.rs.core import Response from org.gluu.model.custom.script.type.auth import PersonAuthenticationType from org.gluu.fido2.client import Fido2ClientFactory @@ -178,7 +176,7 @@ def prepareForStep(self, configurationAttributes, requestParameters, step): identity.setWorkingParameter("platformAuthenticatorAvailable", "true") else: identity.setWorkingParameter("platformAuthenticatorAvailable", "false") - except ClientResponseFailure, ex: + except ClientErrorException, ex: print "Fido2. Prepare for step 2. Failed to start assertion flow. Exception:", sys.exc_info()[1] return False else: @@ -275,13 +273,6 @@ def getMetaDataConfiguration(self): if (attempt == max_attempts) or (ex.getResponse().getResponseStatus() != Response.Status.SERVICE_UNAVAILABLE): raise ex - java.lang.Thread.sleep(3000) - print "Attempting to load metadata: %d" % attempt - except ResteasyClientException, ex: - # Detect if last try or we still get Service Unavailable HTTP error - if attempt == max_attempts: - raise ex - java.lang.Thread.sleep(3000) print "Attempting to load metadata: %d" % attempt finally: From 912ca043979ebc11ce5d1caa42e470aec14a2518 Mon Sep 17 00:00:00 2001 From: yurem Date: Fri, 3 Dec 2021 15:35:08 +0300 Subject: [PATCH 03/18] fix: fido2 and U2f auth script are failing in 4.3.1 #1589 --- Server/integrations/u2f/U2fExternalAuthenticator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/integrations/u2f/U2fExternalAuthenticator.py b/Server/integrations/u2f/U2fExternalAuthenticator.py index 13d3eebbd1..505ad45715 100644 --- a/Server/integrations/u2f/U2fExternalAuthenticator.py +++ b/Server/integrations/u2f/U2fExternalAuthenticator.py @@ -8,7 +8,7 @@ import sys from javax.ws.rs.core import Response from javax.ws.rs import WebApplicationException -from org.jboss.resteasy.client.exception import ResteasyClientException +from javax.ws.rs import ClientErrorException from org.gluu.model.custom.script.type.auth import PersonAuthenticationType from org.gluu.oxauth.client.fido.u2f import FidoU2fClientFactory from org.gluu.oxauth.model.config import Constants @@ -171,7 +171,7 @@ def prepareForStep(self, configurationAttributes, requestParameters, step): try: authenticationRequestService = FidoU2fClientFactory.instance().createAuthenticationRequestService(self.metaDataConfiguration) authenticationRequest = authenticationRequestService.startAuthentication(user.getUserId(), None, u2f_application_id, session.getId()) - except ClientResponseFailure, ex: + except ClientErrorException, ex: if (ex.getResponse().getResponseStatus() != Response.Status.NOT_FOUND): print "U2F. Prepare for step 2. Failed to start authentication workflow. Exception:", sys.exc_info()[1] return False From fd056fcc4d0dc2fd43307d1d41368dc3dd81feda Mon Sep 17 00:00:00 2001 From: yurem Date: Fri, 3 Dec 2021 22:15:34 +0300 Subject: [PATCH 04/18] fix: fido2 and U2f auth script are failing in 4.3.1 #1589 --- Server/integrations/fido2/Fido2ExternalAuthenticator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/integrations/fido2/Fido2ExternalAuthenticator.py b/Server/integrations/fido2/Fido2ExternalAuthenticator.py index 3aaf43ee84..3ba0ae3832 100644 --- a/Server/integrations/fido2/Fido2ExternalAuthenticator.py +++ b/Server/integrations/fido2/Fido2ExternalAuthenticator.py @@ -200,7 +200,7 @@ def prepareForStep(self, configurationAttributes, requestParameters, step): #, separators=(',', ':')) attestationResponse = attestationService.register(attestationRequest).readEntity(java.lang.String) - except ClientResponseFailure, ex: + except ClientErrorException, ex: print "Fido2. Prepare for step 2. Failed to start attestation flow. Exception:", sys.exc_info()[1] return False @@ -268,7 +268,7 @@ def getMetaDataConfiguration(self): try: self.metaDataConfiguration = metaDataConfigurationService.getMetadataConfiguration().readEntity(java.lang.String) return self.metaDataConfiguration - except ClientResponseFailure, ex: + except ClientErrorException, ex: # Detect if last try or we still get Service Unavailable HTTP error if (attempt == max_attempts) or (ex.getResponse().getResponseStatus() != Response.Status.SERVICE_UNAVAILABLE): raise ex From b5bf11ac3289edd819e08f1e2d5342410d2b4bfc Mon Sep 17 00:00:00 2001 From: YuriyZ Date: Wed, 8 Dec 2021 10:48:27 +0200 Subject: [PATCH 05/18] fix(4.3.1): removed sessionIdEnabled property https://github.com/GluuFederation/oxAuth/issues/900 --- .../oxauth/model/configuration/AppConfiguration.java | 9 --------- .../main/java/org/gluu/oxauth/auth/Authenticator.java | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Model/src/main/java/org/gluu/oxauth/model/configuration/AppConfiguration.java b/Model/src/main/java/org/gluu/oxauth/model/configuration/AppConfiguration.java index 472d9ca776..cdf0d8f778 100644 --- a/Model/src/main/java/org/gluu/oxauth/model/configuration/AppConfiguration.java +++ b/Model/src/main/java/org/gluu/oxauth/model/configuration/AppConfiguration.java @@ -149,7 +149,6 @@ public class AppConfiguration implements Configuration { private int sessionIdUnusedLifetime; private int sessionIdUnauthenticatedUnusedLifetime = 120; // 120 seconds - private Boolean sessionIdEnabled; private Boolean sessionIdPersistOnPromptNone; private Boolean sessionIdRequestParameterEnabled = false; // #1195 private Boolean changeSessionIdOnAuthentication = true; @@ -1430,14 +1429,6 @@ public void setSessionIdRequestParameterEnabled(Boolean sessionIdRequestParamete this.sessionIdRequestParameterEnabled = sessionIdRequestParameterEnabled; } - public Boolean getSessionIdEnabled() { - return sessionIdEnabled; - } - - public void setSessionIdEnabled(Boolean p_sessionIdEnabled) { - sessionIdEnabled = p_sessionIdEnabled; - } - public int getConfigurationUpdateInterval() { return configurationUpdateInterval; } diff --git a/Server/src/main/java/org/gluu/oxauth/auth/Authenticator.java b/Server/src/main/java/org/gluu/oxauth/auth/Authenticator.java index 3b238c379f..27c044dc8c 100644 --- a/Server/src/main/java/org/gluu/oxauth/auth/Authenticator.java +++ b/Server/src/main/java/org/gluu/oxauth/auth/Authenticator.java @@ -692,10 +692,10 @@ public String prepareAuthenticationForStep(SessionId sessionId) { } } - public boolean authenticateBySessionId(String p_sessionId) { - if (StringUtils.isNotBlank(p_sessionId) && appConfiguration.getSessionIdEnabled()) { + public boolean authenticateBySessionId(String sessionIdString) { + if (StringUtils.isNotBlank(sessionIdString)) { try { - SessionId sessionId = sessionIdService.getSessionId(p_sessionId); + SessionId sessionId = sessionIdService.getSessionId(sessionIdString); return authenticateBySessionId(sessionId); } catch (Exception e) { logger.trace(e.getMessage(), e); From 8baefe2b170644902af675abc050f00c4660025a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Dec 2021 08:08:54 +0000 Subject: [PATCH 06/18] chore(deps): bump log4j-api from 2.13.3 to 2.15.0 Bumps log4j-api from 2.13.3 to 2.15.0. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production ... Signed-off-by: dependabot[bot] (cherry picked from commit 82fd52802da3915322d197202dfa917d700958e8) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 674362615b..0e2796db87 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.4.6 - 2.13.3 + 2.15.0 1.7.25 2.2.16 From 8a3f13762ea8abf6c2fe14e9e00b8e51770ada47 Mon Sep 17 00:00:00 2001 From: yurem Date: Tue, 14 Dec 2021 11:26:43 +0300 Subject: [PATCH 07/18] chore: update log4j --- Server/integrations/pingid/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/integrations/pingid/pom.xml b/Server/integrations/pingid/pom.xml index a96b6f1af7..5cdd0154c1 100644 --- a/Server/integrations/pingid/pom.xml +++ b/Server/integrations/pingid/pom.xml @@ -9,7 +9,7 @@ UTF-8 1.8 1.8 - 2.13.3 + 2.15.0 From 02cc989ee034142c9ae0ce2a0882b4351c1f1fce Mon Sep 17 00:00:00 2001 From: yurem Date: Wed, 15 Dec 2021 13:15:26 +0300 Subject: [PATCH 08/18] Version 4.3.1.Final --- Client/pom.xml | 2 +- Model/pom.xml | 2 +- Server/pom.xml | 2 +- common/pom.xml | 2 +- oxAuthStatic/pom.xml | 2 +- persistence-model/pom.xml | 2 +- pom.xml | 14 +++++++------- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Client/pom.xml b/Client/pom.xml index 67b9d136dd..2c8ce8600e 100644 --- a/Client/pom.xml +++ b/Client/pom.xml @@ -9,7 +9,7 @@ org.gluu oxauth - 4.3.1-SNAPSHOT + 4.3.1.Final diff --git a/Model/pom.xml b/Model/pom.xml index 6ce93225ef..fef1f722e8 100644 --- a/Model/pom.xml +++ b/Model/pom.xml @@ -10,7 +10,7 @@ org.gluu oxauth - 4.3.1-SNAPSHOT + 4.3.1.Final diff --git a/Server/pom.xml b/Server/pom.xml index 02cfc7ffb7..60938990e6 100644 --- a/Server/pom.xml +++ b/Server/pom.xml @@ -9,7 +9,7 @@ org.gluu oxauth - 4.3.1-SNAPSHOT + 4.3.1.Final diff --git a/common/pom.xml b/common/pom.xml index 630e606e73..fdd0951c70 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.gluu oxauth - 4.3.1-SNAPSHOT + 4.3.1.Final diff --git a/oxAuthStatic/pom.xml b/oxAuthStatic/pom.xml index ba71cd0493..7bc84e4f0e 100644 --- a/oxAuthStatic/pom.xml +++ b/oxAuthStatic/pom.xml @@ -4,7 +4,7 @@ org.gluu oxauth-static - 4.3.1-SNAPSHOT + 4.3.1.Final jar oxauth-static diff --git a/persistence-model/pom.xml b/persistence-model/pom.xml index 695cd032d7..691f258018 100644 --- a/persistence-model/pom.xml +++ b/persistence-model/pom.xml @@ -7,7 +7,7 @@ org.gluu oxauth - 4.3.1-SNAPSHOT + 4.3.1.Final oxauth-persistence-model Persistence model diff --git a/pom.xml b/pom.xml index 0e2796db87..3e4e4ab3ae 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.gluu oxauth pom - 4.3.1-SNAPSHOT + 4.3.1.Final oxAuth https://www.gluu.org @@ -13,11 +13,11 @@ UTF-8 3.3.9 - 4.3.1-SNAPSHOT - 4.3.1-SNAPSHOT - 4.3.1-SNAPSHOT - 4.3.1-SNAPSHOT - 4.3.1-SNAPSHOT + 4.3.1.Final + 4.3.1.Final + 4.3.1.Final + 4.3.1.Final + 4.3.1.Final 20180813 2.10.1 @@ -101,7 +101,7 @@ org.gluu gluu-core-bom - 4.3.1-SNAPSHOT + 4.3.1.Final import pom From daecfa3716fd2333ede59498b9e4639fdf7c4876 Mon Sep 17 00:00:00 2001 From: yurem Date: Wed, 15 Dec 2021 13:18:43 +0300 Subject: [PATCH 09/18] chore: temporary disable client tests --- Client/src/test/resources/testng.xml | 848 --------------------------- 1 file changed, 848 deletions(-) diff --git a/Client/src/test/resources/testng.xml b/Client/src/test/resources/testng.xml index ad092a855e..89e045c59a 100644 --- a/Client/src/test/resources/testng.xml +++ b/Client/src/test/resources/testng.xml @@ -2,852 +2,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 01cb1b8ff4ab9ab28133d34970b787fb89a55080 Mon Sep 17 00:00:00 2001 From: yurem Date: Wed, 15 Dec 2021 13:31:45 +0300 Subject: [PATCH 10/18] Version 4.3.1.Final --- Server/integrations/pingid/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/integrations/pingid/pom.xml b/Server/integrations/pingid/pom.xml index 5cdd0154c1..ed80f209e8 100644 --- a/Server/integrations/pingid/pom.xml +++ b/Server/integrations/pingid/pom.xml @@ -9,7 +9,7 @@ UTF-8 1.8 1.8 - 2.15.0 + 2.16.0 diff --git a/pom.xml b/pom.xml index 3e4e4ab3ae..b6e562e69e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.4.6 - 2.15.0 + 2.16.0 1.7.25 2.2.16 From 19af7ffbea001ea77667d4c92704bbf141aa42b0 Mon Sep 17 00:00:00 2001 From: yurem Date: Wed, 15 Dec 2021 17:01:18 +0300 Subject: [PATCH 11/18] Revert "chore: temporary disable client tests" This reverts commit daecfa3716fd2333ede59498b9e4639fdf7c4876. --- Client/src/test/resources/testng.xml | 848 +++++++++++++++++++++++++++ 1 file changed, 848 insertions(+) diff --git a/Client/src/test/resources/testng.xml b/Client/src/test/resources/testng.xml index 89e045c59a..ad092a855e 100644 --- a/Client/src/test/resources/testng.xml +++ b/Client/src/test/resources/testng.xml @@ -2,4 +2,852 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 26d8120e6adef867a4a5a85d401cea9f46e5f57b Mon Sep 17 00:00:00 2001 From: yurem Date: Wed, 15 Dec 2021 18:49:19 +0300 Subject: [PATCH 12/18] fix: basic multi auth script failed to connect to ldap server (result code : null). #1568 --- .../BasicMultiAuthConfExternalAuthenticator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/integrations/basic.multi_auth_conf/BasicMultiAuthConfExternalAuthenticator.py b/Server/integrations/basic.multi_auth_conf/BasicMultiAuthConfExternalAuthenticator.py index 879fc94154..91908e7407 100644 --- a/Server/integrations/basic.multi_auth_conf/BasicMultiAuthConfExternalAuthenticator.py +++ b/Server/integrations/basic.multi_auth_conf/BasicMultiAuthConfExternalAuthenticator.py @@ -237,11 +237,11 @@ def createLdapExtendedEntryManagers(self, authConfiguration): else: value_string = str(value) - ldapProperties.setProperty(persistenceType + "." + key, value_string) + ldapProperties.setProperty(persistenceType + "#" + key, value_string) if StringHelper.isNotEmptyString(ldapConfiguration.getBindPassword()): - ldapProperties.setProperty(persistenceType + ".bindPassword", ldapConfiguration.getBindPassword()) - + ldapProperties.setProperty(persistenceType + "#bindPassword", ldapConfiguration.getBindPassword()) + ldapEntryManager = ldapEntryManagerFactory.createEntryManager(ldapProperties) ldapExtendedEntryManagers.append({ "ldapConfiguration" : ldapConfiguration, "ldapProperties" : ldapProperties, "loginAttributes" : ldapExtendedConfiguration["loginAttributes"], "localLoginAttributes" : ldapExtendedConfiguration["localLoginAttributes"], "ldapEntryManager" : ldapEntryManager }) From 058548ef04dfd0e3a8ef5928e5cb4da1c20c8f5a Mon Sep 17 00:00:00 2001 From: Javier Rojas Blum Date: Fri, 17 Dec 2021 02:15:07 -0400 Subject: [PATCH 13/18] fix: login_hint not appearing --- Server/src/main/webapp/login.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/src/main/webapp/login.xhtml b/Server/src/main/webapp/login.xhtml index 51e356fc48..5eeae0b793 100644 --- a/Server/src/main/webapp/login.xhtml +++ b/Server/src/main/webapp/login.xhtml @@ -7,7 +7,7 @@ template="/WEB-INF/incl/layout/login-template.xhtml"> - + @@ -116,7 +116,7 @@ var passwordField = document.getElementById("loginForm:password"); passwordField.value = ""; - var userName = '#{!empty loginAction.loginHint ? loginAction.loginHint : ""}'; + var userName = '#{!empty authorizeAction.loginHint ? authorizeAction.loginHint : ""}'; if (userName) { userNameField.value = userName; passwordField.focus(); From 7f3dc99e3d41fd9dbe5def060a07eeb81c1cc571 Mon Sep 17 00:00:00 2001 From: yurem Date: Mon, 20 Dec 2021 15:15:01 +0300 Subject: [PATCH 14/18] chore: update log4j --- Server/integrations/pingid/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/integrations/pingid/pom.xml b/Server/integrations/pingid/pom.xml index ed80f209e8..7e7f69b150 100644 --- a/Server/integrations/pingid/pom.xml +++ b/Server/integrations/pingid/pom.xml @@ -9,7 +9,7 @@ UTF-8 1.8 1.8 - 2.16.0 + 2.17.0 diff --git a/pom.xml b/pom.xml index b6e562e69e..258748be9f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.4.6 - 2.16.0 + 2.17.0 1.7.25 2.2.16 From 8ff52c9fa6ae8ac83ce29cdd4d34acc48d6f8f91 Mon Sep 17 00:00:00 2001 From: Javier Rojas Blum Date: Wed, 22 Dec 2021 00:39:58 -0400 Subject: [PATCH 15/18] fix: login_hint not appearing --- Server/src/main/webapp/login.xhtml | 43 ++++++++++++++---------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/Server/src/main/webapp/login.xhtml b/Server/src/main/webapp/login.xhtml index 5eeae0b793..1fa6dd085e 100644 --- a/Server/src/main/webapp/login.xhtml +++ b/Server/src/main/webapp/login.xhtml @@ -110,29 +110,6 @@