Changeset 477

Timestamp:

05/15/06 00:25:17

Author:

douglm

Message:

Access changes to correctly handle multiple aces for a single 'who'.
Fix the access action.

Temp fix to allow updating of calendar object for access changes.

Files:

• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Ace.java (modified) (6 diffs)
• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Acl.java (modified) (5 diffs)
• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/PrivilegeSet.java (modified) (5 diffs)
• trunk/calendar3/appcommon/src/org/bedework/appcommon/AccessAppUtil.java (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AccessUtil.java (modified) (7 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java (modified) (3 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/HibSession.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwCalendar.java (modified) (4 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/CalendarsI.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/access/AccessAction.java (modified) (3 diffs)

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

@@ -298 +298 @@
-   */
-  public PrivilegeSet getHow() {
+    if (how == null) {
+      how = new PrivilegeSet();
+    }
+
-    return how;
-  }
@@ -326 +330 @@
-  public void addPriv(Privilege val) {
-    getPrivs().add(val);
+    getHow().setPrivilege(val);
-  }
-
@@ -510 +515 @@
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-      if (notWho) {
-        return -1;
@@ -531 +527 @@
-    }
-
-that
+whoMatch
-      return -1;
-    }
-
-that
+whoMatch
-      return 1;
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -557 +576 @@
-
-  public boolean equals(Object o) {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  }
-
@@ -608 +615 @@
-   * ==================================================================== */
-
-
-
-
+//
+//
+//
-
-  private int compareWho(String who1, String who2) {

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

@@ -362 +362 @@
-  }
-
-
+ 
-   *
-   * @param who
@@ -368 +368 @@
-   * @param whoType
-   * @return boolean true if removed
-
-Access
+ 
+Who
-    if (aces == null) {
-      return false;
@@ -375 +375 @@
-
-    return aces.remove(new Ace(who, notWho, whoType, (PrivilegeSet)null));
-
+*/
-
-  /** Remove access for a given 'who' entry
@@ -382 +382 @@
-   * @return boolean true if removed
-   */
-Access
+Who
-    if (aces == null) {
-      return false;
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -477 +508 @@
-   * <p>Also note the encoded value will not reflect the eventual Acl.
-   *
-char[] val to decode and
+Acl to
-   * @throws AccessException
-   */

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

@@ -60 +60 @@
- *  @author Mike Douglass   douglm@rpi.edu
- */
-
+, Comparable
-  private char[] privileges;
-
@@ -168 +168 @@
-  }
-
+  /**
+   */
+  public PrivilegeSet() {
+    privileges = (char[])defaultNonOwnerPrivileges.getPrivileges().clone();
+  }
+
-  /** Default privs for an owner
-   *
@@ -205 +211 @@
-
-    privileges[index] = val;
+  }
+
+  /** Set the given privilege
+   *
+   * @param priv  Privilege object
+   */
+  public void setPrivilege(Privilege priv) {
+    if (privileges == null) {
+      privileges = (char[])defaultNonOwnerPrivileges.getPrivileges().clone();
+    }
+
+    if (priv.getDenial()) {
+      privileges[priv.getIndex()] = denied;
+    } else {
+      privileges[priv.getIndex()] = allowed;
+    }
-  }
-
@@ -307 +329 @@
-  }
-
+  /* ====================================================================
+   *                   Object methods
+   * ==================================================================== */
+
+  public int compareTo(Object o) {
+    if (this == o) {
+      return 0;
+    }
+
+    if (!(o instanceof PrivilegeSet)) {
+      return 1;
+    }
+
+    PrivilegeSet that = (PrivilegeSet)o;
+    if (privileges == null) {
+      if (that.privileges != null) {
+        return -1;
+      }
+
+      return 0;
+    }
+
+    if (that.privileges != null) {
+      return -1;
+    }
+
+    for (int pi = 0; pi < privileges.length; pi++) {
+      char thisp = privileges[pi];
+      char thatp = that.privileges[pi];
+
+      if (thisp < thatp) {
+        return -1;
+      }
+
+      if (thisp > thatp) {
+        return -1;
+      }
+    }
+
+    return 0;
+  }
+
+  public int hashCode() {
+    int hc = 7;
+
+    if (privileges == null) {
+      return hc;
+    }
+
+    for (int pi = 0; pi < privileges.length; pi++) {
+      hc *= privileges[pi];
+    }
+
+    return hc;
+  }
+
+  public boolean equals(Object o) {
+    return compareTo(o) == 0;
+  }
+
-  public Object clone() {
-    return new PrivilegeSet((char[])getPrivileges().clone());
@@ -320 +402 @@
-  }
-}
-

trunk/calendar3/appcommon/src/org/bedework/appcommon/AccessAppUtil.java

@@ -338 +338 @@
-
-    if (tagOpen) {
+      // XXX Wrong - need to encode an href in the acl
+      /*
+      if (ace.getInherited()) {
+        xml.emptyTag(WebdavTags.inherited);
+      }
+      */
-      xml.closeTag(tag);
-    }

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

@@ -111 +111 @@
-  }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  /* ====================================================================
@@ -181 +195 @@
-
-  /** Change the access to the given calendar entity using the supplied aces.
+   * We are changing access so we remove all access for each who in the list and
+   * then add the new aces.
-   *
-   * @param ent      BwShareableDbentity
@@ -191 +207 @@
-      Acl acl = checkAccess(ent, privWriteAcl, false).acl;
-
+      /* First remove for all whos */
-      Iterator it = aces.iterator();
-      while (it.hasNext()) {
-        Ace ace = (Ace)it.next();
-
-
+
+
+
+
+
+
+
+
-        acl.addAce(ace);
-      }
@@ -201 +225 @@
-      ent.setAccess(new String(acl.encode()));
-
-
-
-
+
-    } catch (Throwable t) {
-      throw new CalFacadeException(t);
@@ -348 +370 @@
-
-      String path = container.getPath();
-(PathInfo)pathInfoTable.get
+pathInfoMap.getInfo
-
-      if (pi == null) {
-        pi = getPathInfo(container);
-Table.put
+Map.putInfo
-      }
-
@@ -475 +497 @@
-
-  /* Update the merged Acl for the given calendar.
-/
+ Doesn't work because any children in the table need the access changing.
-  private void updatePathInfo(BwCalendar cal, Acl acl) throws CalFacadeException {
-    try {
-      String path = cal.getPath();
-(PathInfo)pathInfoTable.get
+pathInfoMap.getInfo
-
-      if (pi == null) {
@@ -490 +512 @@
-      pi.encoded = acl.encodeAll();
-
-Table.put
+Map.putInfo
-    } catch (Throwable t) {
-      throw new CalFacadeException(t);
-    }
-  }
+   */
-
-  private Logger getLog() {

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

@@ -395 +395 @@
-  }
-
+  public void changeAccess(BwCalendar cal,
+                           Collection aces) throws CalFacadeException {
+    HibSession sess = getSess();
+
+    cal = getCalendar(cal.getPath(), privWriteAcl, false);
+    access.changeAccess(cal, aces);
+    sess.saveOrUpdate(cal);
+  }
+
-  public boolean deleteCalendar(BwCalendar val) throws CalFacadeException {
-    HibSession sess = getSess();
@@ -472 +481 @@
-  /* Returns the cloned (sub)tree of calendars to which user has access
-   *
+   * <p>This needs a rethink - cloning effectively disables optimistic
+   * locking - at least I think so.
+   *
-   * @return BwCalendar   (sub)root with all accessible children attached
-   * @throws CalFacadeException
@@ -490 +502 @@
-
-    BwCalendar cal = (BwCalendar)subroot.shallowClone();
-
+
+
-    cal.setId(subroot.getId());
-

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

@@ -698 +698 @@
-  public void changeAccess(BwShareableDbentity ent,
-                           Collection aces) throws CalFacadeException {
-
+
+
+
+
+
+
-    access.changeAccess(ent, aces);
-    sess.saveOrUpdate(ent);
+  }
+
+  public void changeAccess(BwCalendar cal,
+                           Collection aces) throws CalFacadeException {
+    checkOpen();
+    calendars.changeAccess(cal, aces);
-  }
-

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

@@ -686 +686 @@
-   *
-   * @param obj
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwCalendar.java

@@ -418 +418 @@
-   */
-  public BwCalendar shallowClone() {
-return
+BwCalendar cal = 
-                          getPublick(),
-                          (BwUser)getCreator().clone(),
@@ -431 +431 @@
-                          null,
-                          getCalType());
+
+    cal.setId(getId()); // Add to constructor
+    cal.setSeq(getSeq()); // Add to constructor
+    return cal;
-  }
-
@@ -505 +509 @@
-
-  public Object clone() {
-return
+BwCalendar cal =
-                          getPublick(),
-                          (BwUser)getCreator().clone(),
@@ -518 +522 @@
-                          getChildren(),
-                          getCalType());
+
+    cal.setId(getId()); // Add to constructor
+    cal.setSeq(getSeq()); // Add to constructor
+    return cal;
-  }
-}

