Add instance type check to avoid ClassCastException

wso2-extensions · Nov 28, 2023 · e673a7c · e673a7c
1 parent 5544b7e
commit e673a7c
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/...ty.authz.valve/src/main/java/org/wso2/carbon/identity/authz/valve/AuthorizationValve.java b/...ty.authz.valve/src/main/java/org/wso2/carbon/identity/authz/valve/AuthorizationValve.java
@@ -163,17 +163,21 @@ public void invoke(Request request, Response response) throws IOException, Servl
                 try {
                     AuthorizationResult authorizationResult = authorizationManager.authorize(authorizationContext);
                     if (authorizationResult.getAuthorizationStatus().equals(AuthorizationStatus.GRANT)) {
-                        String authorizedOrganization = ((AuthenticatedUser)authorizationContext.getUser())
-                                .getAccessingOrganization();
-                        // Start tenant flow corresponds to the accessed organization.
-                        if (StringUtils.isNotEmpty(authorizedOrganization)) {
-                            try {
-                                startOrganizationBoundTenantFlow(authorizedOrganization);
+                        if (authorizationContext.getUser() instanceof AuthenticatedUser) {
+                            String authorizedOrganization = ((AuthenticatedUser)authorizationContext.getUser())
+                                    .getAccessingOrganization();
+                            // Start tenant flow corresponds to the accessed organization.
+                            if (StringUtils.isNotEmpty(authorizedOrganization)) {
+                                try {
+                                    startOrganizationBoundTenantFlow(authorizedOrganization);
+                                    getNext().invoke(request, response);
+                                } finally {
+                                    PrivilegedCarbonContext.endTenantFlow();
+                                    IdentityUtil.threadLocalProperties.get()
+                                            .remove(OrganizationManagementConstants.ROOT_TENANT_DOMAIN);
+                                }
+                            } else {
                                 getNext().invoke(request, response);
-                            } finally {
-                                PrivilegedCarbonContext.endTenantFlow();
-                                IdentityUtil.threadLocalProperties.get()
-                                        .remove(OrganizationManagementConstants.ROOT_TENANT_DOMAIN);
                             }
                         } else {
                             getNext().invoke(request, response);