Skip to content

Commit

Permalink
Merge pull request #17333 from AnuradhaSK/fix-int-test
Browse files Browse the repository at this point in the history 
Fix test failures in SystemScopePermissionValidationTestCase with new authz runtime
  • Loading branch information
@thanujalk
thanujalk authored Oct 28, 2023
2 parents 2b57b69 + a3e09f3 commit b044de1
Show file tree
Hide file tree
Showing 13 changed files with 1,876 additions and 7 deletions.
35 changes: 35 additions & 0 deletions .../java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceAbstractIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
import org.wso2.identity.integration.common.clients.oauth.OauthAdminClient;
import org.wso2.identity.integration.common.clients.usermgt.remote.RemoteUserStoreManagerServiceClient;
import org.wso2.identity.integration.common.utils.ISIntegrationTest;
import org.wso2.identity.integration.test.rest.api.server.api.resource.v1.model.APIResourceListItem;
import org.wso2.identity.integration.test.rest.api.server.api.resource.v1.model.ScopeGetModel;
import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.*;
import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.ClaimConfiguration.DialectEnum;
import org.wso2.identity.integration.test.restclients.OAuth2RestClient;
Expand Down Expand Up @@ -898,4 +900,37 @@ public String getPublicCertificate(CloseableHttpClient client, String endPoint)
JSONObject json = (JSONObject) parser.parse(EntityUtils.toString(response.getEntity()));
return ((JSONArray) ((JSONObject)((JSONArray) json.get("keys")).get(0)).get("x5c")).get(0).toString();
}

/**
* Authorize list of SYSTEM APIs to an application.
*
* @param applicationId Application id.
* @param apiIdentifiers API identifiers to authorize.
* @throws Exception Error occured while authorizing APIs.
*/
public void authorizeSystemAPIs(String applicationId, List<String> apiIdentifiers) throws Exception {

apiIdentifiers.stream().forEach(apiIdentifier -> {
try {
List<APIResourceListItem> filteredAPIResource =
restClient.getAPIResourcesWithFiltering("type+eq+SYSTEM+and+identifier+eq+" + apiIdentifier);
if (filteredAPIResource == null) {
return;
}
String apiId = filteredAPIResource.get(0).getId();
// Get API scopes.
List<ScopeGetModel> apiResourceScopes = restClient.getAPIResourceScopes(apiId);
AuthorizedAPICreationModel authorizedAPICreationModel = new AuthorizedAPICreationModel();
authorizedAPICreationModel.setId(apiId);
authorizedAPICreationModel.setPolicyIdentifier("RBAC");
apiResourceScopes.forEach(scope -> {
authorizedAPICreationModel.addScopesItem(scope.getName());
});
restClient.addAPIAuthorizationToApplication(applicationId, authorizedAPICreationModel);
} catch (Exception e) {
throw new RuntimeException("Error while authorizing system API " + apiIdentifier + " to application "
+ applicationId, e);
}
});
}
}
62 changes: 56 additions & 6 deletions ...va/org/wso2/identity/integration/test/oauth2/SystemScopePermissionValidationTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,30 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Factory;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.wso2.carbon.automation.engine.context.AutomationContext;
import org.wso2.carbon.automation.engine.context.TestUserMode;
import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.ApplicationResponseModel;
import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.OpenIDConnectConfiguration;
import org.wso2.identity.integration.test.utils.DataExtractUtil;
import org.wso2.identity.integration.test.utils.OAuth2Constant;

import java.io.ByteArrayInputStream;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;

import static org.wso2.identity.integration.test.utils.DataExtractUtil.KeyValue;

