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

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

Author: michael.neale at jboss.com
Date: 2008-10-13 03:27:52 -0400 (Mon, 13 Oct 2008)
New Revision: 23432

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/CapabilityCalculator.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java
Log:
GUVNOR-46 incorrect GUI display when no admin user is set up

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java	2008-10-13 03:22:40 UTC (rev 23431)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FileManagerUtils.java	2008-10-13 07:27:52 UTC (rev 23432)
@@ -31,6 +31,8 @@
 import org.drools.guvnor.server.contenthandler.ContentManager;
 import org.drools.guvnor.server.contenthandler.IRuleAsset;
 import org.drools.guvnor.server.contenthandler.ModelContentHandler;
+import org.drools.guvnor.server.security.AdminType;
+import org.drools.guvnor.server.security.RoleTypes;
 import org.drools.guvnor.server.util.ClassicDRLImporter;
 import org.drools.guvnor.server.util.FormData;
 import org.drools.guvnor.server.util.ClassicDRLImporter.Asset;
@@ -44,6 +46,8 @@
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.security.Restrict;
+import org.jboss.seam.contexts.Contexts;
+import org.jboss.seam.security.Identity;
 
 import javax.jcr.RepositoryException;
 import javax.servlet.http.HttpServletRequest;
@@ -240,6 +244,11 @@
 
     @Restrict("#{identity.loggedIn}")
     public void importRulesRepository(byte[] data) {
+		if (Contexts.isSessionContextActive()) {
+			Identity.instance().checkPermission(
+					new AdminType(),
+					RoleTypes.ADMIN);
+		}
         repository.importRulesRepository( data );
     }
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/CapabilityCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/CapabilityCalculator.java	2008-10-13 03:22:40 UTC (rev 23431)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/CapabilityCalculator.java	2008-10-13 07:27:52 UTC (rev 23432)
@@ -20,7 +20,7 @@
 
 	public Capabilities calcCapabilities(List<RoleBasedPermission> permissions) {
 		if (permissions.size() == 0) {
-			return Capabilities.all();
+			return new Capabilities();
 		} else {
 			Capabilities caps = new Capabilities();
 			for (RoleBasedPermission p : permissions) {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java	2008-10-13 03:22:40 UTC (rev 23431)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/CapabilityCalculatorTest.java	2008-10-13 07:27:52 UTC (rev 23432)
@@ -13,6 +13,7 @@
 	public void testAdmin() {
 		CapabilityCalculator loader = new CapabilityCalculator();
 		List<RoleBasedPermission> perms = new ArrayList<RoleBasedPermission>();
+		perms.add(new RoleBasedPermission("s", RoleTypes.ADMIN, null, null  ));
 		Capabilities caps = loader.calcCapabilities(perms);
 		assertEquals(7, caps.list.size());
 	}