Fix utf-8 handling in object versions.
Fixes object versioning when object name and/or version container name contain multibyte utf-8 characters. When object names containing non-ASCII characters are PUT multiple times into a container with an x-versions-location set, subsequent DELETE of the object results in a 500 response status. When the versions container name contains non-ASCII characters the first delete of an object succeeds but fails to restore previous version of object, so second delete incorrectly returns 404. Fixes bug 1229142 Change-Id: I425440f76b8328f8e119d390bfa4c7022181e89e
This commit is contained in:
anc
parent
10bb74a872
commit
fa308d60bd
|
|
@ -1182,6 +1182,7 @@ class ObjectController(Controller):
|
|||
object_versions = container_info['versions']
|
||||
if object_versions:
|
||||
# this is a version manifest and needs to be handled differently
|
||||
object_versions = unquote(object_versions)
|
||||
lcontainer = object_versions.split('/')[0]
|
||||
prefix_len = '%03x' % len(self.object_name)
|
||||
lprefix = prefix_len + self.object_name + '/'
|
||||
|
|
@ -1203,7 +1204,7 @@ class ObjectController(Controller):
|
|||
orig_container = self.container_name
|
||||
orig_obj = self.object_name
|
||||
self.container_name = lcontainer
|
||||
self.object_name = last_item['name']
|
||||
self.object_name = last_item['name'].encode('utf-8')
|
||||
copy_path = '/' + self.account_name + '/' + \
|
||||
self.container_name + '/' + self.object_name
|
||||
copy_headers = {'X-Newest': 'True',
|
||||
|
|
@ -1223,7 +1224,7 @@ class ObjectController(Controller):
|
|||
return HTTPServiceUnavailable(request=req)
|
||||
# reset these because the COPY changed them
|
||||
self.container_name = lcontainer
|
||||
self.object_name = last_item['name']
|
||||
self.object_name = last_item['name'].encode('utf-8')
|
||||
new_del_req = Request.blank(copy_path, environ=req.environ)
|
||||
container_info = self.container_info(
|
||||
self.account_name, self.container_name, req)
|
||||
|
|
|
|||
|
|
@ -3379,16 +3379,24 @@ class TestObjectController(unittest.TestCase):
|
|||
body = fd.read()
|
||||
self.assertEquals(body, 'oh hai123456789abcdef')
|
||||
|
||||
def test_version_manifest(self):
|
||||
def test_version_manifest(self, oc='versions', vc='vers', o='name'):
|
||||
versions_to_create = 3
|
||||
# Create a container for our versioned object testing
|
||||
(prolis, acc1lis, acc2lis, con1lis, con2lis, obj1lis,
|
||||
obj2lis) = _test_sockets
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/versions HTTP/1.1\r\nHost: localhost\r\n'
|
||||
pre = quote('%03x' % len(o))
|
||||
osub = '%s/sub' % o
|
||||
presub = quote('%03x' % len(osub))
|
||||
osub = quote(osub)
|
||||
presub = quote(presub)
|
||||
oc = quote(oc)
|
||||
vc = quote(vc)
|
||||
fd.write('PUT /v1/a/%s HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n'
|
||||
'Content-Length: 0\r\nX-Versions-Location: vers\r\n\r\n')
|
||||
'Content-Length: 0\r\nX-Versions-Location: %s\r\n\r\n'
|
||||
% (oc, vc))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
|
|
@ -3396,19 +3404,19 @@ class TestObjectController(unittest.TestCase):
|
|||
# check that the header was set
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/versions HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n\r\n\r\n')
|
||||
fd.write('GET /v1/a/%s HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n\r\n\r\n' % oc)
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 2' # 2xx series response
|
||||
self.assertEquals(headers[:len(exp)], exp)
|
||||
self.assert_('X-Versions-Location: vers' in headers)
|
||||
self.assert_('X-Versions-Location: %s' % vc in headers)
|
||||
# make the container for the object versions
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/vers HTTP/1.1\r\nHost: localhost\r\n'
|
||||
fd.write('PUT /v1/a/%s HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n'
|
||||
'Content-Length: 0\r\n\r\n')
|
||||
'Content-Length: 0\r\n\r\n' % vc)
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
|
|
@ -3416,10 +3424,10 @@ class TestObjectController(unittest.TestCase):
|
|||
# Create the versioned file
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
fd.write('PUT /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Storage-Token: '
|
||||
't\r\nContent-Length: 5\r\nContent-Type: text/jibberish0\r\n'
|
||||
'X-Object-Meta-Foo: barbaz\r\n\r\n00000\r\n')
|
||||
'X-Object-Meta-Foo: barbaz\r\n\r\n00000\r\n' % (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
|
|
@ -3429,10 +3437,10 @@ class TestObjectController(unittest.TestCase):
|
|||
sleep(.01) # guarantee that the timestamp changes
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
fd.write('PUT /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Storage-Token: '
|
||||
't\r\nContent-Length: 5\r\nContent-Type: text/jibberish%s'
|
||||
'\r\n\r\n%05d\r\n' % (segment, segment))
|
||||
'\r\n\r\n%05d\r\n' % (oc, o, segment, segment))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
|
|
@ -3440,9 +3448,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Ensure retrieving the manifest file gets the latest version
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
fd.write('GET /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n'
|
||||
'\r\n')
|
||||
'\r\n' % (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 200'
|
||||
|
|
@ -3454,8 +3462,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Ensure we have the right number of versions saved
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/vers?prefix=004name/ HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n')
|
||||
fd.write('GET /v1/a/%s?prefix=%s%s/ HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n'
|
||||
% (vc, pre, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 200'
|
||||
|
|
@ -3466,18 +3475,19 @@ class TestObjectController(unittest.TestCase):
|
|||
# copy a version and make sure the version info is stripped
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('COPY /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
fd.write('COPY /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: '
|
||||
't\r\nDestination: versions/copied_name\r\n'
|
||||
'Content-Length: 0\r\n\r\n')
|
||||
't\r\nDestination: %s/copied_name\r\n'
|
||||
'Content-Length: 0\r\n\r\n' % (oc, o, oc))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 2' # 2xx series response to the COPY
|
||||
self.assertEquals(headers[:len(exp)], exp)
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/versions/copied_name HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n')
|
||||
fd.write('GET /v1/a/%s/copied_name HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n'
|
||||
% oc)
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 200'
|
||||
|
|
@ -3487,18 +3497,19 @@ class TestObjectController(unittest.TestCase):
|
|||
# post and make sure it's updated
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('POST /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
fd.write('POST /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: '
|
||||
't\r\nContent-Type: foo/bar\r\nContent-Length: 0\r\n'
|
||||
'X-Object-Meta-Bar: foo\r\n\r\n')
|
||||
'X-Object-Meta-Bar: foo\r\n\r\n' % (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 2' # 2xx series response to the POST
|
||||
self.assertEquals(headers[:len(exp)], exp)
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n')
|
||||
fd.write('GET /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n'
|
||||
% (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 200'
|
||||
|
|
@ -3511,8 +3522,9 @@ class TestObjectController(unittest.TestCase):
|
|||
for segment in xrange(versions_to_create - 1, 0, -1):
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('DELETE /v1/a/versions/name HTTP/1.1\r\nHost: localhost\r'
|
||||
'\nConnection: close\r\nX-Storage-Token: t\r\n\r\n')
|
||||
fd.write('DELETE /v1/a/%s/%s HTTP/1.1\r\nHost: localhost\r'
|
||||
'\nConnection: close\r\nX-Storage-Token: t\r\n\r\n'
|
||||
% (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 2' # 2xx series response
|
||||
|
|
@ -3520,8 +3532,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Ensure retrieving the manifest file gets the latest version
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/versions/name HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Auth-Token: t\r\n\r\n')
|
||||
fd.write('GET /v1/a/%s/%s HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Auth-Token: t\r\n\r\n'
|
||||
% (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 200'
|
||||
|
|
@ -3533,9 +3546,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Ensure we have the right number of versions saved
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/vers?prefix=004name/ HTTP/1.1\r\nHost: '
|
||||
fd.write('GET /v1/a/%s?prefix=%s%s/ HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r'
|
||||
'\n')
|
||||
'\n' % (vc, pre, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 2' # 2xx series response
|
||||
|
|
@ -3547,8 +3560,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Ensure we have no saved versions
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/vers?prefix=004name/ HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n')
|
||||
fd.write('GET /v1/a/%s?prefix=%s%s/ HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n'
|
||||
% (vc, pre, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 204 No Content'
|
||||
|
|
@ -3556,8 +3570,8 @@ class TestObjectController(unittest.TestCase):
|
|||
# delete the last verision
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('DELETE /v1/a/versions/name HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n\r\n')
|
||||
fd.write('DELETE /v1/a/%s/%s HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n\r\n' % (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 2' # 2xx series response
|
||||
|
|
@ -3565,8 +3579,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Ensure it's all gone
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n')
|
||||
fd.write('GET /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n'
|
||||
% (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 404'
|
||||
|
|
@ -3575,10 +3590,11 @@ class TestObjectController(unittest.TestCase):
|
|||
# make sure manifest files don't get versioned
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
fd.write('PUT /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Storage-Token: '
|
||||
't\r\nContent-Length: 0\r\nContent-Type: text/jibberish0\r\n'
|
||||
'Foo: barbaz\r\nX-Object-Manifest: vers/foo_\r\n\r\n')
|
||||
'Foo: barbaz\r\nX-Object-Manifest: %s/foo_\r\n\r\n'
|
||||
% (oc, vc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
|
|
@ -3586,8 +3602,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Ensure we have no saved versions
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/vers?prefix=004name/ HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n')
|
||||
fd.write('GET /v1/a/%s?prefix=%s%s/ HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n'
|
||||
% (vc, pre, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 204 No Content'
|
||||
|
|
@ -3596,56 +3613,57 @@ class TestObjectController(unittest.TestCase):
|
|||
# DELETE v1/a/c/obj shouldn't delete v1/a/c/obj/sub versions
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
fd.write('PUT /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Storage-Token: '
|
||||
't\r\nContent-Length: 5\r\nContent-Type: text/jibberish0\r\n'
|
||||
'Foo: barbaz\r\n\r\n00000\r\n')
|
||||
'Foo: barbaz\r\n\r\n00000\r\n' % (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
self.assertEquals(headers[:len(exp)], exp)
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/versions/name HTTP/1.1\r\nHost: '
|
||||
fd.write('PUT /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Storage-Token: '
|
||||
't\r\nContent-Length: 5\r\nContent-Type: text/jibberish0\r\n'
|
||||
'Foo: barbaz\r\n\r\n00001\r\n')
|
||||
'Foo: barbaz\r\n\r\n00001\r\n' % (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
self.assertEquals(headers[:len(exp)], exp)
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/versions/name/sub HTTP/1.1\r\nHost: '
|
||||
fd.write('PUT /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Storage-Token: '
|
||||
't\r\nContent-Length: 4\r\nContent-Type: text/jibberish0\r\n'
|
||||
'Foo: barbaz\r\n\r\nsub1\r\n')
|
||||
'Foo: barbaz\r\n\r\nsub1\r\n' % (oc, osub))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
self.assertEquals(headers[:len(exp)], exp)
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/versions/name/sub HTTP/1.1\r\nHost: '
|
||||
fd.write('PUT /v1/a/%s/%s HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Storage-Token: '
|
||||
't\r\nContent-Length: 4\r\nContent-Type: text/jibberish0\r\n'
|
||||
'Foo: barbaz\r\n\r\nsub2\r\n')
|
||||
'Foo: barbaz\r\n\r\nsub2\r\n' % (oc, osub))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
self.assertEquals(headers[:len(exp)], exp)
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('DELETE /v1/a/versions/name HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n\r\n')
|
||||
fd.write('DELETE /v1/a/%s/%s HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n\r\n' % (oc, o))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 2' # 2xx series response
|
||||
self.assertEquals(headers[:len(exp)], exp)
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('GET /v1/a/vers?prefix=008name/sub/ HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n')
|
||||
fd.write('GET /v1/a/%s?prefix=%s%s/ HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Auth-Token: t\r\n\r\n'
|
||||
% (vc, presub, osub))
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 2' # 2xx series response
|
||||
|
|
@ -3657,9 +3675,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Check for when the versions target container doesn't exist
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/whoops HTTP/1.1\r\nHost: localhost\r\n'
|
||||
fd.write('PUT /v1/a/%swhoops HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n'
|
||||
'Content-Length: 0\r\nX-Versions-Location: none\r\n\r\n')
|
||||
'Content-Length: 0\r\nX-Versions-Location: none\r\n\r\n' % oc)
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
|
|
@ -3667,9 +3685,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Create the versioned file
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/whoops/foo HTTP/1.1\r\nHost: '
|
||||
fd.write('PUT /v1/a/%swhoops/foo HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Storage-Token: '
|
||||
't\r\nContent-Length: 5\r\n\r\n00000\r\n')
|
||||
't\r\nContent-Length: 5\r\n\r\n00000\r\n' % oc)
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 201'
|
||||
|
|
@ -3677,9 +3695,9 @@ class TestObjectController(unittest.TestCase):
|
|||
# Create another version
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('PUT /v1/a/whoops/foo HTTP/1.1\r\nHost: '
|
||||
fd.write('PUT /v1/a/%swhoops/foo HTTP/1.1\r\nHost: '
|
||||
'localhost\r\nConnection: close\r\nX-Storage-Token: '
|
||||
't\r\nContent-Length: 5\r\n\r\n00001\r\n')
|
||||
't\r\nContent-Length: 5\r\n\r\n00001\r\n' % oc)
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 412'
|
||||
|
|
@ -3687,13 +3705,55 @@ class TestObjectController(unittest.TestCase):
|
|||
# Delete the object
|
||||
sock = connect_tcp(('localhost', prolis.getsockname()[1]))
|
||||
fd = sock.makefile()
|
||||
fd.write('DELETE /v1/a/whoops/foo HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n\r\n')
|
||||
fd.write('DELETE /v1/a/%swhoops/foo HTTP/1.1\r\nHost: localhost\r\n'
|
||||
'Connection: close\r\nX-Storage-Token: t\r\n\r\n' % oc)
|
||||
fd.flush()
|
||||
headers = readuntil2crlfs(fd)
|
||||
exp = 'HTTP/1.1 2' # 2xx response
|
||||
self.assertEquals(headers[:len(exp)], exp)
|
||||
|
||||
def test_version_manifest_utf8(self):
|
||||
oc = '0_oc_non_ascii\xc2\xa3'
|
||||
vc = '0_vc_non_ascii\xc2\xa3'
|
||||
o = '0_o_non_ascii\xc2\xa3'
|
||||
self.test_version_manifest(oc, vc, o)
|
||||
|
||||
def test_version_manifest_utf8_container(self):
|
||||
oc = '1_oc_non_ascii\xc2\xa3'
|
||||
vc = '1_vc_ascii'
|
||||
o = '1_o_ascii'
|
||||
self.test_version_manifest(oc, vc, o)
|
||||
|
||||
def test_version_manifest_utf8_version_container(self):
|
||||
oc = '2_oc_ascii'
|
||||
vc = '2_vc_non_ascii\xc2\xa3'
|
||||
o = '2_o_ascii'
|
||||
self.test_version_manifest(oc, vc, o)
|
||||
|
||||
def test_version_manifest_utf8_containers(self):
|
||||
oc = '3_oc_non_ascii\xc2\xa3'
|
||||
vc = '3_vc_non_ascii\xc2\xa3'
|
||||
o = '3_o_ascii'
|
||||
self.test_version_manifest(oc, vc, o)
|
||||
|
||||
def test_version_manifest_utf8_object(self):
|
||||
oc = '4_oc_ascii'
|
||||
vc = '4_vc_ascii'
|
||||
o = '4_o_non_ascii\xc2\xa3'
|
||||
self.test_version_manifest(oc, vc, o)
|
||||
|
||||
def test_version_manifest_utf8_version_container_utf_object(self):
|
||||
oc = '5_oc_ascii'
|
||||
vc = '5_vc_non_ascii\xc2\xa3'
|
||||
o = '5_o_non_ascii\xc2\xa3'
|
||||
self.test_version_manifest(oc, vc, o)
|
||||
|
||||
def test_version_manifest_utf8_container_utf_object(self):
|
||||
oc = '6_oc_non_ascii\xc2\xa3'
|
||||
vc = '6_vc_ascii'
|
||||
o = '6_o_non_ascii\xc2\xa3'
|
||||
self.test_version_manifest(oc, vc, o)
|
||||
|
||||
def test_conditional_range_get(self):
|
||||
(prolis, acc1lis, acc2lis, con1lis, con2lis, obj1lis, obj2lis) = \
|
||||
_test_sockets
|
||||
|
|
|
|||
Loading…
Reference in New Issue