Changeset 1901

Timestamp:

11/06/04 23:35:58 (19 years ago)

Author:

jalet

Message:

Added a miniparser for IPP messages (RFC 2910). The job-originating-host-name
retrieval is now fiable, unless the CUPS developpers change something...

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (6 diffs)
• NEWS (modified) (1 diff)
• pykota/ipp.py (added)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.76  2004/11/06 22:35:58  jalet
+# Added a miniparser for IPP messages (RFC 2910). The job-originating-host-name
+# retrieval is now fiable, unless the CUPS developpers change something...
+#
 # Revision 1.75  2004/11/01 15:45:25  jalet
 # Added many debug messages.
@@ -299 +303 @@
 from pykota.storage import PyKotaStorageError
 from pykota.accounter import PyKotaAccounterError
+from pykota.ipp import IPPMessage, PyKotaIPPError
     
 class PyKotaPopen4(popen2.Popen4) :
@@ -338 +343 @@
         return 0
         
-    def getPageLogLocation(self) :
-        """Retrieves CUPS' page_log file location."""
-        location = None
+    def getCupsConfigDirectives(self, directives=[]) :
+        """Retrieves some CUPS directives from its configuration file."""
+        dirvalues = {} 
         cupsroot = os.environ.get("CUPS_SERVERROOT", "/etc/cups")
         cupsdconf = os.path.join(cupsroot, "cupsd.conf")
@@ -347 +352 @@
         except IOError :    
             self.logdebug("Unable to open %s" % cupsdconf)
-            return # file doesn't exist or can't be read
         else :    
             for line in conffile.readlines() :
                 linecopy = line.strip().lower()
-                if linecopy.startswith("pagelog ") :
-                    try :
-                        location = line.split()[1]
-                    except :    
-                        pass # ignore errors, we take the last value in any case.
+                for di in [d.lower() for d in directives] :
+                    if linecopy.startswith("%s " % di) :
+                        try :
+                            val = line.split()[1]
+                        except :    
+                            pass # ignore errors, we take the last value in any case.
+                        else :    
+                            dirvalues[di] = val
             conffile.close()            
-            return location            
-            
-    def getJobOriginatingHostname(self, printername, username, jobid) :
+        return dirvalues       
+            
+    def getJobOriginatingHostnameFromPageLog(self, cupsconfig, printername, username, jobid) :
         """Retrieves the job-originating-hostname from the CUPS page_log file if possible."""
-        pagelogpath = self.getPageLogLocation() or "/var/log/cups/page_log"
+        pagelogpath = cupsconfig.get("pagelog", "/var/log/cups/page_log")
+        self.logdebug("Trying to extract job-originating-host-name from %s" % pagelogpath)
         try :
             pagelog = open(pagelogpath, "r")
@@ -383 +391 @@
             if matchingline is None :
                 self.logdebug("No matching line found in %s" % pagelogpath)
-                return # correct line not found, job-originating-hostname unknown
+                return # correct line not found, job-originating-host-name unknown
             else :    
                 return matchingline.split()[-1]
@@ -398 +406 @@
             self.exportUserInfo(userpquota)
             
-            # tries to extract job-originating-hostname 
-            clienthost = self.getJobOriginatingHostname(printer.Name, user.Name, self.jobid)
+            # tries to extract job-originating-host-name and other information
+            cupsdconf = self.getCupsConfigDirectives(["PageLog", "RequestRoot"])
+            requestroot = cupsdconf.get("requestroot", "/var/spool/cups")
+            if (len(self.jobid) < 5) and self.jobid.isdigit() :
+                ippmessagefile = "c%05i" % int(self.jobid)
+            else :    
+                ippmessagefile = "c%s" % self.jobid
+            ippmessagefile = os.path.join(requestroot, ippmessagefile)
+            ippmessage = {}
+            try :
+                ippdatafile = open(ippmessagefile)
+            except :    
+                self.printInfo("Unable to open IPP message file %s" % ippmessagefile, "warn")
+            else :    
+                self.logdebug("Parsing of IPP message file %s begins." % ippmessagefile)
+                ippmessage = IPPMessage(ippdatafile.read())
+                self.logdebug("Parsing of IPP message file %s ends." % ippmessagefile)
+                ippdatafile.close()
+                
+            clienthost = ippmessage.get("job-originating-host-name") \
+                         or self.getJobOriginatingHostnameFromPageLog(cupsdconf, printer.Name, user.Name, self.jobid)
             self.logdebug("Client Hostname : %s" % (clienthost or "Unknown"))    
             os.environ["PYKOTAJOBORIGINATINGHOSTNAME"] = str(clienthost or "")
+            
+            # TODO : extract username (double check ?) and billing code too
             
             # enters first phase

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.21alpha1 :
+    
+        - added an IPP messages miniparser. This will allow PyKota
+          to extract informations from the CUPS request files directly
+          without needing to use the CUPS API. 
+        
     - 1.20 :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.20_unofficial"
+__version__ = "1.21alpha1_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""