Changeset ee8e6d0 for server/lib/gutenbach/server/requests.py

Timestamp:

Dec 27, 2011, 7:03:46 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

7c143c9

Parents:

1037115

git-author:

Jessica B. Hamrick <jhamrick@…> (12/27/11 19:03:46)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/27/11 19:03:46)

Message:

Fix error with HTTP server recreating printer objects

File:

• server/lib/gutenbach/server/requests.py (modified) (8 diffs)

server/lib/gutenbach/server/requests.py

@@ -41 +41 @@
 
     def __init__(self):
+        print "init"
         self.printers = {
             "test": GutenbachPrinter(name="test")
@@ -227 +228 @@
         jobs = self.printers[printer_name].get_jobs()
 
-        # requesting username
-        if 'requesting-user-name' in operation:
-            username_attr = operation['requesting-user-name']
-            username = username_attr.values[0].value
-            if username_attr != ipp.RequestingUserName(username):
-                raise ipp.errors.ClientErrorBadRequest(str(username_attr))
-
         # get the job attributes and add them to the response
         for job in self.printers[printer_name].get_jobs():
-            attrs = job.get_job_attributes(request)
+            attrs = job.get_job_attributes(operation)
             response.attribute_groups.append(ipp.AttributeGroup(
                 ipp.AttributeTags.JOB, attrs))
@@ -260 +254 @@
         in the multi-document Job object.
 
-        Group 1: Operation Attributes
+        Request
+        -------
+        Group 1: Operation Attributes
+            REQUIRED 'attributes-charset' 
+            REQUIRED 'attributes-natural-language' 
+            REQUIRED 'printer-uri' (uri) 
+            OPTIONAL 'requesting-user-name' (name(MAX))
+            OPTIONAL 'job-name' (name(MAX))
+            OPTIONAL 'ipp-attribute-fidelity' (boolean)
+            OPTIONAL 'job-k-octets' (integer(0:MAX))
+            OPTIONAL 'job-impressions' (integer(0:MAX))
+            OPTIONAL 'job-media-sheets' (integer(0:MAX))
+        Group 2: Job Template Attributes
+
+        Response
+        --------
+        Group 1: Operation Attributes
+            OPTIONAL 'status-message' (text(255))
+            OPTIONAL 'detailed-status-message' (text(MAX))
+            REQUIRED 'attributes-charset'
+            REQUIRED 'attributes-natural-language'
+        Group 2: Unsupported Attributes
+        Group 3: Job Object Attributes
+            REQUIRED 'job-uri' (uri)
+            REQUIRED 'job-id' (integer(1:MAX))
+            REQUIRED 'job-state' (type1 enum)
+            REQUIRED 'job-state-reasons' (1setOf type2 keyword)
+            OPTIONAL 'job-state-message' (text(MAX))
+            OPTIONAL 'number-of-intervening-jobs' (integer(0:MAX))
         
         """
 
-        raise ipp.errors.ServerErrorOperationNotSupported
+
+        operation = request.attribute_groups[0]
+
+        # requested printer uri
+        if 'printer-uri' not in operation:
+            raise ipp.errors.ClientErrorBadRequest("Missing 'printer-uri' attribute")
+        uri_attr = operation['printer-uri']
+        printer_name = uri_attr.values[0].value.split("/")[-1]
+        if uri_attr != ipp.PrinterUri(uri_attr.values[0].value):
+            raise ipp.errors.ClientErrorBadRequest(str(uri_attr))
+        if printer_name not in self.printers:
+            raise ipp.errors.ClientErrorAttributes(str(uri_attr), uri_attr)
+
+        # get attributes from the printer and add to response
+        job = self.printers[printer_name].create_job(request)
+        response.attribute_groups.append(ipp.AttributeGroup(
+            ipp.AttributeTags.JOB, job.get_job_attributes(operation)))
     
     @handler_for(ipp.OperationCodes.PAUSE_PRINTER)
@@ -296 +334 @@
             OPTIONAL 'requesting-user-name' (name(MAX))
             OPTIONAL 'requested-attributes' (1setOf type2 keyword) 
-            OPTIONAL 'document-format' (mimeMediaType):
-
+            OPTIONAL 'document-format' (mimeMediaType)
+            
         Response
         --------
@@ -324 +362 @@
         printer = self.printers[printer_name]
 
-        # requesting username
-        if 'requesting-user-name' in operation:
-            username_attr = operation['requesting-user-name']
-            username = username_attr.values[0].value
-            if username_attr != ipp.RequestingUserName(username):
-                raise ipp.errors.ClientErrorBadRequest(str(username_attr))
-
         # get attributes from the printer and add to response
         response.attribute_groups.append(ipp.AttributeGroup(
-            ipp.AttributeTags.PRINTER, printer.get_printer_attributes(request)))
+            ipp.AttributeTags.PRINTER, printer.get_printer_attributes(operation)))
 
     @handler_for(ipp.OperationCodes.SET_PRINTER_ATTRIBUTES)
@@ -379 +410 @@
         job = printer.get_job(job_id)
 
-        # requesting username
-        if 'requesting-user-name' in operation:
-            username_attr = operation['requesting-user-name']
-            username = username_attr.values[0].value
-            if username_attr != ipp.RequestingUserName(username):
-                raise ipp.errors.ClientErrorBadRequest(str(username_attr))
-
         # get the job attributes and add them to the response
-        attrs = job.get_job_attributes(request)
+        attrs = job.get_job_attributes(operation)
         response.attribute_groups.append(ipp.AttributeGroup(
             ipp.AttributeTags.JOB, attrs))
@@ -438 +462 @@
         printer = self.printers[self.default]
 
-        # requesting username
-        if 'requesting-user-name' in operation:
-            username_attr = operation['requesting-user-name']
-            username = username_attr.values[0].value
-            if username_attr != ipp.RequestingUserName(username):
-                raise ipp.errors.ClientErrorBadRequest(str(username_attr))
-
         # get attributes from the printer and add to response
         response.attribute_groups.append(ipp.AttributeGroup(
-            ipp.AttributeTags.PRINTER, printer.get_printer_attributes(request)))
+            ipp.AttributeTags.PRINTER, printer.get_printer_attributes(operation)))
 
     @handler_for(ipp.OperationCodes.CUPS_GET_PRINTERS)
@@ -462 +479 @@
         operation = request.attribute_groups[0]
 
-        # requesting username
-        if 'requesting-user-name' in operation:
-            username_attr = operation['requesting-user-name']
-            username = username_attr.values[0].value
-            if username_attr != ipp.RequestingUserName(username):
-                raise ipp.errors.ClientErrorBadRequest(str(username_attr))
-
         # get attributes from the printer and add to response
         for printer in self.printers.values():
             response.attribute_groups.append(ipp.AttributeGroup(
-                ipp.AttributeTags.PRINTER, printer.get_printer_attributes(request)))
+                ipp.AttributeTags.PRINTER, printer.get_printer_attributes(operation)))
 
     @handler_for(ipp.OperationCodes.CUPS_GET_CLASSES)