Check inherited roles from AuthorizationUtil.

pedroigor · pedroigor · commit 83d7b7a84833 · 2015-07-03T15:02:28.000-03:00
diff --git a/modules/base/api/src/main/java/org/picketlink/authorization/util/AuthorizationUtil.java b/modules/base/api/src/main/java/org/picketlink/authorization/util/AuthorizationUtil.java
@@ -216,7 +216,11 @@ public static boolean hasRole(Identity identity, PartitionManager partitionManag
                         return true;
                     }
 
-                    return relationshipManager.inheritsPrivileges(identity.getAccount(), role);
+                    boolean inheritsPrivileges = relationshipManager.inheritsPrivileges(identity.getAccount(), role);
+
+                    if (inheritsPrivileges) {
+                        return true;
+                    }
                 }
             }
         }
diff --git a/modules/base/impl/src/test/java/org/picketlink/http/test/SecurityInitializer.java b/modules/base/impl/src/test/java/org/picketlink/http/test/SecurityInitializer.java
@@ -55,7 +55,7 @@ public class SecurityInitializer {
 
     public void onCreatePartitionManager(@Observes SecurityConfigurationEvent event) {
         SecurityConfigurationBuilder builder = event.getBuilder();
-        builder.idmConfig().named("default").stores().file().preserveState(true).supportAllFeatures();
+        builder.idmConfig().named("default").stores().file().supportAllFeatures();
     }
 
     public void initIdentityStore(@Observes PartitionManagerCreateEvent event) {

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,11 @@ public static boolean hasRole(Identity identity, PartitionManager partitionManag`
`216`	`216`	`return true;`
`217`	`217`	`}`
`218`	`218`
`219`		`- return relationshipManager.inheritsPrivileges(identity.getAccount(), role);`
	`219`	`+ boolean inheritsPrivileges = relationshipManager.inheritsPrivileges(identity.getAccount(), role);`
	`220`	`+`
	`221`	`+ if (inheritsPrivileges) {`
	`222`	`+ return true;`
	`223`	`+ }`
`220`	`224`	`}`
`221`	`225`	`}`
`222`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public class SecurityInitializer {`
`55`	`55`
`56`	`56`	`public void onCreatePartitionManager(@Observes SecurityConfigurationEvent event) {`
`57`	`57`	`SecurityConfigurationBuilder builder = event.getBuilder();`
`58`		`- builder.idmConfig().named("default").stores().file().preserveState(true).supportAllFeatures();`
	`58`	`+ builder.idmConfig().named("default").stores().file().supportAllFeatures();`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public void initIdentityStore(@Observes PartitionManagerCreateEvent event) {`