[jboss-svn-commits] JBL Code SVN: r21625 - in labs/jbossrules/trunk/drools-guvnor/src: test/java/org/drools/guvnor/server/security and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2008-08-19 03:08:57 -0400 (Tue, 19 Aug 2008)
New Revision: 21625

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java
Log:
JBRULES-1741 small correction to make sure admin gets all capabilities

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	2008-08-19 06:37:26 UTC (rev 21624)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java	2008-08-19 07:08:57 UTC (rev 21625)
@@ -101,8 +101,11 @@
 
 	public Capabilities getUserCapabilities() {
 		if (Contexts.isSessionContextActive()) {
+			if (Identity.instance().hasRole(RoleTypes.ADMIN)) {
+				return Capabilities.all();
+			}
 			CapabilityCalculator c = new CapabilityCalculator();
-			RoleBasedPermissionManager permManager = (RoleBasedPermissionManager) 
+			RoleBasedPermissionManager permManager = (RoleBasedPermissionManager)
 					Component.getInstance("roleBasedPermissionManager");
 			List<RoleBasedPermission> permissions = permManager.getRoleBasedPermission();
 			return c.calcCapabilities(permissions);

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java	2008-08-19 06:37:26 UTC (rev 21624)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java	2008-08-19 07:08:57 UTC (rev 21625)
@@ -42,14 +42,14 @@
         SecurityServiceImpl impl = new SecurityServiceImpl();
         assertNotNull(impl.getCurrentUser());
     }
-    
+
     public void testCapabilities() {
     	SecurityServiceImpl impl = new SecurityServiceImpl();
-    	
+
     	Capabilities c = impl.getUserCapabilities();
     	assertTrue(c.list.size() > 1);
     }
-    
+
     public void testCapabilitiesWithContext() {
     	SecurityServiceImpl impl = new SecurityServiceImpl();
 
@@ -72,7 +72,7 @@
 				null));
     	MockRoleBasedPermissionStore store = new MockRoleBasedPermissionStore(pbps);
     	Contexts.getSessionContext().set("org.drools.guvnor.server.security.RoleBasedPermissionStore", store);
-    	
+
 		// Put permission list in session.
 		RoleBasedPermissionManager testManager = new RoleBasedPermissionManager();
 		testManager.create();
@@ -85,4 +85,26 @@
     	Lifecycle.endApplication();
     }
 
+    public void testCapabilitiesContext() throws Exception {
+    	SecurityServiceImpl impl = new SecurityServiceImpl();
+
+		// Mock up SEAM contexts
+		Map application = new HashMap<String, Object>();
+		Lifecycle.beginApplication(application);
+		Lifecycle.beginCall();
+		MockIdentity midentity = new MockIdentity();
+		midentity.addRole(RoleTypes.ADMIN);
+		Contexts.getSessionContext().set("org.jboss.seam.security.identity",
+				midentity);
+
+    	Capabilities c = impl.getUserCapabilities();
+    	assertTrue(c.list.size() > 1);
+
+    	Lifecycle.endApplication();
+
+
+
+
+    }
+
 }