Scarab commit: svn commit: r10457 - trunk/src/java/org/tigris/scarab: actions/base om util

Author: hair
Date: 2007-08-31 15:39:44-0700
New Revision: 10457

Modified:
   trunk/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java
   trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java
   trunk/src/java/org/tigris/scarab/util/ScarabLink.java

Log:
http://scarab.tigris.org/servlets/ReadMsg?list=dev&msgNo=14082
>  So i'm going to fix ScarabLink.isAllowed so that Domain__* permissions 
> are always checked against the global module.

ScarabLink was too high level (and the previous commit was a complete butch up).

Modified: trunk/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java?view=diff&rev=10457&p1=trunk/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java&p2=trunk/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java&r1=10456&r2=10457
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java	(original)
+++ trunk/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java	2007-08-31 15:39:44-0700
@@ -59,6 +59,7 @@
 import org.apache.turbine.TemplateSecureAction;
 import org.apache.turbine.tool.IntakeTool;
 import org.tigris.scarab.om.Module;
+import org.tigris.scarab.om.ModuleManager;
 import org.tigris.scarab.om.ScarabUser;
 import org.tigris.scarab.screens.Default;
 import org.tigris.scarab.services.security.ScarabSecurity;

Modified: trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java?view=diff&rev=10457&p1=trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java&p2=trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java&r1=10456&r2=10457
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/ScarabUserImpl.java	2007-08-31 15:39:44-0700
@@ -335,7 +335,7 @@
             return false;
         }
 
-        if (module == null)
+        if (module == null || ScarabSecurity.DOMAIN__ADMIN.equals(perm) || ScarabSecurity.DOMAIN__EDIT.equals(perm))
         {
             module = ModuleManager.getInstance(Module.ROOT_ID);
         }

Modified: trunk/src/java/org/tigris/scarab/util/ScarabLink.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/ScarabLink.java?view=diff&rev=10457&p1=trunk/src/java/org/tigris/scarab/util/ScarabLink.java&p2=trunk/src/java/org/tigris/scarab/util/ScarabLink.java&r1=10456&r2=10457
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/ScarabLink.java	(original)
+++ trunk/src/java/org/tigris/scarab/util/ScarabLink.java	2007-08-31 15:39:44-0700
@@ -601,13 +601,10 @@
                     }
                 }
                 ScarabUser user = (ScarabUser)data.getUser();
-                final Module moduleToCheckAgainst = perm.startsWith("Domain__")
-                        ? currentModule
-                        : ModuleManager.getInstance(Module.ROOT_ID);
                 
-                allowed = moduleToCheckAgainst != null 
+                allowed = currentModule != null 
                           && (user.hasLoggedIn() || user.isUserAnonymous() )
-                          && user.hasPermission(perm, moduleToCheckAgainst);
+                          && user.hasPermission(perm, currentModule);
             }
             else 
             {