[jboss-svn-commits] JBL Code SVN: r33674 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security.

[jboss-svn-commits at lists.jboss.org]

Author: jervisliu
Date: 2010-06-28 13:13:26 -0400 (Mon, 28 Jun 2010)
New Revision: 33674

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
Log:
GUVNOR-517: Permission issue for [package.developper]


Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java	2010-06-28 15:14:44 UTC (rev 33673)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java	2010-06-28 17:13:26 UTC (rev 33674)
@@ -128,16 +128,19 @@
             if ( Identity.instance().hasRole( RoleTypes.ADMIN ) ) {
                 return Capabilities.all( PREFERENCES );
             }
+            
+            RoleBasedPermissionResolver resolver = (RoleBasedPermissionResolver) Component.getInstance( "org.jboss.seam.security.roleBasedPermissionResolver" );
+            if ( !resolver.isEnableRoleBasedAuthorization() ) {
+                return Capabilities.all( PREFERENCES );
+            }
+            
             CapabilityCalculator c = new CapabilityCalculator();
             RoleBasedPermissionManager permManager = (RoleBasedPermissionManager) Component.getInstance( "roleBasedPermissionManager" );
 
             List<RoleBasedPermission> permissions = permManager.getRoleBasedPermission();
             if ( permissions.size() == 0 ) {
-                RoleBasedPermissionResolver resolver = (RoleBasedPermissionResolver) Component.getInstance( "org.jboss.seam.security.roleBasedPermissionResolver" );
-                if ( resolver.isEnableRoleBasedAuthorization() ) {
                     Identity.instance().logout();
                     throw new AuthorizationException( "This user has no permissions setup." );
-                }
             }
             return c.calcCapabilities( permissions,
                                        PREFERENCES );