public class SystemScopePermissionValidationTestCase extends OAuth2ServiceAbstractIntegrationTest {
Expand All @@ -68,6 +79,8 @@ public class SystemScopePermissionValidationTestCase extends OAuth2ServiceAbstra
private final TestUserMode testUserMode;

private static final String SYSTEM_SCOPE = "SYSTEM";
private static final String ENABLE_LEGACY_AUTHZ_RUNTIME_CONFIG = "EnableLegacyAuthzRuntime";
private static boolean isLegacyRuntimeEnabled;
private String applicationId;

@DataProvider(name = "configProvider")
Expand All @@ -94,6 +107,7 @@ public void testInit() throws Exception {

setSystemproperties();
client = HttpClientBuilder.create().build();
isLegacyRuntimeEnabled = isLegacyAuthzRuntimeEnabled();
}

@AfterClass(alwaysRun = true)
Expand All @@ -119,6 +133,12 @@ public void testRegisterApplication() throws Exception {

consumerSecret = oidcConfig.getClientSecret();
Assert.assertNotNull(consumerSecret, "Application creation failed.");

if (!isLegacyRuntimeEnabled) {
// Authorize few system APIs.
authorizeSystemAPIs(applicationId,
new ArrayList<>(Arrays.asList("/api/server/v1/tenants", "/scim2/Users")));
}
}

@Test(groups = "wso2.is", description = "Send authorize user request and get access token", dependsOnMethods = "testRegisterApplication")
Expand Down Expand Up @@ -180,8 +200,10 @@ public void getTokenAndValidate() throws Exception {
AccessTokenResponse tokenResponse = AccessTokenResponse.parse(tokenHTTPResp);
Assert.assertNotNull(tokenResponse, "Access token response is null.");
accessToken = tokenResponse.getTokens().getAccessToken().getValue();
String scope = getScopesFromIntrospectionResponse();
doTheScopeValidationBasedOnTheTestUserMode(scope, false);
if (isLegacyRuntimeEnabled) {
String scope = getScopesFromIntrospectionResponse();
doTheScopeValidationBasedOnTheTestUserMode(scope, false);
}
} finally {
client.close();
}
Expand All @@ -200,15 +222,17 @@ private String getScopesFromIntrospectionResponse() throws Exception {
private void doTheScopeValidationBasedOnTheTestUserMode(String scope, boolean isClientCredentialsGrant) {

if (testUserMode == TestUserMode.SUPER_TENANT_ADMIN) {
Assert.assertTrue(scope.contains("internal_server_admin"), "Scope should contain " +
"`internal_server_admin` scope");
if (isLegacyRuntimeEnabled) {
Assert.assertTrue(scope.contains("internal_server_admin"), "Scope should contain " +
"`internal_server_admin` scope");
}
Assert.assertTrue(scope.contains("internal_modify_tenants"), "Scope should contain " +
"`internal_modify_tenants` scope");
} else if (testUserMode == TestUserMode.TENANT_ADMIN) {
Assert.assertFalse(scope.contains("internal_server_admin"), "Scope should not contain " +
"`internal_server_admin` scope");
Assert.assertFalse(scope.contains("internal_modify_tenants"), "Scope should not contain " +
"`internal_modify_tenants` scope");
"`internal_modify_tenants` scope");
} else {
// Normal user.
if (isClientCredentialsGrant) {
Expand All @@ -221,7 +245,33 @@ private void doTheScopeValidationBasedOnTheTestUserMode(String scope, boolean is
Assert.assertFalse(scope.contains("internal_server_admin"), "Scope should not contain " +
"`internal_server_admin` scope");
Assert.assertFalse(scope.contains("internal_modify_tenants"), "Scope should not contain " +
"`internal_modify_tenants` scope");
"`internal_modify_tenants` scope");
}
}

private static boolean isLegacyAuthzRuntimeEnabled() throws Exception {

String carbonHome = System.getProperty("carbon.home");
String carbonXMLFilePath = carbonHome + "/repository/conf/carbon.xml";
Path filePath = Paths.get(carbonXMLFilePath);
String xmlContent = new String(Files.readAllBytes(filePath));

// Parse the XML content
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
Document document = builder.parse(new ByteArrayInputStream(xmlContent.getBytes()));

// Get the root element
Element root = document.getDocumentElement();

// Find the element with the EnableLegacyAuthzRuntime tag.
NodeList nodeList = root.getElementsByTagName(ENABLE_LEGACY_AUTHZ_RUNTIME_CONFIG);

if (nodeList.getLength() > 0) {
// Get the value of EnableLegacyAuthzRuntime
String enableLegacyAuthzRuntimeValue = nodeList.item(0).getTextContent();
return Boolean.parseBoolean(enableLegacyAuthzRuntimeValue);
}
return true;
}
}
Loading

0 comments on commit b044de1

Please sign in to comment.