Changeset 320

Timestamp:

04/03/06 00:22:34

Author:

douglm

Message:

Partial changes to make current access to objects visible at application level. Currently only calendars and that not complete.

New tag to emit current access as xml.

Fixes to webclient to sort out exceptions and also display public rather than personal calendars.

Files:

• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Access.java (modified) (6 diffs)
• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/Acl.java (modified) (9 diffs)
• trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/PrivilegeDefs.java (modified) (1 diff)
• trunk/calendar3/appcommon/src/org/bedework/appcommon/AccessAppUtil.java (moved) (moved from trunk/calendar3/appcommon/src/org/bedework/appcommon/AccessUtil.java) (4 diffs)
• trunk/calendar3/appcommon/src/org/bedework/appcommon/EventFormatter.java (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AccessUtil.java (modified) (4 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java (modified) (3 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwCalendar.java (modified) (3 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java (modified) (2 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/EmitAccess.java (modified) (2 diffs)
• trunk/calendar3/lib/tlds/bedework.tld (modified) (1 diff)
• trunk/calendar3/test/src/org/bedework/tests/access/AccessTest.java (modified) (4 diffs)
• trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (modified) (5 diffs)
• trunk/calendar3/webclient/war/docs/calendar/emitCalendar.jsp (modified) (1 diff)
• trunk/calendar3/webclient/war/docs/calendar/emitPublicCalendars.jsp (added)
• trunk/calendar3/webclient/war/docs/subs/subscriptions.jsp (modified) (3 diffs)
• trunk/calendar3/webcommon/build.xml (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/EmitCurrentPrivsTag.java (added)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/EmitTextTag.java (modified) (1 diff)

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

@@ -55 +55 @@
-
-import java.io.Serializable;
+
+import edu.rpi.cct.uwcal.access.Acl.CurrentAccess;
-
-/** Class to handle access control. Because we may be evaluating access 
@@ -184 +186 @@
-   * @param how      Privilege set definign desired access
-   * @param aclString String defining current acls for object
-boolean
-
-
-boolean
-
+CurrentAccess   access +
+
+
+CurrentAccess
+      
-          throws AccessException {
-    return new Acl(debug).evaluateAccess(who, owner, how, aclString.toCharArray());
@@ -199 +201 @@
-   * @param how      Privilege set defining desired access
-   * @param aclChars char[] defining current acls for object
-boolean
-
-
-boolean
-
+CurrentAccess   access +
+
+
+CurrentAccess
+      
-          throws AccessException {
-    return new Acl(debug).evaluateAccess(who, owner, how, aclChars);
@@ -213 +215 @@
-   * @param owner    String owner of object
-   * @param aclChars char[] defining current acls for object
-boolean
-
-
-boolean
-
+CurrentAccess   access +
+
+
+CurrentAccess
+      
-          throws AccessException {
-    return new Acl(debug).evaluateAccess(who, owner, privSetRead, aclChars);
@@ -227 +229 @@
-   * @param owner    String owner of object
-   * @param aclChars char[] defining current acls for object
-boolean
-
-
-boolean
-
+CurrentAccess   access +
+
+
+CurrentAccess
+      
-          throws AccessException {
-    return new Acl(debug).evaluateAccess(who, owner, privSetReadWrite, aclChars);
@@ -242 +244 @@
-   * @param priv     int desired access as defined above
-   * @param aclChars char[] defining current acls for object
-boolean
-
-
-boolean
-
+CurrentAccess   access +
+
+
+CurrentAccess
+      
-          throws AccessException {
-    return new Acl(debug).evaluateAccess(who, owner,

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

@@ -119 +119 @@
-    aces = null;
-  }
+  
+  /** Result of evaluating access to an object for a principal
+   */
+  public static class CurrentAccess {
+    /**  Allowed access for each privilege type 
+     * @see PrivilegeDefs
+     */
+    public char[] privileges = null;
+
+    /** Privileges desired */
+    public Privilege[] desiredAccess;
+
+    /** Was it succesful */
+    public boolean accessAllowed;
+  }
-
-  /** Evaluating an ACL
@@ -152 +167 @@
-   * @param how
-   * @param acl
-boolean true for access 
-
-
-synchronized boolean
-       
+CurrentAccess   access + allowed/dis
+
+
+CurrentAccess
+
-          throws AccessException {
-    boolean authenticated = !who.getUnauthenticated();
-    boolean isOwner = false;
-
+
+
-
-    setEncoded(acl);
@@ -182 +198 @@
-      if (!authenticated) {
-        if (ace.decode(this, false, null, Ace.whoTypeUnauthenticated)) {
-
+ca.
-        }
-
@@ -190 +206 @@
-      if (isOwner) {
-        if (ace.decode(this, false, null, Ace.whoTypeOwner)) {
-
+ca.
-        } else {
-
+ca.
-        }
-
@@ -200 +216 @@
-      // Not owner - look for user
-      if (ace.decode(this, false, who.getAccount(), Ace.whoTypeUser)) {
-
+ca.
-        if (debug) {
-
+ca.
-        }
-
@@ -219 +235 @@
-          }
-          if (ace.decode(this, false, group, Ace.whoTypeGroup)) {
-privileges = mergePrivileges(
+ca.privileges = mergePrivileges(ca.
-          }
-        }
-      }
-
-
+ca.
-        if (debug) {
-
+ca.
-        }
-
@@ -234 +250 @@
-      // "other" access set?
-      if (ace.decode(this, false, null, Ace.whoTypeOther)) {
-
+ca.
-
-        if (debug) {
-
+ca.
-        }
-
@@ -244 +260 @@
-    } // getPrivileges
-
-
+ca.
-      if (debug) {
-        debugMsg(debugsb.toString() + "...Check access denied (noprivs)");
-      }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    for (int i = 0; i < how.length; i++) {
-
-
-
-
-
-
-
-
+
+
-      if (priv != allowed) {
-        if (debug) {
-          debugMsg(debugsb.toString() + "...Check access denied (!allowed)");
-        }
-false
+ca
-      }
-    }
@@ -272 +293 @@
-    }
-
-
+
+
-  }
-

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

@@ -76 +76 @@
-  public static final char unspecified = '1';
-
+  // ENUM
-  /** Define a privilege type index
-   */

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

@@ -61 +61 @@
-import edu.rpi.cct.uwcal.access.Acl;
-import edu.rpi.cct.uwcal.access.Privilege;
+import edu.rpi.cct.uwcal.access.PrivilegeDefs;
-import edu.rpi.cct.uwcal.access.Privileges;
-import edu.rpi.sss.util.xml.QName;
@@ -75 +76 @@
- *  @author Mike Douglass   douglm @ rpi.edu
- */
-
+App
-  public static final QName[] privTags = {
-    WebdavTags.all,              // privAll = 0;
@@ -98 +99 @@
-   * @param xml
-   */
-
+App
-    this.xml = xml;
-  }
-  
-
+Acl
-    try {
-      XmlEmit xml = new XmlEmit(true);  // no headers
-      StringWriter su = new StringWriter();
-      xml.startEmit(su);
-Util au = new Access
+AppUtil au = new AccessApp
-      
-      au.emitAcl(acl);
@@ -197 +198 @@
-    }
-  }
+  
+  /** Produce an xml representation of current user privileges from an array
+   * of allowed/disallowed/unspecified flags indexed by a privilege index.
+   * 
+   * @param privs    char[] of allowed/disallowed
+   * @throws CalFacadeException
+   */
+  public void emitCurrentPrivSet(char[] privileges) throws CalFacadeException {
+    try {
+      xml.openTag(WebdavTags.currentUserPrivilegeSet);
+      
+      for (int pi = 0; pi < privileges.length; pi++) {
+        if (privileges[pi] == PrivilegeDefs.allowed) {
+          // XXX further work - don't emit abstract privs or contained privs.
+          QName pr = privTags[pi];
+          
+          if (pr != null) {
+            xml.propertyTagVal(WebdavTags.privilege, pr);
+          }
+        }
+      }
+      
+      xml.closeTag(WebdavTags.currentUserPrivilegeSet);
+    } catch (Throwable t) {
+      throw new CalFacadeException(t);
+    }
+  }
+  
+  /** Produce an xml representation of current user privileges from an array
+   * of allowed/disallowed/unspecified flags indexed by a privilege index,
+   * returning the representation a a String
+   * 
+   * @param privs    char[] of allowed/disallowed
+   * @return String xml 
+   * @throws CalFacadeException
+   */
+  public static String getCurrentPrivSetString(char[] privileges) 
+          throws CalFacadeException {
+    try {
+      XmlEmit xml = new XmlEmit(true);  // no headers
+      StringWriter su = new StringWriter();
+      xml.startEmit(su);
+      AccessAppUtil au = new AccessAppUtil(xml);
+      
+      au.emitCurrentPrivSet(privileges);
+      
+      su.close();
+      
+      return su.toString();
+    } catch (CalFacadeException cfe) {
+      throw cfe;
+    } catch (Throwable t) {
+      throw new CalFacadeException(t);
+    }
+  }
+
+  /* ====================================================================
+   *                   Private methods
+   * ==================================================================== */
-
-  private void emitSupportedPriv(Privilege priv) throws Throwable {

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

@@ -211 +211 @@
-      if (xmlAccess == null) {
-        Acl acl = svci.getAcl(getEvent());
-Util.getXm
+AppUtil.getXmlAc
-      }
-    } catch (Throwable t) {

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

@@ -58 +58 @@
-import edu.rpi.cct.uwcal.access.Acl;
-import edu.rpi.cct.uwcal.access.PrivilegeDefs;
+import edu.rpi.cct.uwcal.access.Acl.CurrentAccess;
-
-import org.bedework.calfacade.base.BwShareableContainedDbentity;
@@ -236 +237 @@
-  boolean accessible(BwShareableDbentity ent, int desiredAccess,
-                    boolean nullForNoAccess) throws CalFacadeException {
+    return checkAccess(ent, desiredAccess, nullForNoAccess).accessAllowed;
+  }
+
+  /* Check access for the given entity. Returns the current access
+   */
+  CurrentAccess checkAccess(BwShareableDbentity ent, int desiredAccess,
+                      boolean nullForNoAccess) throws CalFacadeException {
-    if (ent == null) {
-false
+new CurrentAccess()
-    }
-
-    if ((authUser != null) && superUser) {
-      // Nobody can stop us - BWAAA HAA HAA
-
+
+
+
+
-    }
-
@@ -254 +265 @@
-    char[] aclChars = getAclChars((BwShareableDbentity)ent);
-
-
-
-
-
-
-
+
+
-  }
-
@@ -310 +317 @@
-   * @param returnResult  if true we return false for no access else throw
-   *                    an exception
-
-
+
+
+
-                              boolean returnResult) throws CalFacadeException {
-
-
-
-
+
+
-      if (desiredAccess == privRead) {
-
+
+
+
+
-                                   aclChars);
-      } else if (desiredAccess == privWrite) {
-        allowed = access.checkReadWrite(authUser, owner.getAccount(),
-                                        aclChars);
-      } else {
-        /* Do it the awkward way */
-
-
-
-
-
-
-
-
+
+
+
+
+
-        throw new CalFacadeAccessException();
-      }
-
-true
+ca
-    } catch (CalFacadeException cfe) {
-      throw cfe;

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

@@ -60 +60 @@
-import org.bedework.calfacade.CalFacadeException;
-
+import edu.rpi.cct.uwcal.access.Acl.CurrentAccess;
+
-import java.util.Collection;
-import java.util.Iterator;
@@ -421 +423 @@
-  private BwCalendar cloneAndCheckOne(BwCalendar subroot, int desiredAccess,
-                           boolean nullForNoAccess) throws CalFacadeException {
-
+
+
+
+
-      return null;
-    }
@@ -428 +433 @@
-    // XXX Temp fix - add id to the clone
-    cal.setId(subroot.getId());
+    
+    cal.setCurrentAccess(ca);
-
-    Iterator it = subroot.iterateChildren();

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

@@ -56 +56 @@
-import org.bedework.calfacade.base.BwShareableContainedDbentity;
-
+import edu.rpi.cct.uwcal.access.Acl.CurrentAccess;
+
-import java.net.URLEncoder;
-import java.util.Collection;
@@ -100 +102 @@
-  /** The children of this calendar */
-  private Collection children;
+  
+  /* This field must only be used for cloned copies of an entity as it is 
+   * specific to a current thread.
+   */
+  private CurrentAccess currentAccess;
-
-  /** Constructor
@@ -264 +271 @@
-
-  /* ====================================================================
+   *                   Transient object methods
+   * ==================================================================== */
+
+  public void setCurrentAccess(CurrentAccess val) {
+    currentAccess = val;
+  }
+
+  public CurrentAccess getCurrentAccess() {
+    return currentAccess;
+  }
+
+  /* ====================================================================
-   *                   Convenience methods
-   * ==================================================================== */

trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java

@@ -54 +54 @@
-package edu.rpi.cct.uwcal.caldav;
-
-
+App
-import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwEvent;
@@ -782 +782 @@
-    findPriv: {
-      // ENUM
-
-
+App
+App
-          break findPriv;
-        }

trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/EmitAccess.java

@@ -54 +54 @@
-package edu.rpi.cct.uwcal.caldav;
-
-
+App
-import edu.rpi.sss.util.xml.XmlEmit;
-
@@ -61 +61 @@
- *
- */
-
+App
-  private String namespacePrefix;
-  

trunk/calendar3/lib/tlds/bedework.tld

@@ -53 +53 @@
-    </attribute>
-  </tag>
+
+  <tag>
+    <name>emitCurrentPrivs</name>
+    <tagclass>org.bedework.webcommon.taglib.EmitCurrentPrivsTag</tagclass>
+    <bodycontent>empty</bodycontent>
+    <info>Emit txt in a tag</info>
+
+    <attribute>
+      <name>name</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+
+    <attribute>
+      <name>property</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+
+    <attribute>
+      <name>scope</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+
+    <attribute>
+      <name>tagName</name>
+      <required>false</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
-</taglib>
-

trunk/calendar3/test/src/org/bedework/tests/access/AccessTest.java

@@ -63 +63 @@
-import edu.rpi.cct.uwcal.access.Privilege;
-import edu.rpi.cct.uwcal.access.Privileges;
+import edu.rpi.cct.uwcal.access.Acl.CurrentAccess;
-
-import junit.framework.TestCase;
@@ -73 +74 @@
-public class AccessTest extends TestCase {
-  boolean debug = true;
-
-  Acl acl = new Acl(debug);
-
-  /**
@@ -100 +99 @@
-
-      /* See what we get when we encode a null - that's default - acl. */
+
+      Acl acl = new Acl(debug);
-
-      char[] encoded = logEncoded(acl, "default encoded");
@@ -154 +155 @@
-                                 Privilege[] how,char[] encoded,
-                                 boolean expected, String title) throws Throwable {
-boolean allowed = acl
+CurrentAccess ca = new Acl()
-
-    if (debug) {
-a
+ca.accessA
-    }
-a
+ca.accessA
-  }
-

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

@@ -434 +434 @@
-    <action    path="/subs/fetch"
-               type="org.bedework.webcommon.subs.GetSubscriptionsAction"
-pe
+cal
-               scope="session"
-               validate="false">
@@ -442 +442 @@
-    <action    path="/subs/fetchForUpdate"
-               type="org.bedework.webcommon.subs.FetchSubscriptionAction"
-pe
+cal
-               scope="session"
-               validate="false">
@@ -451 +451 @@
-    <action    path="/subs/initAdd"
-               type="org.bedework.webcommon.subs.InitSubscribeAction"
-pe
+cal
-               scope="session"
-               validate="false">
@@ -461 +461 @@
-    <action    path="/subs/subscribe"
-               type="org.bedework.webcommon.subs.SubscribeAction"
-pe
+cal
-               scope="session"
-               validate="false">
@@ -472 +472 @@
-    <action    path="/subs/unsubscribe"
-               type="org.bedework.webcommon.subs.UnsubscribeAction"
-pe
+cal
-               scope="session"
-               validate="false">

trunk/calendar3/webclient/war/docs/calendar/emitCalendar.jsp

@@ -1 +1 @@
-<%@ taglib uri='struts-bean' prefix='bean' %>
-<%@ taglib uri='struts-logic' prefix='logic' %>
+<%@ taglib uri='bedework' prefix='bw' %>
-
-<calendar>
-  <id><bean:write name="calendar" property="id" /></id>
-name><bean:write name="calendar" property="name" /></name
-path><bean:write name="calendar" property="path" /></path
-desc><bean:write name="calendar" property="description" /></desc
+bw:emitText name="calendar" property="name" /
+bw:emitText name="calendar" property="path" /
+bw:emitText name="calendar" property="description" tagName="desc" /
-  <calendarCollection><bean:write name="calendar" property="calendarCollection" /></calendarCollection>
-
+
+
-
-  <logic:iterate name="calendar" property="children" id="cal">

trunk/calendar3/webclient/war/docs/subs/subscriptions.jsp

@@ -1 +1 @@
-<%@ taglib uri='struts-bean' prefix='bean' %>
-<%@ taglib uri='struts-logic' prefix='logic' %>
+<%@ taglib uri='bedework' prefix='bw' %>
-
-<%@include file="/docs/header.jsp"%>
+
+<%
+try {
+%>
-
-<page>subscriptions</page>
@@ -9 +14 @@
-  <logic:iterate name="calForm" property="subscriptions" id="subscription">
-    <subscription>
-name><bean:write name="subscription" property="name" /></name
-uri><bean:write name="subscription" property="uri" /></uri
+bw:emitText name="subscription" property="name" /
+bw:emitText name="subscription" property="uri" /
-      <affectsFreeBusy><bean:write name="subscription" property="affectsFreeBusy" /></affectsFreeBusy>
-      <display><bean:write name="subscription" property="display" /></display>
-style><bean:write name="subscription" property="style" /></style
+bw:emitText name="subscription" property="style" /
-      <internal><bean:write name="subscription" property="internalSubscription" /></internal>
-      <emailNotifications><bean:write name="subscription" property="emailNotifications" /></emailNotifications>
@@ -23 +28 @@
-  <subscribe>
-    <!-- List of calendars to subscribe to-->
-
+Public
-  </subscribe>
-</subscriptions>
-
+<%
+} catch (Throwable t) {
+  t.printStackTrace();
+}
+%>
+
-
-<%@include file="/docs/footer.jsp"%>

trunk/calendar3/webcommon/build.xml

@@ -36 +36 @@
-      <pathelement location="${ical4j.jar}"/>
-
+      <pathelement location="${org.bedework.access.jar}"/>
-      <pathelement location="${org.bedework.common.jar}"/>
-      <pathelement location="${org.bedework.calenv.jar}"/>

trunk/calendar3/webcommon/src/org/bedework/webcommon/taglib/EmitTextTag.java

@@ -93 +93 @@
-  public int doEndTag() throws JspTagException {
-    try {
-      /* Try to retrieve the path from category */
-
-      /* Try to retrieve the value */
-      String val = getString(false);