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

Jump to bottom

Refactor user permission implementation related to pre issue access token action tests #21070

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactor user permission implementation related to pre issue access token action tests #21070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72135d3
Update user permission implmentation
Shenali-SJ Sep 6, 2024
85f086f
Add integration tests for pre issue access token auth code grant
Shenali-SJ Sep 16, 2024
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
59 changes: 18 additions & 41 deletions .../identity/integration/test/actions/PreIssueAccessTokenClientCredentialsGrantTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
Expand All @@ -96,23 +95,14 @@ public class PreIssueAccessTokenClientCredentialsGrantTestCase extends ActionsBa
private static final String EXTERNAL_SERVICE_URI = "http://localhost:8587/test/action";
private static final String PRE_ISSUE_ACCESS_TOKEN_API_PATH = "preIssueAccessToken";

private static final String CLIENT_CREDENTIALS_GRANT_TYPE = "client_credentials";
private static final String APPLICATION_AUDIENCE = "APPLICATION";
private static final String TEST_ROLE_APPLICATION = "test_role_application";

private static final String INTERNAL_ACTION_MANAGEMENT_VIEW = "internal_action_mgt_view";
private static final String INTERNAL_ACTION_MANAGEMENT_CREATE = "internal_action_mgt_create";
private static final String INTERNAL_ACTION_MANAGEMENT_UPDATE = "internal_action_mgt_update";
private static final String INTERNAL_ACTION_MANAGEMENT_DELETE = "internal_action_mgt_delete";
private static final String INTERNAL_ORG_USER_MANAGEMENT_LIST = "internal_org_user_mgt_list";
private static final String INTERNAL_ORG_USER_MANAGEMENT_VIEW = "internal_org_user_mgt_view";
private static final String INTERNAL_ORG_USER_MANAGEMENT_CREATE = "internal_org_user_mgt_create";
private static final String INTERNAL_ORG_USER_MANAGEMENT_UPDATE = "internal_org_user_mgt_update";
private static final String INTERNAL_ORG_USER_MANAGEMENT_DELETE = "internal_org_user_mgt_delete";
private static final String INTERNAL_APPLICATION_MANAGEMENT_VIEW = "internal_application_mgt_view";
private static final String INTERNAL_APPLICATION_MANAGEMENT_UPDATE = "internal_application_mgt_update";
private static final String INTERNAL_API_RESOURCE_VIEW = "internal_api_resource_view";
private static final String INTERNAL_API_RESOURCE_CREATE = "internal_api_resource_create";
private static final String CUSTOM_SCOPE_1 = "test_custom_scope_1";
private static final String CUSTOM_SCOPE_2 = "test_custom_scope_2";
private static final String CUSTOM_SCOPE_3 = "test_custom_scope_3";
Expand All @@ -127,11 +117,9 @@ public class PreIssueAccessTokenClientCredentialsGrantTestCase extends ActionsBa
private static final String API_RESOURCE_MANAGEMENT_API = "/api/server/v1/api-resources";
private static final String MOCK_SERVER_ENDPOINT = "/test/action";

