You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ka...@apache.org on 2011/01/09 23:18:55 UTC
svn commit: r1057039 -
/shiro/trunk/core/src/main/java/org/apache/shiro/authz/ModularRealmAuthorizer.java
Author: kaosko
Date: Sun Jan 9 22:18:54 2011
New Revision: 1057039
URL: http://svn.apache.org/viewvc?rev=1057039&view=rev
Log:
FIXED - issue SHIRO-231: Realm shouldn't implement Authorizer but AuthorizingRealm should implement it directly
https://issues.apache.org/jira/browse/SHIRO-231
- ModularRealmAuthorizer should test for Authorizer type, not AuthorizingRealm
Modified:
shiro/trunk/core/src/main/java/org/apache/shiro/authz/ModularRealmAuthorizer.java
Modified: shiro/trunk/core/src/main/java/org/apache/shiro/authz/ModularRealmAuthorizer.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/authz/ModularRealmAuthorizer.java?rev=1057039&r1=1057038&r2=1057039&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/authz/ModularRealmAuthorizer.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/authz/ModularRealmAuthorizer.java Sun Jan 9 22:18:54 2011
@@ -22,7 +22,6 @@ import org.apache.shiro.authz.permission
import org.apache.shiro.authz.permission.PermissionResolverAware;
import org.apache.shiro.authz.permission.RolePermissionResolver;
import org.apache.shiro.authz.permission.RolePermissionResolverAware;
-import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.realm.Realm;
import org.apache.shiro.subject.PrincipalCollection;
@@ -220,8 +219,8 @@ public class ModularRealmAuthorizer impl
public boolean isPermitted(PrincipalCollection principals, String permission) {
assertRealmsConfigured();
for (Realm realm : getRealms()) {
- if (!(realm instanceof AuthorizingRealm)) continue;
- if (((AuthorizingRealm)realm).isPermitted(principals, permission)) {
+ if (!(realm instanceof Authorizer)) continue;
+ if (((Authorizer)realm).isPermitted(principals, permission)) {
return true;
}
}
@@ -236,8 +235,8 @@ public class ModularRealmAuthorizer impl
public boolean isPermitted(PrincipalCollection principals, Permission permission) {
assertRealmsConfigured();
for (Realm realm : getRealms()) {
- if (!(realm instanceof AuthorizingRealm)) continue;
- if (((AuthorizingRealm)realm).isPermitted(principals, permission)) {
+ if (!(realm instanceof Authorizer)) continue;
+ if (((Authorizer)realm).isPermitted(principals, permission)) {
return true;
}
}
@@ -371,8 +370,8 @@ public class ModularRealmAuthorizer impl
public boolean hasRole(PrincipalCollection principals, String roleIdentifier) {
assertRealmsConfigured();
for (Realm realm : getRealms()) {
- if (!(realm instanceof AuthorizingRealm)) continue;
- if (((AuthorizingRealm)realm).hasRole(principals, roleIdentifier)) {
+ if (!(realm instanceof Authorizer)) continue;
+ if (((Authorizer)realm).hasRole(principals, roleIdentifier)) {
return true;
}
}