Changeset 2232

Timestamp:

05/05/05 23:52:49 (19 years ago)

Author:

jerome

Message:

Improved stability in pykotme and pykotme.cgi
Now uses real userid instead of effective userid in pykotme and pykosd,
to allow user root to check his own account instead of user pykota's one
(since we drop priviledges early).
Better setup instructions for pykotme.cgi

Location:

pykota/trunk

Files:

• bin/pykosd (modified) (1 diff)
• bin/pykotme (modified) (1 diff)
• cgi-bin/pykotme.cgi (modified) (1 diff)
• cgi-bin/README (modified) (2 diffs)
• NEWS (modified) (1 diff)

pykota/trunk/bin/pykosd

@@ -117 +117 @@
         savecolor = color
         
-        uname = pwd.getpwuid(os.geteuid())[0]
+        uname = pwd.getpwuid(os.getuid())[0]
         while 1 :
             color = savecolor

pykota/trunk/bin/pykotme

@@ -104 +104 @@
                 self.printInfo(msg)
             
-        # get current user
-        username = pwd.getpwuid(os.geteuid())[0]
+        printers = self.storage.getMatchingPrinters(options["printer"])
+        if not printers :
+            raise PyKotaToolError, _("There's no printer matching %s") % options["printer"]
+            
+        username = pwd.getpwuid(os.getuid())[0]
         user = self.storage.getUser(username)
         if user.Exists and user.LimitBy and (user.LimitBy.lower() == "balance"):
             print _("Your account balance : %.2f") % (user.AccountBalance or 0.0)
             
-        printers = self.storage.getMatchingPrinters(options["printer"])
-        if not printers :
-            raise PyKotaToolError, _("There's no printer matching %s") % options["printer"]
-            
         print _("Job size : %i pages") % totalsize    
-        for printer in printers :
-            userpquota = self.storage.getUserPQuota(user, printer)
-            cost = userpquota.computeJobPrice(totalsize)
-            print _("Cost on printer %s : %.2f") % (printer.Name, cost)
+        if user.Exists :
+            for printer in printers :
+                userpquota = self.storage.getUserPQuota(user, printer)
+                if userpquota.Exists :
+                    cost = userpquota.computeJobPrice(totalsize)
+                    print _("Cost on printer %s : %.2f") % (printer.Name, cost)
             
 if __name__ == "__main__" : 

pykota/trunk/cgi-bin/pykotme.cgi

@@ -145 +145 @@
                 try :    
                     user = self.storage.getUser(remuser)
-                    for printer in printers :
-                        upquota = self.storage.getUserPQuota(user, printer)
-                        cost = upquota.computeJobPrice(jobsize)
-                        self.body += "<p>%s</p>" % (_("Cost on printer %s : %.2f") % (printer.Name, cost))
+                    if user.Exists :
+                        for printer in printers :
+                            upquota = self.storage.getUserPQuota(user, printer)
+                            if upquota.Exists :
+                                cost = upquota.computeJobPrice(jobsize)
+                                self.body += "<p>%s</p>" % (_("Cost on printer %s : %.2f") % (printer.Name, cost))
                 except :
                     self.body += '<p><font color="red">%s</font></p>' % self.crashed("CGI Error").replace("\n", "<br />")

pykota/trunk/cgi-bin/README

@@ -25 +25 @@
 Be sure to restrict access to these CGI scripts as necessary.
 
-For now, pykotme.cgi doesn't need any restriction.
-
 If you protect access to printquota.cgi or dumpykota.cgi with 
 username+password authentication, the REMOTE_USER CGI environment variable
@@ -35 +33 @@
 If no username+password authentication takes place, then access
 is completely unrestricted.
+
+If you don't protect access to pykotme.cgi with username+password
+authentication, then only the job's size will be displayed
+to you. This is due to the cost of a print job on a particular printer
+depending on the user because of the overcharging factor's value. 
+So if you want pykotme.cgi to produce complete web quotes, you must 
+ensure that the user logs in from his web browser whenever he uses 
+this CGI script.
 
 You must ensure that the user your web server runs as can read

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.22beta :
     
+        - Improved stability in pykotme and pykotme.cgi.
+        
+        - Fixed a permission problem in pykotme and pykosd.
+        
         - Fixed an inconsitency between SQL and LDAP backends'
           behavior in edpykota.