private Lookup<CookieSpecProvider> cookieSpecRegistry;
private RequestConfig requestConfig;
private List<String> permissions = new ArrayList<>();
private CloseableHttpClient client;
private SCIM2RestClient scim2RestClient;
private List<String> customScopes;
private String accessToken;
private String clientId;
private String clientSecret;
Expand All @@ -152,10 +140,10 @@ public void testInit() throws Exception {

super.init(TestUserMode.TENANT_USER);

cookieSpecRegistry = RegistryBuilder.<CookieSpecProvider>create()
Lookup<CookieSpecProvider> cookieSpecRegistry = RegistryBuilder.<CookieSpecProvider>create()
.register(CookieSpecs.DEFAULT, new RFC6265CookieSpecProvider())
.build();
requestConfig = RequestConfig.custom()
RequestConfig requestConfig = RequestConfig.custom()
.setCookieSpec(CookieSpecs.DEFAULT)
.build();
client = HttpClientBuilder.create()
Expand All @@ -171,9 +159,10 @@ protected boolean isRedirectable(String method) {

scim2RestClient = new SCIM2RestClient(serverURL, tenantInfo);

customScopes = Arrays.asList(CUSTOM_SCOPE_1, CUSTOM_SCOPE_2, CUSTOM_SCOPE_3);
List<String> customScopes = Arrays.asList(CUSTOM_SCOPE_1, CUSTOM_SCOPE_2, CUSTOM_SCOPE_3);

ApplicationResponseModel application = addApplicationWithGrantType(CLIENT_CREDENTIALS_GRANT_TYPE);
ApplicationResponseModel application = addApplicationWithGrantType(
OAuth2Constant.OAUTH2_GRANT_TYPE_CLIENT_CREDENTIALS);
applicationId = application.getId();
OpenIDConnectConfiguration oidcConfig = getOIDCInboundDetailsOfApplication(applicationId);
clientId = oidcConfig.getClientId();
Expand Down Expand Up @@ -214,20 +203,7 @@ public void testGetAccessTokenWithClientCredentialsGrant() throws Exception {
List<NameValuePair> parameters = new ArrayList<>();
parameters.add(new BasicNameValuePair("grant_type", OAuth2Constant.OAUTH2_GRANT_TYPE_CLIENT_CREDENTIALS));

List<String> permissions = new ArrayList<>();
Collections.addAll(permissions,
INTERNAL_ORG_USER_MANAGEMENT_LIST,
INTERNAL_ORG_USER_MANAGEMENT_VIEW,
INTERNAL_ORG_USER_MANAGEMENT_CREATE,
INTERNAL_ORG_USER_MANAGEMENT_UPDATE,
INTERNAL_ORG_USER_MANAGEMENT_DELETE
);
permissions.addAll(customScopes);

String scopes = permissions.stream()
.map(String::toLowerCase)
.collect(Collectors.joining(" "));
parameters.add(new BasicNameValuePair("scope", scopes));
parameters.add(new BasicNameValuePair("scope", String.join(" ", permissions)));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like permissions is an empty list. Isn't that the case ?


List<Header> headers = new ArrayList<>();
headers.add(new BasicHeader(AUTHORIZATION_HEADER, OAuth2Constant.BASIC_HEADER + " " +
Expand Down Expand Up @@ -260,7 +236,7 @@ public void testTokenScopeOperations() throws Exception {
Assert.assertTrue(ArrayUtils.contains(scopes, NEW_SCOPE_3));
Assert.assertTrue(ArrayUtils.contains(scopes, NEW_SCOPE_4));
Assert.assertFalse(ArrayUtils.contains(scopes, CUSTOM_SCOPE_3));
Assert.assertFalse(ArrayUtils.contains(scopes, CUSTOM_SCOPE_2));
Assert.assertFalse(ArrayUtils.contains(scopes, INTERNAL_ORG_USER_MANAGEMENT_CREATE));
}

@Test(groups = "wso2.is", description = "Verify that the access token contains the updated 'aud' claims " +
Expand Down Expand Up @@ -373,9 +349,9 @@ private JWTClaimsSet extractJwtClaims(String jwtToken) throws ParseException {
*/
private void addUserWithRole(String appID, List<String> customScopes) throws Exception {
// Creates roles
List<Permission> permissions = addPermissions(customScopes);
List<Permission> userPermissions = addPermissions(customScopes);
Audience roleAudience = new Audience(APPLICATION_AUDIENCE, appID);
RoleV2 role = new RoleV2(roleAudience, TEST_ROLE_APPLICATION, permissions, Collections.emptyList());
RoleV2 role = new RoleV2(roleAudience, TEST_ROLE_APPLICATION, userPermissions, Collections.emptyList());
roleId = addRole(role);

// Creates user
Expand Down Expand Up @@ -403,14 +379,15 @@ private void addUserWithRole(String appID, List<String> customScopes) throws Exc
private List<Permission> addPermissions(List<String> customScopes) {

List<Permission> userPermissions = new ArrayList<>();
Collections.addAll(userPermissions,
new Permission(INTERNAL_ORG_USER_MANAGEMENT_LIST),
new Permission(INTERNAL_ORG_USER_MANAGEMENT_VIEW),
new Permission(INTERNAL_ORG_USER_MANAGEMENT_CREATE),
new Permission(INTERNAL_ORG_USER_MANAGEMENT_UPDATE),
new Permission(INTERNAL_ORG_USER_MANAGEMENT_DELETE)
Collections.addAll(permissions,
INTERNAL_ORG_USER_MANAGEMENT_CREATE,
INTERNAL_ORG_USER_MANAGEMENT_LIST,
INTERNAL_ORG_USER_MANAGEMENT_VIEW,
INTERNAL_ORG_USER_MANAGEMENT_UPDATE,
INTERNAL_ORG_USER_MANAGEMENT_DELETE
);
customScopes.forEach(scope -> userPermissions.add(new Permission(scope)));
permissions.addAll(customScopes);
permissions.forEach(permission -> userPermissions.add(new Permission(permission)));

return userPermissions;
}
Expand Down
Loading