Changeset 285

Timestamp:

03/15/06 16:22:48

Author:

douglm

Message:

Prevent admin group loops

Files:

• trunk/calendar3/calCore/resources/hbms/AdminGroup.hbm.xml (modified) (2 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AdminGroupsDbImpl.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeException.java (modified) (1 diff)

trunk/calendar3/calCore/resources/hbms/AdminGroup.hbm.xml

@@ -59 +59 @@
-    </composite-id>
-
+    <property name="groupId" column="groupid"
+              type="integer" insert="false" update="false"/>
+
-    <!--
-    <id name="groupId" column="groupid" unsaved-value="-1">
@@ -103 +106 @@
-  ]]></query>
-
+  <query name="getGroupParents"><![CDATA[
+    select ag from
+          org.bedework.calfacade.svc.BwAdminGroupEntry age,
+          org.bedework.calfacade.svc.BwAdminGroup ag
+        where ag.id = age.groupId and
+             age.memberId=:grpid
+  ]]></query>
+
-  <query name="getGroupGroupMembers"><![CDATA[
-    select ag from

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

@@ -212 +212 @@
-    }
-    */
+    
+    /* val must not already be present on any paths to the root. 
+     * We'll assume the possibility of more than one parent.
+     */
+    
+    if (!checkPathForSelf(group, val)) {
+      throw new CalFacadeException(CalFacadeException.alreadyOnAdminGroupPath);
+    }
-
-    ag.addGroupMember(val);
@@ -349 +357 @@
-    return user;
-  }*/
+  
+  private boolean checkPathForSelf(BwGroup group, 
+                                   BwPrincipal val) throws CalFacadeException {
+    if (group.equals(val)) {
+      return false;
+    }
+    
+    /* get all parents of group and try again */
+    
+    HibSession sess = getSess();
+
+    /* Want this
+    sess.createQuery("from " + BwAdminGroup.class.getName() + " ag " +
+                     "where mbr in elements(ag.groupMembers)");
+    sess.setEntity("mbr", val);
+    */
+
+    sess.namedQuery("getGroupParents");
+    sess.setInt("grpid", group.getId());
+
+    Collection parents = sess.getList();
+
+    Iterator it = parents.iterator();
+    
+    while (it.hasNext()) {
+      BwAdminGroup g = (BwAdminGroup)it.next();
+      
+      if (!checkPathForSelf(g, val)) {
+        return false;
+      }
+    }
+    
+    return true;
+  }
-
-  private HibSession getSess() throws CalFacadeException {

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

@@ -69 +69 @@
-  public static final String duplicateAdminGroup =
-      "org.bedework.exception.duplicateadmingroup";
+  
+  /** The admin group is already on the path to the root (makes a loop) */
+  public static final String alreadyOnAdminGroupPath =
+      "org.bedework.exception.alreadyonadmingrouppath";
-
-  /* ****************** Calendars ****************************** */