From a0ba5bd6dbe04b5ea4bb128f87feef467cdd90c0 Mon Sep 17 00:00:00 2001 From: Udara Pathum Date: Wed, 19 Jul 2023 15:37:38 +0530 Subject: [PATCH 1/7] Remove unnecessary registry usages --- .../sso/saml/SAMLInboundSessionContextMgtListener.java | 6 +++--- .../sso/saml/internal/SAMLApplicationMgtListener.java | 9 --------- .../saml/processors/IdPInitSSOAuthnRequestProcessor.java | 4 ++-- .../saml/processors/SPInitSSOAuthnRequestProcessor.java | 4 ++-- .../sso/saml/servlet/SAMLSSOProviderServlet.java | 8 ++++---- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLInboundSessionContextMgtListener.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLInboundSessionContextMgtListener.java index a44c80813..abd742faa 100644 --- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLInboundSessionContextMgtListener.java +++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLInboundSessionContextMgtListener.java @@ -23,11 +23,11 @@ import org.apache.commons.logging.LogFactory; import org.wso2.carbon.identity.application.authentication.framework.context.AuthenticationContext; import org.wso2.carbon.identity.application.authentication.framework.listener.SessionContextMgtListener; -import org.wso2.carbon.registry.core.utils.UUIDGenerator; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; import java.util.HashMap; import java.util.Map; +import java.util.UUID; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -66,9 +66,9 @@ public Map onPreCreateSession(String sessionId, HttpServletReque } if (IdentityTenantUtil.isTenantedSessionsEnabled()) { // Add suffix to the session id for identify saml sso token id cookies which has a tenanted path. - sessionId = UUIDGenerator.generateUUID() + SAMLSSOConstants.TENANT_QUALIFIED_TOKEN_ID_COOKIE_SUFFIX; + sessionId = UUID.randomUUID() + SAMLSSOConstants.TENANT_QUALIFIED_TOKEN_ID_COOKIE_SUFFIX; } else { - sessionId = UUIDGenerator.generateUUID(); + sessionId = UUID.randomUUID().toString(); } } Map map = new HashMap<>(); diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/internal/SAMLApplicationMgtListener.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/internal/SAMLApplicationMgtListener.java index d0bf8aa48..ab9f53a8b 100644 --- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/internal/SAMLApplicationMgtListener.java +++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/internal/SAMLApplicationMgtListener.java @@ -21,8 +21,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.context.RegistryType; import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.StandardInboundProtocols; import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException; import org.wso2.carbon.identity.application.common.IdentityApplicationManagementValidationException; @@ -34,7 +32,6 @@ import org.wso2.carbon.identity.sso.saml.dto.SAMLSSOServiceProviderDTO; import org.wso2.carbon.identity.sso.saml.dto.SAMLSSOServiceProviderInfoDTO; import org.wso2.carbon.identity.sso.saml.util.SAMLSSOUtil; -import org.wso2.carbon.registry.core.Registry; import java.io.ByteArrayInputStream; import java.io.StringWriter; @@ -284,12 +281,6 @@ public void doExportServiceProvider(ServiceProvider serviceProvider, Boolean exp } } - private Registry getConfigSystemRegistry() { - - return (Registry) PrivilegedCarbonContext.getThreadLocalCarbonContext().getRegistry(RegistryType - .SYSTEM_CONFIGURATION); - } - /** * Validate inbound auth SAML configurations. * diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/processors/IdPInitSSOAuthnRequestProcessor.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/processors/IdPInitSSOAuthnRequestProcessor.java index a42fcd4ea..31f25914b 100644 --- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/processors/IdPInitSSOAuthnRequestProcessor.java +++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/processors/IdPInitSSOAuthnRequestProcessor.java @@ -34,10 +34,10 @@ import org.wso2.carbon.identity.sso.saml.internal.IdentitySAMLSSOServiceComponentHolder; import org.wso2.carbon.identity.sso.saml.session.SSOSessionPersistenceManager; import org.wso2.carbon.identity.sso.saml.util.SAMLSSOUtil; -import org.wso2.carbon.registry.core.utils.UUIDGenerator; import java.util.ArrayList; import java.util.List; +import java.util.UUID; public class IdPInitSSOAuthnRequestProcessor implements SSOAuthnRequestProcessor { @@ -116,7 +116,7 @@ public SAMLSSORespDTO process(SAMLSSOAuthnReqDTO authnReqDTO, String sessionId, sessionIndexId = sessionPersistenceManager.getSessionIndexFromTokenId(sessionId, authnReqDTO.getLoggedInTenantDomain()); } else { - sessionIndexId = UUIDGenerator.generateUUID(); + sessionIndexId = UUID.randomUUID().toString(); sessionPersistenceManager.persistSession(sessionId, sessionIndexId, authnReqDTO.getLoggedInTenantDomain()); } diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/processors/SPInitSSOAuthnRequestProcessor.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/processors/SPInitSSOAuthnRequestProcessor.java index b9ae527ea..7902a933d 100644 --- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/processors/SPInitSSOAuthnRequestProcessor.java +++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/processors/SPInitSSOAuthnRequestProcessor.java @@ -37,10 +37,10 @@ import org.wso2.carbon.identity.sso.saml.internal.IdentitySAMLSSOServiceComponentHolder; import org.wso2.carbon.identity.sso.saml.session.SSOSessionPersistenceManager; import org.wso2.carbon.identity.sso.saml.util.SAMLSSOUtil; -import org.wso2.carbon.registry.core.utils.UUIDGenerator; import java.util.ArrayList; import java.util.List; +import java.util.UUID; public class SPInitSSOAuthnRequestProcessor implements SSOAuthnRequestProcessor{ @@ -103,7 +103,7 @@ public SAMLSSORespDTO process(SAMLSSOAuthnReqDTO authnReqDTO, String sessionId, sessionIndexId = sessionPersistenceManager.getSessionIndexFromTokenId(sessionId, authnReqDTO.getLoggedInTenantDomain()); } else { - sessionIndexId = UUIDGenerator.generateUUID(); + sessionIndexId = UUID.randomUUID().toString(); sessionPersistenceManager.persistSession(sessionId, sessionIndexId, authnReqDTO.getLoggedInTenantDomain()); } diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/servlet/SAMLSSOProviderServlet.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/servlet/SAMLSSOProviderServlet.java index 96540bcf4..0a2d3eb22 100644 --- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/servlet/SAMLSSOProviderServlet.java +++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/servlet/SAMLSSOProviderServlet.java @@ -82,7 +82,6 @@ import org.wso2.carbon.identity.sso.saml.util.SAMLSOAPUtils; import org.wso2.carbon.identity.sso.saml.util.SAMLSSOUtil; import org.wso2.carbon.idp.mgt.util.IdPManagementUtil; -import org.wso2.carbon.registry.core.utils.UUIDGenerator; import org.wso2.carbon.user.api.UserStoreException; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; @@ -99,6 +98,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.UUID; import java.util.stream.Collectors; import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; @@ -827,7 +827,7 @@ private void sendToFrameworkForAuthentication(HttpServletRequest req, HttpServle sessionDTO.setProperties(signInRespDTO.getProperties()); sessionDTO.setLoggedInTenantDomain(getLoggedInTenantDomain(req)); - String sessionDataKey = UUIDGenerator.generateUUID(); + String sessionDataKey = UUID.randomUUID().toString(); addSessionDataToCache(sessionDataKey, sessionDTO); String selfPath = ServiceURLBuilder.create().addPath(req.getContextPath()).build().getRelativeInternalURL(); @@ -910,7 +910,7 @@ private void sendToFrameworkForLogout(HttpServletRequest request, HttpServletRes sessionDTO.setValidationRespDTO(signInRespDTO); } - String sessionDataKey = UUIDGenerator.generateUUID(); + String sessionDataKey = UUID.randomUUID().toString(); addSessionDataToCache(sessionDataKey, sessionDTO); String selfPath = ServiceURLBuilder.create().addPath(request.getContextPath()).build().getRelativeInternalURL(); @@ -1240,7 +1240,7 @@ private String getSamlSSOTokenIdFromSessionContext(AuthenticationResult authenti log.debug("Session context identifier is not found in the authentication result."); } } - return UUIDGenerator.generateUUID(); + return UUID.randomUUID().toString(); } private void handleLogoutResponseFromFramework(HttpServletRequest request, HttpServletResponse response, From adc4a7713f7bb620fe4bd110a976e80f2bbe21bc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 20 Jul 2023 06:24:35 +0000 Subject: [PATCH 2/7] [WSO2 Release] [Jenkins #382] [Release 5.11.17] prepare release v5.11.17 --- components/org.wso2.carbon.identity.query.saml/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.common/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml/pom.xml | 2 +- .../pom.xml | 2 +- features/org.wso2.carbon.identity.sso.saml.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.sso.saml.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/org.wso2.carbon.identity.query.saml/pom.xml b/components/org.wso2.carbon.identity.query.saml/pom.xml index 9186eb0ef..ddaa79caa 100644 --- a/components/org.wso2.carbon.identity.query.saml/pom.xml +++ b/components/org.wso2.carbon.identity.query.saml/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17-SNAPSHOT + 5.11.17 4.0.0 org.wso2.carbon.identity.query.saml diff --git a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml index 7ec7fcdc7..c96146fef 100644 --- a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17-SNAPSHOT + 5.11.17 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml index 376f10b62..9e64181cd 100644 --- a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17-SNAPSHOT + 5.11.17 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml index b1d8a8145..2d49ee25c 100644 --- a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17-SNAPSHOT + 5.11.17 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml index 2be37fc79..56399959d 100644 --- a/components/org.wso2.carbon.identity.sso.saml/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17-SNAPSHOT + 5.11.17 4.0.0 diff --git a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml index 06967050f..edce04ba6 100644 --- a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17-SNAPSHOT + 5.11.17 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml index f9c888e3a..494059323 100644 --- a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17-SNAPSHOT + 5.11.17 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml index 6f18dcc46..5817bc6ac 100644 --- a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17-SNAPSHOT + 5.11.17 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml index e36f23bfc..0e07448e6 100644 --- a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17-SNAPSHOT + 5.11.17 4.0.0 diff --git a/pom.xml b/pom.xml index 805745413..968746a9d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 4.0.0 identity-inbound-auth-saml - 5.11.17-SNAPSHOT + 5.11.17 pom WSO2 Carbon SAML SSO @@ -40,7 +40,7 @@ scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git - HEAD + v5.11.17 From c09cd54c82a7052610cb5308c636f30b60c96453 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 20 Jul 2023 06:24:38 +0000 Subject: [PATCH 3/7] [WSO2 Release] [Jenkins #382] [Release 5.11.17] prepare for next development iteration --- components/org.wso2.carbon.identity.query.saml/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.common/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml/pom.xml | 2 +- .../pom.xml | 2 +- features/org.wso2.carbon.identity.sso.saml.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.sso.saml.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/org.wso2.carbon.identity.query.saml/pom.xml b/components/org.wso2.carbon.identity.query.saml/pom.xml index ddaa79caa..39d3f914d 100644 --- a/components/org.wso2.carbon.identity.query.saml/pom.xml +++ b/components/org.wso2.carbon.identity.query.saml/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17 + 5.11.18-SNAPSHOT 4.0.0 org.wso2.carbon.identity.query.saml diff --git a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml index c96146fef..0dcbe69ab 100644 --- a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17 + 5.11.18-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml index 9e64181cd..ab5b6fa0f 100644 --- a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17 + 5.11.18-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml index 2d49ee25c..8029e6867 100644 --- a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17 + 5.11.18-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml index 56399959d..d0840c619 100644 --- a/components/org.wso2.carbon.identity.sso.saml/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17 + 5.11.18-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml index edce04ba6..de1f571c9 100644 --- a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17 + 5.11.18-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml index 494059323..35f97f87c 100644 --- a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17 + 5.11.18-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml index 5817bc6ac..480d196c8 100644 --- a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17 + 5.11.18-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml index 0e07448e6..dd1efcc64 100644 --- a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.17 + 5.11.18-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 968746a9d..54aecd71a 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 4.0.0 identity-inbound-auth-saml - 5.11.17 + 5.11.18-SNAPSHOT pom WSO2 Carbon SAML SSO @@ -40,7 +40,7 @@ scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git - v5.11.17 + HEAD From bff52518a92847921713d8e12691ce0b5cd0e81d Mon Sep 17 00:00:00 2001 From: piraveena Date: Thu, 22 Jun 2023 17:02:00 +0530 Subject: [PATCH 4/7] Add audit logs improvements --- .../org.wso2.carbon.identity.sso.saml/pom.xml | 5 + .../identity/sso/saml/SAMLSSOConstants.java | 9 ++ .../sso/saml/admin/SAMLSSOConfigAdmin.java | 128 +++++++++++++++++- pom.xml | 10 +- 4 files changed, 145 insertions(+), 7 deletions(-) diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml index 2be37fc79..23affc870 100644 --- a/components/org.wso2.carbon.identity.sso.saml/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml @@ -293,6 +293,11 @@ slf4j-api test + + com.fasterxml.jackson.core + jackson-databind + provided + org.apache.felix org.apache.felix.scr.ds-annotations diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLSSOConstants.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLSSOConstants.java index 48bdedd58..0152444d1 100644 --- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLSSOConstants.java +++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAMLSSOConstants.java @@ -200,6 +200,15 @@ private StatusCodes() { } } + /** + * Group the constants related to logs. + */ + public static class LogConstants { + + public static final String CREATE_SAML_APPLICATION = "CREATE SAML APPLICATION"; + public static final String DELETE_SAML_APPLICATION = "DELETE SAML APPLICATION"; + } + public static class SingleLogoutCodes { public static final String LOGOUT_USER = "urn:oasis:names:tc:SAML:2.0:logout:user"; public static final String LOGOUT_ADMIN = "urn:oasis:names:tc:SAML:2.0:logout:admin"; diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java index 81548aa71..3eba89918 100644 --- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java +++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java @@ -18,6 +18,8 @@ package org.wso2.carbon.identity.sso.saml.admin; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,6 +27,8 @@ import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.core.util.KeyStoreManager; +import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser; +import org.wso2.carbon.identity.application.mgt.ApplicationMgtUtil; import org.wso2.carbon.identity.base.IdentityException; import org.wso2.carbon.identity.core.model.SAMLSSOServiceProviderDO; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; @@ -32,6 +36,7 @@ import org.wso2.carbon.identity.sp.metadata.saml2.exception.InvalidMetadataException; import org.wso2.carbon.identity.sp.metadata.saml2.util.Parser; import org.wso2.carbon.identity.sso.saml.Error; +import org.wso2.carbon.identity.sso.saml.SAMLSSOConstants; import org.wso2.carbon.identity.sso.saml.SSOServiceProviderConfigManager; import org.wso2.carbon.identity.sso.saml.dto.SAMLSSOServiceProviderDTO; import org.wso2.carbon.identity.sso.saml.dto.SAMLSSOServiceProviderInfoDTO; @@ -41,10 +46,18 @@ import org.wso2.carbon.identity.sso.saml.util.SAMLSSOUtil; import org.wso2.carbon.registry.core.Registry; import org.wso2.carbon.registry.core.session.UserRegistry; +import org.wso2.carbon.user.core.util.UserCoreUtil; +import org.wso2.carbon.utils.AuditLog; import java.security.KeyStore; import java.security.cert.CertificateException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.LogConstants.USER; +import static org.wso2.carbon.identity.application.mgt.ApplicationConstants.LogConstants.TARGET_APPLICATION; +import static org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils.triggerAuditLogEvent; import static org.wso2.carbon.identity.sso.saml.Error.CONFLICTING_SAML_ISSUER; import static org.wso2.carbon.identity.sso.saml.Error.INVALID_REQUEST; @@ -86,8 +99,22 @@ public boolean addRelyingPartyServiceProvider(SAMLSSOServiceProviderDTO serviceP log.error(message); return false; } - return IdentitySAMLSSOServiceComponentHolder.getInstance().getSAMLSSOServiceProviderManager() + boolean isSuccess = IdentitySAMLSSOServiceComponentHolder.getInstance().getSAMLSSOServiceProviderManager() .addServiceProvider(serviceProviderDO, tenantId); + if (isSuccess && ApplicationMgtUtil.isLegacyAuditLogsDisabledInAppMgt()) { + Optional initiatorId = getInitiatorId(); + if (initiatorId.isPresent()) { + AuditLog.AuditLogBuilder auditLogBuilder = new AuditLog.AuditLogBuilder( + initiatorId.get(), USER, + issuer, TARGET_APPLICATION, + SAMLSSOConstants.LogConstants.CREATE_SAML_APPLICATION) + .data(buildSPData(serviceProviderDO)); + triggerAuditLogEvent(auditLogBuilder, true); + } else { + log.error("Error getting the logged in userId"); + } + } + return isSuccess; } catch (IdentityException e) { String message = "Error obtaining a registry for adding a new service provider"; throw new IdentityException(message, e); @@ -140,7 +167,21 @@ public SAMLSSOServiceProviderDTO addSAMLServiceProvider(SAMLSSOServiceProviderDT String message = "A Service Provider with the name: " + issuer + " is already loaded from the file system."; throw buildClientException(CONFLICTING_SAML_ISSUER, message); } - return persistSAMLServiceProvider(serviceProviderDO); + SAMLSSOServiceProviderDTO samlssoServiceProviderDTO = persistSAMLServiceProvider(serviceProviderDO); + if (ApplicationMgtUtil.isLegacyAuditLogsDisabledInAppMgt()) { + Optional initiatorId = getInitiatorId(); + if (initiatorId.isPresent()) { + AuditLog.AuditLogBuilder auditLogBuilder = new AuditLog.AuditLogBuilder( + initiatorId.get(), USER, + issuer, TARGET_APPLICATION, + SAMLSSOConstants.LogConstants.CREATE_SAML_APPLICATION) + .data(buildSPData(serviceProviderDO)); + triggerAuditLogEvent(auditLogBuilder, true); + } else { + log.error("Error getting the logged in userId"); + } + } + return samlssoServiceProviderDTO; } catch (IdentitySAML2ClientException e){ throw e; } catch (IdentityException e) { @@ -149,6 +190,47 @@ public SAMLSSOServiceProviderDTO addSAMLServiceProvider(SAMLSSOServiceProviderDT } } + private static Map buildSPData(SAMLSSOServiceProviderDO app) { + + if (app == null) { + return new HashMap<>(); + } + + Gson gson = new Gson(); + String json = gson.toJson(app); + return gson.fromJson(json, new TypeToken>() { + }.getType()); + } + + /** + * This method is used to retrieve logged in tenant domain. + * @return logged in tenant domain. + */ + private String getLoggedInTenantDomain() { + + if (!IdentityTenantUtil.isTenantedSessionsEnabled()) { + return getTenantDomain(); + } + return IdentityTenantUtil.getTenantDomainFromContext(); + } + + private Optional getLoggedInUser(String tenantDomain) { + + String tenantAwareLoggedInUsername = CarbonContext.getThreadLocalCarbonContext().getUsername(); + return Optional.ofNullable(tenantAwareLoggedInUsername) + .filter(StringUtils::isNotEmpty) + .map(username -> buildAuthenticatedUser(username, tenantDomain)); + } + + private AuthenticatedUser buildAuthenticatedUser(String tenantAwareUser, String tenantDomain) { + + AuthenticatedUser user = new AuthenticatedUser(); + user.setUserName(UserCoreUtil.removeDomainFromName(tenantAwareUser)); + user.setTenantDomain(tenantDomain); + user.setUserStoreDomain(IdentityUtil.extractDomainFromName(tenantAwareUser)); + return user; + } + /** * Update a service provider if it exists. * @@ -283,8 +365,21 @@ public SAMLSSOServiceProviderDTO uploadRelyingPartyServiceProvider(String metada throw new IdentityException("Error occurred while setting certificate and alias", e); } } - - return persistSAMLServiceProvider(samlssoServiceProviderDO); + SAMLSSOServiceProviderDTO samlssoServiceProviderDTO = persistSAMLServiceProvider(samlssoServiceProviderDO); + if (ApplicationMgtUtil.isLegacyAuditLogsDisabledInAppMgt()) { + Optional initiatorId = getInitiatorId(); + if (initiatorId.isPresent()) { + AuditLog.AuditLogBuilder auditLogBuilder = new AuditLog.AuditLogBuilder( + initiatorId.get(), USER, + samlssoServiceProviderDO.getIssuer(), TARGET_APPLICATION, + SAMLSSOConstants.LogConstants.CREATE_SAML_APPLICATION) + .data(buildSPData(samlssoServiceProviderDO)); + triggerAuditLogEvent(auditLogBuilder, true); + } else { + log.error("Error getting the logged in userId"); + } + } + return samlssoServiceProviderDTO; } /** @@ -599,13 +694,36 @@ public SAMLSSOServiceProviderInfoDTO getServiceProviders() throws IdentityExcept */ public boolean removeServiceProvider(String issuer) throws IdentityException { try { - return IdentitySAMLSSOServiceComponentHolder.getInstance() + boolean isSuccess = IdentitySAMLSSOServiceComponentHolder.getInstance() .getSAMLSSOServiceProviderManager().removeServiceProvider(issuer, tenantId); + if (isSuccess) { + if (ApplicationMgtUtil.isLegacyAuditLogsDisabledInAppMgt()) { + Optional initiatorId = getInitiatorId(); + if (initiatorId.isPresent()) { + AuditLog.AuditLogBuilder auditLogBuilder = new AuditLog.AuditLogBuilder(initiatorId.get(), + USER, issuer, TARGET_APPLICATION, + SAMLSSOConstants.LogConstants.DELETE_SAML_APPLICATION); + triggerAuditLogEvent(auditLogBuilder, true); + } else { + log.error("Error getting the logged in userId"); + } + } + } + return isSuccess; } catch (IdentityException e) { throw new IdentityException("Error removing a Service Provider with issuer: " + issuer, e); } } + private Optional getInitiatorId(){ + + return Optional.ofNullable(CarbonContext.getThreadLocalCarbonContext().getUserId()) + .filter(StringUtils::isNotBlank) + .or(() -> getLoggedInUser(getLoggedInTenantDomain()) + .map(loggedInUser -> IdentityUtil.getInitiatorId(loggedInUser.getUserName(), + getLoggedInTenantDomain()))); + } + protected String getTenantDomain() { return CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); diff --git a/pom.xml b/pom.xml index 805745413..26d95e509 100644 --- a/pom.xml +++ b/pom.xml @@ -261,6 +261,11 @@ axis2-client ${axis2.wso2.version} + + com.fasterxml.jackson.core + jackson-databind + ${com.fasterxml.jackson.version} + org.wso2.carbon.identity.inbound.auth.saml2 org.wso2.carbon.identity.sso.saml.common @@ -450,9 +455,9 @@ - 4.9.0 + 4.9.10 4.9.0 - 5.25.247 + 5.25.258 [5.25.234, 7.0.0) 1.0.0 @@ -470,6 +475,7 @@ 1.2.0.wso2v1 1.6.1.wso2v12 2.9.4.wso2v1 + 2.13.2 3.2.0 2.3.1 From c8a27509a9dfdc8b0906e5a745dc6dfc6f887a12 Mon Sep 17 00:00:00 2001 From: Chamath Samarawickrama Date: Wed, 26 Jul 2023 15:37:50 +0530 Subject: [PATCH 5/7] fix formatting --- .../wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java index 3eba89918..5d7ea32bc 100644 --- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java +++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/admin/SAMLSSOConfigAdmin.java @@ -715,7 +715,7 @@ public boolean removeServiceProvider(String issuer) throws IdentityException { } } - private Optional getInitiatorId(){ + private Optional getInitiatorId() { return Optional.ofNullable(CarbonContext.getThreadLocalCarbonContext().getUserId()) .filter(StringUtils::isNotBlank) From 583bf772ed779a79d23ed9026b3e3ea6170fbee1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 26 Jul 2023 12:28:24 +0000 Subject: [PATCH 6/7] [WSO2 Release] [Jenkins #384] [Release 5.11.18] prepare release v5.11.18 --- components/org.wso2.carbon.identity.query.saml/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.common/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml/pom.xml | 2 +- .../pom.xml | 2 +- features/org.wso2.carbon.identity.sso.saml.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.sso.saml.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/org.wso2.carbon.identity.query.saml/pom.xml b/components/org.wso2.carbon.identity.query.saml/pom.xml index 39d3f914d..ae92310cb 100644 --- a/components/org.wso2.carbon.identity.query.saml/pom.xml +++ b/components/org.wso2.carbon.identity.query.saml/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18-SNAPSHOT + 5.11.18 4.0.0 org.wso2.carbon.identity.query.saml diff --git a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml index 0dcbe69ab..539e8974d 100644 --- a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18-SNAPSHOT + 5.11.18 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml index ab5b6fa0f..b4c4f0949 100644 --- a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18-SNAPSHOT + 5.11.18 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml index 8029e6867..9430a98fa 100644 --- a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18-SNAPSHOT + 5.11.18 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml index 8b5799aae..9cfb34ff3 100644 --- a/components/org.wso2.carbon.identity.sso.saml/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18-SNAPSHOT + 5.11.18 4.0.0 diff --git a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml index de1f571c9..9d424b827 100644 --- a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18-SNAPSHOT + 5.11.18 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml index 35f97f87c..da23d74b6 100644 --- a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18-SNAPSHOT + 5.11.18 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml index 480d196c8..4abec618c 100644 --- a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18-SNAPSHOT + 5.11.18 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml index dd1efcc64..701f8ccdf 100644 --- a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18-SNAPSHOT + 5.11.18 4.0.0 diff --git a/pom.xml b/pom.xml index 39b559441..f0350c211 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 4.0.0 identity-inbound-auth-saml - 5.11.18-SNAPSHOT + 5.11.18 pom WSO2 Carbon SAML SSO @@ -40,7 +40,7 @@ scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git - HEAD + v5.11.18 From 6826ee62e532b0d67ca40bb267b3c259572fe4be Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 26 Jul 2023 12:28:26 +0000 Subject: [PATCH 7/7] [WSO2 Release] [Jenkins #384] [Release 5.11.18] prepare for next development iteration --- components/org.wso2.carbon.identity.query.saml/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.common/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.sso.saml/pom.xml | 2 +- .../pom.xml | 2 +- features/org.wso2.carbon.identity.sso.saml.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.sso.saml.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/org.wso2.carbon.identity.query.saml/pom.xml b/components/org.wso2.carbon.identity.query.saml/pom.xml index ae92310cb..e82362f8f 100644 --- a/components/org.wso2.carbon.identity.query.saml/pom.xml +++ b/components/org.wso2.carbon.identity.query.saml/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18 + 5.11.19-SNAPSHOT 4.0.0 org.wso2.carbon.identity.query.saml diff --git a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml index 539e8974d..e448a16fa 100644 --- a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18 + 5.11.19-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml index b4c4f0949..4364e95bb 100644 --- a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18 + 5.11.19-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml index 9430a98fa..d4e8d554c 100644 --- a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18 + 5.11.19-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml index 9cfb34ff3..cebb47e71 100644 --- a/components/org.wso2.carbon.identity.sso.saml/pom.xml +++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18 + 5.11.19-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml index 9d424b827..2a529500a 100644 --- a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18 + 5.11.19-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml index da23d74b6..8758ef3ad 100644 --- a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18 + 5.11.19-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml index 4abec618c..3fd3de9c4 100644 --- a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18 + 5.11.19-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml index 701f8ccdf..f04e9fb8e 100644 --- a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 identity-inbound-auth-saml ../../pom.xml - 5.11.18 + 5.11.19-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index f0350c211..f646274fc 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.wso2.carbon.identity.inbound.auth.saml2 4.0.0 identity-inbound-auth-saml - 5.11.18 + 5.11.19-SNAPSHOT pom WSO2 Carbon SAML SSO @@ -40,7 +40,7 @@ scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git - v5.11.18 + HEAD