paulsp 2002/08/21 19:17:24
Modified: build build.xml
src/java/org/apache/jetspeed/om/registry/base
BaseSecurityEntry.java
Log:
o Housekeeping as directed by checkstyle. No functional changes.
o Renamed the variable sync to accessMapSync for clarity
Revision Changes Path
1.157 +1 -0 jakarta-jetspeed/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- build.xml 22 Aug 2002 01:09:09 -0000 1.156
+++ build.xml 22 Aug 2002 02:17:24 -0000 1.157
@@ -228,6 +228,7 @@
<include
name="org/apache/jetspeed/om/profile/psml/PsmlController.java"/>
<include
name="org/apache/jetspeed/om/registry/PortletControlEntry.java"/>
<include
name="org/apache/jetspeed/om/registry/PortletControllerEntry.java"/>
+ <include
name="org/apache/jetspeed/om/registry/base/BaseSecurityEntry.java"/>
<include
name="org/apache/jetspeed/om/security/turbine/TurbineGroup.java"/>
<include
name="org/apache/jetspeed/om/security/turbine/TurbinePermission.java"/>
<include
name="org/apache/jetspeed/om/security/turbine/TurbineRole.java"/>
1.4 +43 -18
jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/BaseSecurityEntry.java
Index: BaseSecurityEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/BaseSecurityEntry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseSecurityEntry.java 16 Jul 2002 17:27:04 -0000 1.3
+++ BaseSecurityEntry.java 22 Aug 2002 02:17:24 -0000 1.4
@@ -64,7 +64,7 @@
import org.apache.jetspeed.om.registry.SecurityAccess;
import org.apache.jetspeed.om.registry.SecurityAllow;
import org.apache.jetspeed.om.registry.SecurityEntry;
-import org.apache.jetspeed.om.registry.base.BaseRegistryEntry;
+import org.apache.jetspeed.om.registry.base.*;
/**
* Interface for manipulatin the Security Entry on the registry entries
@@ -90,8 +90,10 @@
private static final String USER_MAP = "user";
+ private static Object accessMapSync = new Object();
+
public BaseSecurityEntry()
- {}
+ { }
/** Getter for property accesses.
* @return Value of property accesses.
@@ -128,17 +130,21 @@
boolean allow = false;
if (accessMap == null)
+ {
buildAccessMap();
+ }
// Checked action
allowMap = (Map) accessMap.get(action);
- allow = isInAllowMap( allowMap, ROLE_MAP, role, ALL_ROLES);
+ allow = isInAllowMap(allowMap, ROLE_MAP, role, ALL_ROLES);
if (allow == true)
+ {
return allow;
+ }
// Checked all actions
allowMap = (Map) accessMap.get(ALL_ACTIONS);
- allow = isInAllowMap( allowMap, ROLE_MAP, role, ALL_ROLES);
+ allow = isInAllowMap(allowMap, ROLE_MAP, role, ALL_ROLES);
// Not allowed
return allow;
@@ -157,39 +163,43 @@
boolean allow = false;
if (accessMap == null)
+ {
buildAccessMap();
+ }
// Checked action
allowMap = (Map) accessMap.get(action);
- allow = isInAllowMap( allowMap, USER_MAP, userName, ALL_USERS);
+ allow = isInAllowMap(allowMap, USER_MAP, userName, ALL_USERS);
if (allow == true)
+ {
return allow;
+ }
// Checked all actions
allowMap = (Map) accessMap.get(ALL_ACTIONS);
- allow = isInAllowMap( allowMap, USER_MAP, userName, ALL_USERS);
+ allow = isInAllowMap(allowMap, USER_MAP, userName, ALL_USERS);
// Not allowed
return allow;
}
- static Object sync = new Object();
-
private void buildAccessMap()
{
Map actionMap = null;
SecurityAccess accessElement = null;
- synchronized(sync)
+ synchronized (accessMapSync)
{
if (accessMap == null)
+ {
accessMap = new HashMap();
+ }
accessMap.clear();
}
// Build allow map
- for ( Iterator accessIterator = getAccesses().iterator();
accessIterator.hasNext();)
+ for (Iterator accessIterator = getAccesses().iterator();
accessIterator.hasNext();)
{
accessElement = (SecurityAccess) accessIterator.next();
@@ -197,18 +207,27 @@
String action = accessElement.getAction();
if (action == null)
+ {
action = ALL_ACTIONS;
+ }
- actionMap = (Map) accessMap.get(action );
+ actionMap = (Map) accessMap.get(action);
if (actionMap == null)
{
actionMap = new HashMap();
accessMap.put(action, actionMap);
}
- addAllows( actionMap, accessElement);
+ addAllows(actionMap, accessElement);
}
}
+ /**
+ * Add access elements to the access map. The elements will be
+ * appened to the appropiate map.
+ *
+ * @param accessMap to receive accessElements
+ * @param accessElement to copy to access map
+ */
private void addAllows(Map accessMap, SecurityAccess accessElement)
{
SecurityAllow allowElement = null;
@@ -218,10 +237,12 @@
String userName = null;
if (accessElement.getAllows() == null)
+ {
return;
+ }
// Add allows to the action Map
- for ( Iterator allowIterator = accessElement.getAllows().iterator();
allowIterator.hasNext();)
+ for (Iterator allowIterator = accessElement.getAllows().iterator();
allowIterator.hasNext();)
{
allowElement = (SecurityAllow) allowIterator.next();
role = null;
@@ -264,18 +285,22 @@
* @param allKey ALL_ROLE or ALL_USER
* @return <CODE>true</CODE> or <CODE>false</CODE>
*/
- private boolean isInAllowMap( Map allowMap, String mapType, String mapKey,
String allKey)
+ private boolean isInAllowMap(Map allowMap, String mapType, String mapKey,
String allKey)
{
boolean allow = false;
if (allowMap != null)
{
Map allowRoleMap = (Map) allowMap.get(mapType);
if (allowRoleMap == null)
+ {
return allowMap.isEmpty(); // If acction exist and no allows, then
grant permission
+ }
- allow = allowRoleMap.containsKey( mapKey);
- if ( allow == false)
- allow = allowRoleMap.containsKey( allKey);
+ allow = allowRoleMap.containsKey(mapKey);
+ if (allow == false)
+ {
+ allow = allowRoleMap.containsKey(allKey);
+ }
return allow;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
