Changeset 1785 for ZMS/trunk

Timestamp:

04.01.2012 21:54:35 (5 months ago)

Author:

zmsdev

Message:

added support for purge of local-roles (requested by desy).

Location:

ZMS/trunk

Files:

• _accessmanager.py (modified) (6 diffs)
• dtml/ZMS/manage_customize.dtml (modified) (2 diffs)

ZMS/trunk/_accessmanager.py

@@ -103 +103 @@
   return id
 
+
 # ------------------------------------------------------------------------------
 #  _accessmanager.deleteUser:
 # ------------------------------------------------------------------------------
-def deleteUser(self, id, REQUEST):
-  userFldr = self.getUserFolder()
+def deleteUser(self, id):
   
   # Delete local roles in node.
-  # ---------------------------
   nodes = self.getUserAttr(id,'nodes',{})
   for node in nodes.keys():
@@ -118 +117 @@
   
   # Delete user from ZMS dictionary.
-  # --------------------------------
   self.delUserAttr(id)
   
   # Delete user from User-Folder.
-  # -----------------------------
+  userFldr = self.getUserFolder()
   if userFldr.meta_type != 'LDAPUserFolder':
     userObj = userFldr.getUser(id)
     if userObj is not None:
       userFldr.userFolderDelUsers([id])
-  
-  id = ''
-  return id
 
 
@@ -629 +624 @@
     ############################################################################
 
+    # ------------------------------------------------------------------------------
+    #  AccessManager.purgeLocalUsers
+    # ------------------------------------------------------------------------------
+    def purgeLocalUsers(self, ob=None, valid_userids=[], invalid_userids=[]):
+      rtn = ""
+      if ob is None: ob = self
+      
+      for local_role in ob.get_local_roles():
+        delLocalRoles = False
+        userid = local_role[0]
+        userroles = local_role[1]
+        if 'Owner' not in userroles:
+          if userid not in valid_userids and userid not in invalid_userids:
+            userob = ob.findUser(userid)
+            if userob is None:
+              invalid_userids.append(userid)
+            else:
+              valid_userids.append(userid)
+          if userid in valid_userids:
+            nodes = self.getUserAttr(userid,'nodes',{})
+            if len(filter(lambda x: (x=="{$}" and ob.id=="content") or x.endswith("/%s}"%ob.id),nodes.keys()))==0:
+              delLocalRoles = True
+          elif userid in invalid_userids:
+            delLocalRoles = True
+        if delLocalRoles:
+          rtn += ob.absolute_url()+ " " + userid + " " + str(userroles) + "<br/>"
+          ob.manage_delLocalRoles(userids=[userid])
+      
+      # Process subtree.
+      for subob in ob.objectValues(ob.dGlobalAttrs.keys()):
+        rtn += self.purgeLocalUsers(subob, valid_userids, invalid_userids)
+      
+      return rtn
+
+
     # --------------------------------------------------------------------------
     #  AccessManager.setLocalUser:
     # --------------------------------------------------------------------------
     def setLocalUser(self, id, node, roles, langs):
-      #-- Insert node to user-properties.
+      
+      # Insert node to user-properties.
       nodes = self.getUserAttr(id,'nodes',{})
       nodes[node] = {'langs':langs,'roles':roles}
@@ -639 +670 @@
       self.setUserAttr(id,'nodes',nodes)
       roles = list(roles)
-      if 'ZMSAdministrator' in roles: roles.append('Manager')
-      #-- Set local roles in node.
+      if 'ZMSAdministrator' in roles:
+        roles.append('Manager')
+      
+      # Set local roles in node.
       ob = self.getLinkObj(node,self.REQUEST)
-      try:
+      if ob is not None:
         ob.manage_setLocalRoles(id,roles)
-      except:
-        _globals.writeError(self,'[setLocalUser]: node=%s does not exist!'%node)
 
 
@@ -652 +683 @@
     # --------------------------------------------------------------------------
     def delLocalUser(self, id, node):
-      #-- Delete node from user-properties.
+      
+      # Delete node from user-properties.
       nodes = self.getUserAttr(id,'nodes',{})
       if nodes.has_key(node): del nodes[node]
       nodes = nodes.copy()
       self.setUserAttr(id,'nodes',nodes)
-      #-- Delete local roles in node.
+      
+      # Delete local roles in node.
       ob = self.getLinkObj(node,self.REQUEST)
-      try:
+      if ob is not None:
         ob.manage_delLocalRoles(userids=[id])
-      except:
-        _globals.writeError(self,'[delLocalUser]: node=%s does not exist!'%node)
 
 
@@ -828 +859 @@
         if key=='obj':
           #-- Delete user.
-          id = deleteUser(self,id,REQUEST)
+          deleteUser(self,id)
+          id = ''
           #-- Assemble message.
           message = self.getZMILangStr('MSG_DELETED')%int(1)

ZMS/trunk/dtml/ZMS/manage_customize.dtml

@@ -11 +11 @@
 </dtml-comment>
 <dtml-if "REQUEST.get('key')=='Maintenance'">
-        <dtml-if "REQUEST.get('btn','').startswith('Reindex')">
+        <dtml-if "REQUEST.get('btn','').startswith('Purge')">
+                <div id="system_msg" class="ui-state-highlight ui-corner-all">
+                        <b>UserFolder:</b>
+                        Purge local users<br/><dtml-var "purgeLocalUsers()">
+                        (<dtml-var "getLangFmtDate(ZopeTime())">)
+                </div>
+        <dtml-elif "REQUEST.get('btn','').startswith('Reindex')">
                 <div id="system_msg" class="ui-state-highlight ui-corner-all">
                         <b>Catalog:</b>
@@ -420 +426 @@
 </tr>
 <tr valign="top" class="zmiNeutralColorLight0">
+ <td class="form-small"><b>UserFolder</b></td>
+ <td class="form-small"></td>
+ <td class="form-small"></td>
+ <td class="form-small"><input type="submit" value="Purge &raquo; " name="btn" style="width:60px" /></td>
+</tr>
+<tr valign="top" class="zmiNeutralColorLight0">
  <td class="form-small"><b>Catalog</b></td>
  <td class="form-small"><input type="checkbox" value="1" id="catalog_awareness_active" name="catalog_awareness_active:int" class="form-checkbox" <dtml-if "getConfProperty('ZMS.CatalogAwareness.active',1)==1">checked="checked"</dtml-if>/>&nbsp;<label for="catalog_awareness_active">Awareness</label></td>