Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restrict sub organization apps with SAML2 inbound protocol #435

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+78 −17
Open

Restrict sub organization apps with SAML2 inbound protocol #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions components/org.wso2.carbon.identity.sso.saml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.organization.management.core</groupId>
<artifactId>org.wso2.carbon.identity.organization.management.service</artifactId>
</dependency>

<!--SAML Common Util dependency-->
<dependency>
Expand Down Expand Up @@ -328,11 +332,6 @@
<artifactId>org.wso2.carbon.identity.testutil</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.organization.management.core</groupId>
<artifactId>org.wso2.carbon.identity.organization.management.service</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -368,6 +367,8 @@
org.wso2.carbon.idp.mgt; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.application.common;
version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.organization.management.service.util;
version="${org.wso2.carbon.identity.organization.management.core.version.range}",
org.wso2.carbon.identity.application.mgt.listener;
version="${carbon.identity.framework.imp.pkg.version.range}",
org.apache.xerces.impl; resolution:= optional,
Expand Down
14 changes: 13 additions & 1 deletion ...o.saml/src/main/java/org/wso2/carbon/identity/sso/saml/SAML2InboundAuthConfigHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.wso2.carbon.identity.sso.saml;

import org.apache.commons.lang.StringUtils;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants;
import org.wso2.carbon.identity.application.common.IdentityApplicationManagementClientException;
import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
Expand All @@ -30,7 +31,10 @@
import org.wso2.carbon.identity.application.mgt.inbound.dto.InboundProtocolsDTO;
import org.wso2.carbon.identity.application.mgt.inbound.protocol.ApplicationInboundAuthConfigHandler;
import org.wso2.carbon.identity.base.IdentityException;
import org.wso2.carbon.identity.base.IdentityRuntimeException;
import org.wso2.carbon.identity.core.util.IdentityUtil;
import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
import org.wso2.carbon.identity.organization.management.service.util.OrganizationManagementUtil;
import org.wso2.carbon.identity.sso.saml.dto.SAML2ProtocolConfigDTO;
import org.wso2.carbon.identity.sso.saml.dto.SAMLSSOServiceProviderDTO;
import org.wso2.carbon.identity.sso.saml.exception.IdentitySAML2ClientException;
Expand Down Expand Up @@ -60,7 +64,15 @@ public class SAML2InboundAuthConfigHandler implements ApplicationInboundAuthConf
*/
@Override
public boolean canHandle(InboundProtocolsDTO inboundProtocolsDTO) {


try {
String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
if (OrganizationManagementUtil.isOrganization(tenantDomain)) {
return false;
}
} catch (OrganizationManagementException e) {
throw new IdentityRuntimeException("Error while checking the tenant domain.", e);
}
return inboundProtocolsDTO.getInboundProtocolConfigurationMap().containsKey(SAML2);
}

Expand Down
54 changes: 50 additions & 4 deletions ...ml/src/test/java/org/wso2/carbon/identity/sso/saml/SAML2InboundAuthConfigHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,18 @@
import org.powermock.modules.testng.PowerMockTestCase;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants;
import org.wso2.carbon.identity.application.common.model.InboundAuthenticationConfig;
import org.wso2.carbon.identity.application.common.model.InboundAuthenticationRequestConfig;
import org.wso2.carbon.identity.application.common.model.ServiceProvider;
import org.wso2.carbon.identity.application.mgt.inbound.dto.InboundProtocolsDTO;
import org.wso2.carbon.identity.base.IdentityRuntimeException;
import org.wso2.carbon.identity.core.internal.IdentityCoreServiceComponent;
import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
import org.wso2.carbon.identity.organization.management.service.util.OrganizationManagementUtil;
import org.wso2.carbon.identity.sso.saml.dto.SAML2ProtocolConfigDTO;
import org.wso2.carbon.identity.sso.saml.dto.SAMLSSOServiceProviderDTO;
import org.wso2.carbon.identity.sso.saml.internal.IdentitySAMLSSOServiceComponentHolder;
Expand All @@ -49,14 +53,18 @@
import java.util.Map;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.powermock.api.mockito.PowerMockito.mock;
import static org.powermock.api.mockito.PowerMockito.mockStatic;
import static org.powermock.api.mockito.PowerMockito.when;

