Changeset 7c143c9 for server/lib/gutenbach/ipp/core/request.py

Timestamp:

Dec 27, 2011, 10:20:10 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

e58af05

Parents:

ee8e6d0

git-author:

Jessica B. Hamrick <jhamrick@…> (12/27/11 22:20:10)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/27/11 22:20:10)

Message:

Add support for chunking, i.e. receiving file data

File:

• server/lib/gutenbach/ipp/core/request.py (modified) (5 diffs)

server/lib/gutenbach/ipp/core/request.py

@@ -3 +3 @@
 from .constants import AttributeTags
 from .value import Value
+from .errors import ClientErrorBadRequest
 import sys
 import struct
 import logging
+import tempfile
 
 # initialize logger
@@ -83 +85 @@
         # that file handle
         if request is not None:
+            # minimum length is
+            if length < 9:
+                raise ClientErrorBadRequest("length (%d) < 9" % length)
+            
             # read the version-number (two signed chars)
             self.version        = struct.unpack('>bb', request.read(2))
@@ -105 +111 @@
             # read in the next byte
             next_byte = struct.unpack('>b', request.read(1))[0]
-            length -=1
+            length -= 1
             logger.debug("next byte : 0x%X" % next_byte)
 
@@ -179 +185 @@
             # once we hit the end-of-attributes tag, the only thing
             # left is the data, so go ahead and read all of it
-            assert length >= 0
-            self.data = request.read(length)
-            logger.debug("data : %s" % self.data)
+            if length < 0:
+                raise ClientErrorBadRequest("length (%d) < 0" % length)
+            
+            self.data = tempfile.TemporaryFile()
+            self.data.write(request.read(length))
+            self.data.seek(0)
+            
+            logger.debug("data : %d bytes" % length)
 
         # otherwise, just set the class variables to the keyword
@@ -228 +239 @@
         end_of_attributes_tag = struct.pack('>b', AttributeTags.END)
 
-        # convert the data to binary
-        if self.data is not None:
-            data = ''.join([struct.pack('>b', x) for x in self.data])
-        else:
-            data = ''
-
         # append everything together and return it
-        return preattributes + attribute_groups + end_of_attributes_tag + data
+        return preattributes + attribute_groups + end_of_attributes_tag, self.data
 
     def __repr__(self):