Changeset 2393

Timestamp:

07/28/05 17:58:30 (19 years ago)

Author:

jerome

Message:

Added the overwrite_jobticket directive.
Severity : How Powerful !!! :-)

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/tool.py (modified) (2 diffs)
• pykota/version.py (modified) (1 diff)
• TODO (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -227 +227 @@
                 (bcode, clienthost) = self.getJobInfosFromPageLog(cupsdconf, printer.Name, user.Name, self.jobid)
             self.logdebug("Client Hostname : %s" % (clienthost or "Unknown"))    
+            
+            bcode = self.overwrittenBillingCode or bcode
             self.logdebug("Billing Code : %s" % (bcode or "None"))    
             
@@ -299 +301 @@
                 billingcode = None
             
+            # Should we cancel the job in any case (because job ticket
+            # was overwritten) ?
+            if self.mustDeny :
+                action = "DENY"
+                
             # exports some new environment variables
             os.environ["PYKOTAACTION"] = action

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.23alpha20 :
+    
+        - Added the overwrite_jobticket directive. See pykota.conf.sample
+          for how to use it.
+          
     - 1.23alpha19 :
     

pykota/trunk/pykota/tool.py

@@ -665 +665 @@
         self.username = self.username or pwd.getpwuid(os.geteuid())[0] # use CUPS' user when printing test page from CUPS web interface, otherwise username is empty
         
+        (newusername, newbillingcode, newaction) = self.overwriteJobTicket()
+        if newusername :
+            self.printInfo(_("Job ticket overwritten : new username = [%s]") % newusername)
+            self.username = newusername
+        if newbillingcode :
+            self.printInfo(_("Job ticket overwritten : new billing code = [%s]") % newbillingcode)
+            self.overwrittenBillingCode = newbillingcode
+        else :    
+            self.overwrittenBillingCode = None
+        if newaction :    
+            self.printInfo(_("Job ticket overwritten : job will be denied (but a bit later)."))
+            self.mustDeny = 1
+        else :    
+            self.mustDeny = 0
+        
         # do we want to strip out the Samba/Winbind domain name ?
         separator = self.config.getWinbindSeparator()
@@ -696 +711 @@
         self.logdebug("Capturing SIGTERM events.")
         signal.signal(signal.SIGTERM, self.sigterm_handler)
+        
+    def overwriteJobTicket(self) :    
+        """Should we overwrite the job's ticket (username and billingcode) ?"""
+        jobticketcommand = self.config.getOverwriteJobTicket(self.printername)
+        if jobticketcommand is not None :
+            username = billingcode = action = None
+            self.logdebug("Launching subprocess [%s] to overwrite the job's ticket." % jobticketcommand)
+            inputfile = os.popen(jobticketcommand, "r")
+            for line in inputfile.xreadlines() :
+                line = line.strip()
+                if line == "DENY" :
+                    self.logdebug("Seen DENY command.")
+                    action = "DENY"
+                elif line.startswith("USERNAME=") :    
+                    username = line.split("=", 1)[1].strip()
+                    self.logdebug("Seen new username [%s]" % username)
+                    action = None
+                elif line.startswith("BILLINGCODE=") :    
+                    billingcode = line.split("=", 1)[1].strip()
+                    self.logdebug("Seen new billing code [%s]" % billingcode)
+                    action = None
+            inputfile.close()    
+            return (username, billingcode, action)
+        else :
+            return (None, None, None)
         
     def sendBackChannelData(self, message, level="info") :    

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.23alpha19_unofficial"
+__version__ = "1.23alpha20_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS and LPRng."

pykota/trunk/TODO

@@ -33 +33 @@
         - Add the listing of the member printers in pkprinters if the printer
           is a printer group.
-          
-        - Add a new external hook to allow the overwriting of the job's ticket        
-          (mainly username and billing code) at startup time :
-          
-            1 - hook is launched and can do whatever it wants, like asking
-                the user for username+password or billing code
-                
-            2 - hook prints any (or all) of :    
-            
-                USER:some_username
-                BILLING:some_billingcode
-                DENY
-                
-                if hook doesn't print anything, job processed as usual.
-                if DENY, job is rejected.
-                
-            3 - if billing code or username is invalid, and if PyKota
-                is configured to loop in this case, hook is launched
-                again, otherwise job is rejected.
-                
-            4 - if billing code and/or username is valid, the job's
-                billing code and/or username are overwritten with
-                these values, and PyKota processes the job as usual.
           
         - Allow several levels of administrative priviledges by allowing