@PrepareForTest({IdentitySAMLSSOServiceComponentHolder.class, PrivilegedCarbonContext.class})
@PrepareForTest({
IdentitySAMLSSOServiceComponentHolder.class,
PrivilegedCarbonContext.class,
OrganizationManagementUtil.class})
public class SAML2InboundAuthConfigHandlerTest extends PowerMockTestCase {

@Mock
Expand All @@ -76,6 +84,7 @@ public class SAML2InboundAuthConfigHandlerTest extends PowerMockTestCase {
private static final String APPLICATION_NAME = "dummyApplication";
private static final String APPLICATION_RESOURCE_ID = "dummyResourceId";
private static final String META_DATA_URL = "https://localhost:9443/identity/metadata/saml2";
private static final String TENANT_DOMAIN = "tenantDomain";

@BeforeMethod
public void setUp() throws Exception {
Expand All @@ -87,6 +96,43 @@ public void setUp() throws Exception {

initConfigsAndRealm();
}

@DataProvider(name = "organizationDataProvider")
public Object[][] organizationDataProvider() {

return new Object[][]{
{true, false},
{false, true}
};
}

@Test(dataProvider = "organizationDataProvider")
public void testCanHandle(boolean isOrganization, boolean expected) throws Exception{

mockPrivilegeCarbonContext();
mockStatic(OrganizationManagementUtil.class);
when(OrganizationManagementUtil.isOrganization(anyString())).thenReturn(isOrganization);

InboundProtocolsDTO inboundProtocolsDTO = new InboundProtocolsDTO();
SAML2ProtocolConfigDTO saml2ProtocolConfigDTO = new SAML2ProtocolConfigDTO();
inboundProtocolsDTO.addProtocolConfiguration(saml2ProtocolConfigDTO);

Assert.assertEquals(saml2InboundAuthConfigHandler.canHandle(inboundProtocolsDTO), expected);
}

@Test(expectedExceptions = IdentityRuntimeException.class)
public void testCanHandleWithException() throws Exception {

mockPrivilegeCarbonContext();
mockStatic(OrganizationManagementUtil.class);
when(OrganizationManagementUtil.isOrganization(anyString())).thenThrow(OrganizationManagementException.class);

InboundProtocolsDTO inboundProtocolsDTO = new InboundProtocolsDTO();
SAML2ProtocolConfigDTO saml2ProtocolConfigDTO = new SAML2ProtocolConfigDTO();
inboundProtocolsDTO.addProtocolConfiguration(saml2ProtocolConfigDTO);

saml2InboundAuthConfigHandler.canHandle(inboundProtocolsDTO);
}

@Test
public void testCreateInboundSAML2Protocol() throws Exception {
Expand Down Expand Up @@ -203,6 +249,7 @@ private void mockPrivilegeCarbonContext() {
mockStatic(PrivilegedCarbonContext.class);
PrivilegedCarbonContext privilegedCarbonContext = mock(PrivilegedCarbonContext.class);
when(PrivilegedCarbonContext.getThreadLocalCarbonContext()).thenReturn(privilegedCarbonContext);
when(privilegedCarbonContext.getTenantDomain()).thenReturn(TENANT_DOMAIN);
}

private void mockServiceProvider(boolean setInboundAuthConfig) {
Expand Down Expand Up @@ -232,8 +279,7 @@ private Map<String, Object> getDummyMap() {
private String getDummyAuditLogData() {

Gson gson = new Gson();
String json = gson.toJson(getDummyMap());
return gson.fromJson(json, new TypeToken<Map<String, Object>>() {
}.getType());
Map<String, Object> dummyMap = getDummyMap();
return gson.toJson(dummyMap);
}
}
1 change: 1 addition & 0 deletions components/org.wso2.carbon.identity.sso.saml/src/test/resources/testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<suite name="identity-sso-saml-test-suite">
<test name="identity-sso-saml-test-all">
<classes>
<class name="org.wso2.carbon.identity.sso.saml.SAML2InboundAuthConfigHandlerTest"/>
<class name="org.wso2.carbon.identity.sso.saml.util.AssertionBuildingTest" />
<class name="org.wso2.carbon.identity.sso.saml.util.SAMLSSOUtilTest" />
<class name="org.wso2.carbon.identity.sso.saml.util.SAMLSSOUtilMarshallTest" />
Expand Down
15 changes: 8 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@
<artifactId>opensaml</artifactId>
<version>${opensaml3.wso2.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.organization.management.core</groupId>
<artifactId>org.wso2.carbon.identity.organization.management.service</artifactId>
<version>${carbon.identity.organization.management.core.version}</version>
</dependency>

<!--OpenSAML3 dependencies-->
<dependency>
Expand Down Expand Up @@ -365,12 +370,6 @@
<artifactId>xercesImpl</artifactId>
<version>${xercesImpl.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.organization.management.core</groupId>
<artifactId>org.wso2.carbon.identity.organization.management.service</artifactId>
<scope>test</scope>
<version>${carbon.identity.organization.management.core.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand Down Expand Up @@ -484,7 +483,9 @@
<carbon.identity.framework.version>7.0.105</carbon.identity.framework.version>
<carbon.identity.framework.imp.pkg.version.range>[5.25.260, 8.0.0)
</carbon.identity.framework.imp.pkg.version.range>
<carbon.identity.organization.management.core.version>1.0.0</carbon.identity.organization.management.core.version>
<carbon.identity.organization.management.core.version>1.1.19</carbon.identity.organization.management.core.version>
<org.wso2.carbon.identity.organization.management.core.version.range>[1.0.0, 2.0.0)
</org.wso2.carbon.identity.organization.management.core.version.range>

<identity.inbound.auth.saml.version>${project.version}</identity.inbound.auth.saml.version>
<identity.inbound.auth.saml.exp.version>${identity.inbound.auth.saml.version}
Expand Down
Loading