fix connection close issue

wso2-extensions · Oct 25, 2023 · ab97cbc · ab97cbc
1 parent 8220187
commit ab97cbc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...th.service/src/main/java/org/wso2/carbon/identity/auth/service/AuthenticationManager.java b/...th.service/src/main/java/org/wso2/carbon/identity/auth/service/AuthenticationManager.java
@@ -156,8 +156,8 @@ private List<AuthenticationHandler> filterAuthenticationHandlers(AuthenticationC
     private boolean isHandlerAllowedForResource(List<String> allowedAuthenticationHandlersForResource,
                                                 AuthenticationHandler handler) {
 
-        if (handler.getName().equals(Constants.BASIC_AUTHENTICATION) &&
-                Boolean.parseBoolean(IdentityUtil.getProperty(Constants.ENABLE_BASIC_AUTH_HANDLER_CONFIG))) {
+        if (Constants.BASIC_AUTHENTICATION.equals(handler.getName()) &&
+                !Boolean.parseBoolean(IdentityUtil.getProperty(Constants.ENABLE_BASIC_AUTH_HANDLER_CONFIG))) {
             return false;
         }
         return allowedAuthenticationHandlersForResource.contains(handler.getName());

diff --git a/...rvice/src/main/java/org/wso2/carbon/identity/auth/service/util/AuthConfigurationUtil.java b/...rvice/src/main/java/org/wso2/carbon/identity/auth/service/util/AuthConfigurationUtil.java
@@ -185,7 +185,7 @@ private static OMElement getResourceAccessControlConfigs() {
         if (Files.exists(path)) {
             try (InputStream in = Files.newInputStream(path)) {
                 StAXOMBuilder builder = new StAXOMBuilder(in);
-                return builder.getDocumentElement();
+                return builder.getDocumentElement().cloneOMElement();
             } catch (IOException e) {
                 String message = "Error while reading Resource Access control configuration at: " + path.getFileName();
                 log.error(message);
@@ -194,6 +194,8 @@ private static OMElement getResourceAccessControlConfigs() {
                 String message = "Error while parsing Resource Access control configuration at: " + path.getFileName();
                 log.error(message);
             }
+        } else {
+            log.error("Resource Access control configuration not found at: " + path.getFileName());
         }
         return null;
     }

diff --git a/...ce/src/main/java/org/wso2/carbon/identity/authz/service/handler/AuthorizationHandler.java b/...ce/src/main/java/org/wso2/carbon/identity/authz/service/handler/AuthorizationHandler.java
@@ -82,7 +82,9 @@ else if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) {
                 }
             } else {
                 // TODO: Use OAuth2 scope validator, once merged.
-                validateScopes(authorizationContext, authorizationResult, allowedScopes);
+                validatePermissions(authorizationResult, user, permissionString, tenantUserRealm);
+                // authorizationResult.setAuthorizationStatus(AuthorizationStatus.GRANT);
+
             }
         } catch (UserStoreException e) {
             String errorMessage = "Error occurred while trying to authorize, " + e.getMessage();