Changeset 376

Timestamp:

04/14/06 10:18:58

Author:

douglm

Message:

Access changes:

Inherited flag was not being processed correctly - now encoded and passed around.
Only non-inherited aces are stored in entities
Update pathinfo table when access changed

Moved access action into common component and changed to use correct event refs.

Files:

• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Ace.java (modified) (5 diffs)
• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/PrivilegeDefs.java (modified) (1 diff)
• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Privileges.java (modified) (4 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AccessUtil.java (modified) (8 diffs)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwAccessAction.java (deleted)
• trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/access (added)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/access/AccessAction.java (added)

trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Ace.java

@@ -354 +354 @@
-                         String name, int whoType) throws AccessException {
-    Iterator it = acl.getAces().iterator();
-
+
-    while (it.hasNext()) {
-      Ace ace = (Ace)it.next();
@@ -360 +360 @@
-      if ((whoType == ace.getWhoType()) &&
-          ((whoType == whoTypeUnauthenticated) ||
- 
+
-            ace.whoMatch(name))) {
-        return ace;
@@ -368 +368 @@
-    return null;
-  }
-
+
-  /* ====================================================================
-   *                 Decoding methods
@@ -464 +464 @@
-      Privilege p = (Privilege)it.next();
-      p.encode(acl);
+    }
+
+    if (inherited) {
+      acl.addChar(PrivilegeDefs.inheritedFlag);
-    }
-
@@ -693 +697 @@
-      setPrivs(Privileges.getPrivs(acl));
-    }
+
+    // See if we got an inherited flag
+    acl.back();
+    if (acl.getChar() == PrivilegeDefs.inheritedFlag) {
+      inherited = true;
+      if (acl.getChar() != ' ') {
+        throw new AccessException("malformedAcl");
+      }
+    }
-  }
-}

trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/PrivilegeDefs.java

@@ -75 +75 @@
-   */
-  public static final char unspecified = '1';
+
+  public static final char inheritedFlag = 'I';
-
-  // ENUM

trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Privileges.java

@@ -102 +102 @@
-
-  private final static Privilege[] privs = new Privilege[privMaxType + 1];
-
+
-  static {
-    privs[privAll] = new Privilege("all", "All privileges", privAll);
-
-    privs[privRead] = new Privilege("read", "Read any calendar object", privRead);
-
- 
+
+
-                                       privReadAcl);
-
+
-    privs[privReadCurrentUserPrivilegeSet] =
-      new Privilege("read-current-user-privilege-set",
- 
+
-                    privReadCurrentUserPrivilegeSet);
-
- 
- 
+
+
+
-                                            privReadFreeBusy);
-
- 
+
+
-                                     privWrite);
-
+
-    privs[privWriteAcl] = new Privilege("write-acl", "Write ACL", privWriteAcl);
-
- 
- 
+
+
+
-                                               privWriteProperties);
-
- 
- 
+
+
+
-                                            privWriteContent);
-
- 
+
+
-                                    privBind);
-
- 
+
+
-                                      privUnbind);
-
- 
+
+
-                                      privUnlock);
-
+
-    privs[privNone] = (Privilege)privs[privAll].clone();
-    privs[privNone].setDenial(true);
-
+
-    privs[privAll].addContainedPrivilege(privs[privRead]);
-    privs[privAll].addContainedPrivilege(privs[privWrite]);
-    privs[privAll].addContainedPrivilege(privs[privUnlock]);
-
+
-    privs[privRead].addContainedPrivilege(privs[privReadAcl]);
-    privs[privRead].addContainedPrivilege(privs[privReadCurrentUserPrivilegeSet]);
-    privs[privRead].addContainedPrivilege(privs[privReadFreeBusy]);
-
+
-    privs[privWrite].addContainedPrivilege(privs[privWriteAcl]);
-    privs[privWrite].addContainedPrivilege(privs[privWriteProperties]);
@@ -215 +215 @@
-    while (acl.hasMore()) {
-      char c = acl.getChar();
-c == ' '
+(c == ' ') || (c == inheritedFlag)
-        break;
-      }
@@ -239 +239 @@
-  public static void skip(EncodedAcl acl) throws AccessException {
-    while (acl.hasMore()) {
-
+
+
-        break;
-      }
@@ -257 +258 @@
-    while (acl.hasMore()) {
-      char c = acl.getChar();
-c == ' '
+(c == ' ') || (c == inheritedFlag)
-        break;
-      }

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AccessUtil.java

@@ -121 +121 @@
-    superUser = val;
-  }
-
+
-  boolean getSuperUser() {
-    return superUser;
-  }
-
+
-  void setAuthUser(BwUser val) {
-    authUser = val;
@@ -164 +164 @@
-  /** Change the access to the given calendar entity using the supplied aces.
-   *
- 
+
-   * @param aces     Collection of ace objects
-   * @throws CalFacadeException
-   */
- 
+
-                           Collection aces) throws CalFacadeException {
-    try {
@@ -182 +182 @@
-
-      ent.setAccess(new String(acl.encode()));
+
+      if (ent instanceof BwCalendar) {
+        updatePathInfo((BwCalendar)ent, acl);
+      }
-    } catch (Throwable t) {
-      throw new CalFacadeException(t);
@@ -230 +234 @@
-      CurrentAccess ca;
-      String account = ent.getOwner().getAccount();
-
+
-      char[] aclChars = getAclChars(ent);
-
@@ -243 +247 @@
-      if ((authUser != null) && superUser) {
-        // Nobody can stop us - BWAAA HAA HAA
- 
-
-
+
+
+
-      if (!ca.accessAllowed && !returnResult) {
-        throw new CalFacadeAccessException();
@@ -359 +363 @@
-   */
-  private PathInfo getPathInfo(BwCalendar cal) throws CalFacadeException {
-    boolean isPublic = cal.getPublick();
-    Acl acl = null;
-    PathInfo pi = new PathInfo();
@@ -377 +380 @@
-        if ((aclString == null) && (cal.getCalendar() == null)) {
-          // At root
-
-
-
-
-
-
+
-        }
-
@@ -398 +396 @@
-
-      pi.pathAcl = acl;
-getEncoded
+encodeAll
-
-      return pi;
+    } catch (CalFacadeException cfe) {
+      throw cfe;
+    } catch (Throwable t) {
+      throw new CalFacadeException(t);
+    }
+  }
+
+  /* Update the merged Acl for the given calendar.
+   */
+  private void updatePathInfo(BwCalendar cal, Acl acl) throws CalFacadeException {
+    try {
+      String path = cal.getPath();
+      PathInfo pi = (PathInfo)pathInfoTable.get(path);
+
+      if (pi == null) {
+        pi = new PathInfo();
+
+        pi.path = cal.getPath();
+      }
+
+      pi.pathAcl = acl;
+      pi.encoded = acl.encodeAll();
+
+      pathInfoTable.put(path, pi);
-    } catch (Throwable t) {
-      throw new CalFacadeException(t);

trunk/calendar3/webclient/war/WEB-INF/struts-config.xml

@@ -313 +313 @@
-
-    <action    path="/setAccess"
-lient.Bw
+ommon.access.
-               name="calForm"
-               scope="session"