trunk/calendar3/calFacade/src/org/bedework/calfacade/base/CalintfBase.java

@@ -489 +489 @@
-  }
-
+  public void changeAccess(BwCalendar cal,
+                           Collection aces) throws CalFacadeException {
+    checkOpen();
+    throw new CalFacadeUnimplementedException();
+  }
+
-  public boolean deleteCalendar(BwCalendar val) throws CalFacadeException {
-    checkOpen();

trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/CalendarsI.java

@@ -222 +222 @@
-  public void updateCalendar(BwCalendar val) throws CalFacadeException;
-
+  /** Change the access to the given calendar entity.
+   *
+   * @param cal      Bwcalendar
+   * @param aces     Collection of ace
+   * @throws CalFacadeException
+   */
+  public void changeAccess(BwCalendar cal,
+                           Collection aces) throws CalFacadeException;
+
-  /** Delete the given calendar
-   *

trunk/calendar3/webcommon/src/org/bedework/webcommon/access/AccessAction.java

@@ -184 +184 @@
-    char[] howchs = how.toCharArray();
-
-=
+
-      char howch = howchs[hi];
-      boolean found = false;
@@ -195 +195 @@
-          break;
-        }
-
-
-    form.getErr().emit("org.bedework.client.error.badhow");
-  return "error"
-}
+
+
+if (!found) {
+form.getErr().emit("org.bedework.client.error.badhow")
+return "error";
-      }
-    }
@@ -206 +206 @@
-    if (ev != null) {
-      svci.changeAccess(ev, aces);
-
+//
-    } else {
-      svci.changeAccess(cal, aces);
-
+//
-    }
-