Changeset 2762

Timestamp:

02/27/06 23:28:01 (18 years ago)

Author:

jerome

Message:

Make pkusers --list behave like edpykota --list : allowed to normal users,
but restricted in what can be seen.

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (2 diffs)
• bin/pkusers (modified) (3 diffs)
• NEWS (modified) (1 diff)
• pykota/tool.py (modified) (1 diff)

pykota/trunk/bin/edpykota

@@ -27 +27 @@
 import sys
 import os
-import pwd
-import grp
-import time
+
 from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 from pykota.config import PyKotaConfigError
@@ -174 +172 @@
     def main(self, names, options) :
         """Edit user or group quotas."""
-        if not self.config.isAdmin :
-            username = pwd.getpwuid(os.geteuid())[0]
-            if not options["list"] :
-                raise PyKotaCommandLineError, "%s : %s" % (username, _("You're not allowed to use this command."))
-            else :
-                names = [ username ]
-                if options["groups"] :
-                    user = self.storage.getUser(username)
-                    if user.Exists :
-                        names = [ g.Name for g in self.storage.getUserGroups(user) ]
-        elif not names :        
-            names = ["*"]
-            
+        names = self.sanitizeNames(options, names)
         suffix = (options["groups"] and "Group") or "User"        
         printernames = options["printer"].split(",")

pykota/trunk/bin/pkusers

@@ -160 +160 @@
     def main(self, names, options) :
         """Manage users or groups."""
-        if not self.config.isAdmin :
-            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
-            
+        names = self.sanitizeNames(options, names)
         suffix = (options["groups"] and "Group") or "User"        
         
@@ -230 +228 @@
                 self.display("\r100.00%%\r        \r%s\n" % _("Done."))
             else :        
-                if not names :
-                    names = ["*"]
                 entries = getattr(self.storage, "getMatching%ss" % suffix)(",".join(names))
                 if not entries :
@@ -407 +403 @@
         elif options["remove"] and not options["ingroups"] :    
             raise PyKotaCommandLineError, _("You have to pass user groups names on the command line")
-        elif (not args) and options["add"] :
+        elif (not args) and (options["add"] or options["delete"]) :
             raise PyKotaCommandLineError, _("You have to pass user or group names on the command line")
         else :

pykota/trunk/NEWS

@@ -23 +23 @@
        
     - 1.24alpha15 :
-    
-        - edpykota --list is now authorized to mere mortal users, but
-          restricts the list to the current user's information.
+        
+        - 'edpykota --list' and 'pkusers --list' are now authorized 
+          to mere mortal users, but the list is restricted to informations
+          about the current user.
         
         - Extended the functionnality of the 'onbackenderror' directive to

pykota/trunk/pykota/tool.py

@@ -220 +220 @@
                     return True
             return False
+        
+    def sanitizeNames(self, options, names) :
+        """Ensures that an user can only see the datas he is allowed to see, by modifying the list of names."""
+        if not self.config.isAdmin :
+            username = pwd.getpwuid(os.geteuid())[0]
+            if not options["list"] :
+                raise PyKotaCommandLineError, "%s : %s" % (username, _("You're not allowed to use this command."))
+            else :
+                if options["groups"] :
+                    user = self.storage.getUser(username)
+                    if user.Exists :
+                        return [ g.Name for g in self.storage.getUserGroups(user) ]
+                return [ username ]
+        elif not names :        
+            return ["*"]
+        else :    
+            return names
         
     def display_version_and_quit(self) :