Changeset aded2d1 for server/lib/gutenbach/ipp/operations/__init__.py

Timestamp:

Dec 23, 2011, 8:20:29 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

b828a96

Parents:

f6e2532

git-author:

Jessica B. Hamrick <jhamrick@…> (12/23/11 20:20:29)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/23/11 20:20:29)

Message:

Checkpoint, creating classes for specific IPP attributes

File:

• server/lib/gutenbach/ipp/operations/__init__.py (modified) (6 diffs)

server/lib/gutenbach/ipp/operations/__init__.py

@@ -5 +5 @@
 from .. import errors
 from .. import constants as consts
+from .. import object_attributes
 
 def verify_operations(request):
@@ -16 +17 @@
     # XXX: check version
     if False:
-        raise errors.VersionNotSupported(str(request.version))
+        raise errors.ClientErrorVersionNotSupported(str(request.version))
 
     # XXX: check operation id
     if False:
-        raise errors.OperationNotSupported(str(request.operation_id))
+        raise errors.ClientErrorOperationNotSupported(str(request.operation_id))
 
     # check operation attributes tag
     op_attrs = request.attribute_groups[0]
     if op_attrs.tag != consts.AttributeTags.OPERATION:
-        raise errors.BadRequest(
+        raise errors.ClientErrorBadRequest(
             "Attribute group does not have OPERATION tag: 0x%x" % op_attrs.tag)
 
@@ -32 +33 @@
     # # check compression
     # if False:
-    #     raise errors.CompressionNotSupported
+    #     raise errors.ClientErrorCompressionNotSupported
 
     # # check document format
     # if False:
-    #     raise errors.DocumentFormatNotSupported
+    #     raise errors.ClientErrorDocumentFormatNotSupported
 
     # # check document uri
     # if False:
-    #     raise errors.UriSchemeNotSupported
+    #     raise errors.ClientErrorUriSchemeNotSupported
 
     # check charset
     charset_attr = op_attrs.attributes[0]
-    if charset_attr.name != 'attributes-charset':
-        raise errors.BadRequest(
-            "Attribute is not attributes-charset: %s" % charset_attr.name)
-    if len(charset_attr.values) != 1:
-        raise errors.BadRequest(
-            "Too many values for attributes-charset: %d" % len(charset_attr.values))
-    # check charset value
-    charset_value = charset_attr.values[0]
-    if charset_value.tag != consts.operations_attribute_value_tags['attributes-charset']:
-        raise errors.BadRequest(
-            "Wrong tag for charset value: 0x%x" % charset_value.tag)
-    if charset_value.value != 'utf-8':
-        raise errors.CharsetNotSupported(str(charset_value.value))
+    if charset_attr != object_attributes.AttributesCharset('utf-8'):
+        raise errors.ClientErrorBadRequest
 
     # check for attributes-natural-language
     natlang_attr = op_attrs.attributes[1]
-    if natlang_attr.name != 'attributes-natural-language':
-        raise errors.BadRequest(
-            "Attribute is not attributes-natural-language: %s" % natlang_attr.name)
-    if len(charset_attr.values) != 1:
-        raise errors.BadRequest(
-            "Too many values for attributes-natural-language: %s" % len(natlang_attr.values))
-    # check natural language value
-    natlang_value = natlang_attr.values[0]
-    if natlang_value.tag != consts.operations_attribute_value_tags['attributes-natural-language']:
-        raise errors.BadRequest(
-            "Natural language value does not have NATURAL_LANGUAGE tag: 0x%x" % natlang_value.tag)
-    if natlang_value.value != 'en-us':
-        raise errors.Attributes(
-            "Invalid natural language value: %s" % natlang_value.value, [natlang_attr])
+    if natlang_attr != object_attributes.AttributesNaturalLanguage('en-us'):
+        raise errors.ClientErrorBadRequest
 
-    return dict([(attr.name, attr.values) for attr in op_attrs.attributes])
+    return dict([(attr.name, attr) for attr in op_attrs.attributes])
 
-def verify_printer_uri(values):
-    if len(values) != 1:
-        raise errors.BadRequest(
-            "Requesting printer uri attribute has too many values: %d" % len(values))
-    uri_value = values[0]
-    if uri_value.tag != consts.operations_attribute_value_tags['printer-uri']:
-        raise errors.BadRequest(
-            "Bad value tag (expected URI): 0x%x" % uri_value_tag)
+def verify_printer_uri(uri_attr):
+    if uri_attr != object_attributes.PrinterUri(uri_attr.values[0].value):
+        raise errors.ClientErrorBadRequest
     
     # actually get the printer name
@@ -90 +63 @@
     # we can't do an exact comparison (also the hostname might be
     # different, depending on the CNAME or whether it's localhost)
-    uri = uri_value.value.split("/")[-1]
+    uri = uri_attr.values[0].value.split("/")[-1]
     return uri
 
-def verify_requesting_username(values):
-    if len(values) != 1:
-        raise errors.BadRequest(
-            "Requesting user name attribute has too many values: %d" % len(values))
-    requser_value = values[0]
-    if requser_value.tag != consts.operations_attribute_value_tags['requesting-user-name']:
-        raise errors.BadRequest(
-            "Bad value tag (expected NAME_WITHOUT_LANGUAGE): 0x%x" % requser_value.tag)
-    
-    return requser_value.value
+def verify_requesting_username(username_attr):
+    if username_attr != object_attributes.RequestingUserName(username_attr.values[0].value):
+        raise errors.ClientErrorBadRequest
+    return username_attr.values[0].value
 
 def make_empty_response(request):
     # Operation attributes -- typically the same for any request
-    attributes = [
-        Attribute(
-            'attributes-charset',
-            [Value(consts.operations_attribute_value_tags['attributes-charset'], 'utf-8')]),
-        Attribute(
-            'attributes-natural-language',
-            [Value(consts.operations_attribute_value_tags['attributes-natural-language'],
-                   'en-us')])
-        ]
-    # Put the operation attributes in a group
-    attribute_group = AttributeGroup(
+    attributes = AttributeGroup(
         consts.AttributeTags.OPERATION,
-        attributes)
+        [object_attributes.AttributesCharset('utf-8'),
+         object_attributes.AttributesNaturalLanguage('en-us')])
 
     # Set up the default response -- handlers will override these
@@ -126 +84 @@
     response_kwargs['operation_id']     = consts.StatusCodes.OK
     response_kwargs['request_id']       = request.request_id
-    response_kwargs['attribute_groups'] = [attribute_group]
+    response_kwargs['attribute_groups'] = [attributes]
     response = Request(**response_kwargs)
 
@@ -132 +90 @@
 
 def make_job_attributes(attrs, request, response):
-    ipp_attrs = []
-    for attr, vals in attrs:
-        ipp_vals = [Value(
-            tag=consts.job_attribute_value_tags[attr],
-            value=val) for val in vals]
-        ipp_attrs.append(Attribute(name=attr, values=ipp_vals))
     response.attribute_groups.append(AttributeGroup(
-        consts.AttributeTags.JOB, ipp_attrs))
+        consts.AttributeTags.JOB, attrs))
 
 def make_printer_attributes(attrs, request, response):
-    ipp_attrs = []
-    for attr, vals in attrs:
-        ipp_vals = [Value(
-            tag=consts.printer_attribute_value_tags[attr],
-            value=val) for val in vals]
-        ipp_attrs.append(Attribute(name=attr, values=ipp_vals))
     response.attribute_groups.append(AttributeGroup(
-        consts.AttributeTags.PRINTER, ipp_attrs))
+        consts.AttributeTags.PRINTER, attrs))
 
 from cups_get_classes import verify_cups_get_classes_request, make_cups_get_classes_response