Changeset 3150

Timestamp:

Feb 26, 2007, 11:44:59 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #501: Make members of a project readable by all other members

Location:

branches/2.2.2/src/core

Files:

• common-queries.xml (modified) (1 diff)
• net/sf/basedb/core/Group.java (modified) (3 diffs)
• net/sf/basedb/core/Keyring.java (modified) (5 diffs)
• net/sf/basedb/core/User.java (modified) (3 diffs)

branches/2.2.2/src/core/common-queries.xml

@@ -202 +202 @@
     <description>
       Load the ID of all users which has a quota group from one of the given groups.
+    </description>
+  </query>
+
+  <query id="GET_USER_IDS_FOR_PROJECT" type="HQL">
+    <sql>
+      SELECT up.userId
+      FROM UserProjects up
+      WHERE up.projectId = :projectId
+    </sql>
+    <description>
+      Load the ID of all users which are direct member of the given project
+    </description>
+  </query>
+
+  <query id="GET_GROUP_IDS_FOR_PROJECT" type="HQL">
+    <sql>
+      SELECT gp.groupId
+      FROM GroupProjects gp
+      WHERE gp.projectId = :projectId
+    </sql>
+    <description>
+      Load the ID of all groups which are direct member of the given project
     </description>
   </query>

branches/2.2.2/src/core/net/sf/basedb/core/Group.java

@@ -29 +29 @@
 import net.sf.basedb.core.query.Hql;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -124 +125 @@
   public static Set<Integer> getGroupsRecursive(DbControl dc, Set<Integer> groups)
   {
+    return getGroupsRecursive(dc.getHibernateSession(), groups);
+  }
+
+  static Set<Integer> getGroupsRecursive(org.hibernate.Session session, Collection<Integer> groups)
+  {
     Set<Integer> allGroups = new HashSet<Integer>(groups);
     if (allGroups.size() > 0)
     {
       
-      org.hibernate.Query query = HibernateUtil.getPredefinedQuery(dc.getHibernateSession(), 
+      org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, 
         "GET_CHILDGROUPS_IDS_FOR_GROUPS");
       /*
@@ -143 +149 @@
     return allGroups;
   }
+
   
   /**

branches/2.2.2/src/core/net/sf/basedb/core/Keyring.java

@@ -450 +450 @@
     Load all users which are member of at least one group where the
     logged in user is also a member and put that information
-    in the {@link #users} variable.
+    in the {@link #users} variable. If a project is active, also load the members
+    and owner of that project.
   */
   private void loadUsers(org.hibernate.Session session)
     throws BaseException
   {
-    Set<Integer> temp;
+    Set<Integer> temp = new HashSet<Integer>();
     try
     {
@@ -468 +469 @@
         */
         query.setParameterList("groups", groups, org.hibernate.Hibernate.INTEGER);
-        temp = new HashSet<Integer>(HibernateUtil.loadList(Integer.class, query));
+        temp.addAll(HibernateUtil.loadList(Integer.class, query));
         
         // Get the users that have a quota group among the same groups
@@ -479 +480 @@
         query.setParameterList("groups", groups, org.hibernate.Hibernate.INTEGER);
         temp.addAll(HibernateUtil.loadList(Integer.class, query));
+      }
+      
+      if (projectId != 0)
+      {
+        // Get the owner of the active project
+        ProjectData pd = HibernateUtil.loadData(session, ProjectData.class, projectId);
+        temp.add(pd.getOwner().getId());
         
-        users = Collections.unmodifiableSet(temp);
-      }
+        // Get direct members of the active project
+        org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_USER_IDS_FOR_PROJECT");
+        /*
+          SELECT up.userId
+          FROM UserProjects up
+          WHERE up.projectId = :projectId
+        */
+        query.setInteger("projectId", projectId);
+        temp.addAll(HibernateUtil.loadList(Integer.class, query));
+        
+        // Get groups that are direct members of the active project
+        query = HibernateUtil.getPredefinedQuery(session, "GET_GROUP_IDS_FOR_PROJECT");
+        /*
+          SELECT gp.groupId
+          FROM GroupProjects gp
+          WHERE gp.projectId = :projectId
+        */
+        query.setInteger("projectId", projectId);
+        // Load the direct groups and subgroups
+        Set<Integer> projectGroups = Group.getGroupsRecursive(session, HibernateUtil.loadList(Integer.class, query));
+
+        // Load users that are members of the project groups
+        temp.addAll(User.getAllMembers(session, projectGroups));
+        
+      }
+      users = Collections.unmodifiableSet(temp);
     }
     catch (HibernateException ex)
@@ -717 +749 @@
   {
     if (getReload() && !reload()) projectData = null;
+    int oldProjectId = projectId;
     if (projectData == null)
     {
@@ -725 +758 @@
     {
       projectId = projectData.getId();
-      org.hibernate.Session session = null;
-      org.hibernate.Transaction tx = null;
-      try
-      {
-        session = HibernateUtil.newSession();
-        tx = HibernateUtil.newTransaction(session);
-        loadMaxProjectPermission(session, projectData);
-        loadProjectKeys(session);
-      }
-      catch (BaseException ex)
-      {
-        projectId = 0;
-        maxProjectPermission = 0;
-        throw ex;
-      }
-      finally
-      {
-        if (tx != null) HibernateUtil.commit(tx);
-        if (session != null) HibernateUtil.close(session);
-      }
-    }
+    }
+    reload = projectId != oldProjectId;
   }
   

branches/2.2.2/src/core/net/sf/basedb/core/User.java

@@ -36 +36 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
@@ -124 +125 @@
   public static Set<Integer> getAllMembers(DbControl dc, Set<Integer> groupIds)
   {
+    return getAllMembers(dc.getHibernateSession(), groupIds);
+  }
+  
+  static Set<Integer> getAllMembers(org.hibernate.Session session, Collection<Integer> groupIds)
+  {
     Set<Integer> userIds = new HashSet<Integer>();
     if (groupIds != null && groupIds.size() > 0)
     {
-      org.hibernate.Session session = dc.getHibernateSession();
       // Get the users which are members of the same groups
       org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_USER_IDS_FOR_GROUPS");
@@ -149 +154 @@
     }
     return userIds;
-    
-  }
+  }
+
   
   /**