Merge pull request picketlink#495 from pedroigor/master

pedroigor · pedroigor · commit 361190c8a304 · 2015-07-09T11:41:03.000-03:00
Check inherited roles from AuthorizationUtil.
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) {
diff --git a/modules/common/src/main/java/org/picketlink/common/DefaultPicketLinkLogger.java b/modules/common/src/main/java/org/picketlink/common/DefaultPicketLinkLogger.java
@@ -1665,7 +1665,7 @@ public void samlParsingError(Throwable t) {
      */
     @Override
     public void mappingContextNull() {
-        logger.error("Mapping Context returned is null");
+        logger.debug("Mapping Context returned is null");
     }
 
     /*
diff --git a/modules/idm/impl/src/main/java/org/picketlink/idm/internal/util/RelationshipMetadata.java b/modules/idm/impl/src/main/java/org/picketlink/idm/internal/util/RelationshipMetadata.java
@@ -27,6 +27,7 @@
 import org.picketlink.common.properties.query.PropertyQueries;
 import org.picketlink.common.properties.query.PropertyQuery;
 import org.picketlink.common.properties.query.TypedPropertyCriteria;
+import org.picketlink.common.properties.query.TypedPropertyCriteria.MatchOption;
 import org.picketlink.idm.model.IdentityType;
 import org.picketlink.idm.model.Partition;
 import org.picketlink.idm.model.Relationship;
@@ -72,7 +73,7 @@ public Set<Property<? extends IdentityType>> getRelationshipIdentityProperties(
 
     private Set<Property<? extends IdentityType>> queryRelationshipIdentityProperties(Class<? extends Relationship> relationshipClass) {
         PropertyQuery<? extends IdentityType> query = PropertyQueries.createQuery(relationshipClass);
-        query.addCriteria(new TypedPropertyCriteria(IdentityType.class));
+        query.addCriteria(new TypedPropertyCriteria(IdentityType.class, MatchOption.SUB_TYPE));
 
         Set<Property<? extends IdentityType>> properties = new HashSet<Property<? extends IdentityType>>();
         for (Property<? extends IdentityType> prop : query.getResultList()) {

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) {`
Original file line number	Diff line number	Diff line change
`@@ -1665,7 +1665,7 @@ public void samlParsingError(Throwable t) {`
`1665`	`1665`	`*/`
`1666`	`1666`	`@Override`
`1667`	`1667`	`public void mappingContextNull() {`
`1668`		`- logger.error("Mapping Context returned is null");`
	`1668`	`+ logger.debug("Mapping Context returned is null");`
`1669`	`1669`	`}`
`1670`	`1670`
`1671`	`1671`	`/*`