Merge account policy in api. Document.
[pithos] / pithos / api / functions.py
index 89c8d0b..8255772 100644 (file)
@@ -49,8 +49,8 @@ from pithos.api.util import (rename_meta_key, format_header_key, printable_heade
     update_manifest_meta, update_sharing_meta, update_public_meta, validate_modification_preconditions,
     validate_matching_preconditions, split_container_object_string, copy_or_move_object,
     get_int_parameter, get_content_length, get_content_range, socket_read_iterator,
-    object_data_response, put_object_block, hashmap_hash, api_method)
-from pithos.backends import backend
+    object_data_response, put_object_block, hashmap_hash, api_method, json_encode_decimal)
+from pithos.backends import connect_backend
 from pithos.backends.base import NotAllowedError
 
 
@@ -122,12 +122,11 @@ def authenticate(request):
         raise BadRequest('Missing X-Auth-User or X-Auth-Key header')
     response = HttpResponse(status=204)
     
-    inv_auth_tokens = dict((v, k) for k, v in settings.AUTH_TOKENS.items())
     uri = request.build_absolute_uri()
     if '?' in uri:
         uri = uri[:uri.find('?')]
     
-    response['X-Auth-Token'] = inv_auth_tokens.get(x_auth_user, '0000')
+    response['X-Auth-Token'] = x_auth_key
     response['X-Storage-Url'] = uri + (uri.endswith('/') and '' or '/') + x_auth_user
     return response
 
@@ -144,7 +143,7 @@ def account_list(request):
     if not limit:
         limit = 10000
     
-    accounts = backend.list_accounts(request.user, marker, limit)
+    accounts = request.backend.list_accounts(request.user, marker, limit)
     
     if request.serialization == 'text':
         if len(accounts) == 0:
@@ -158,8 +157,8 @@ def account_list(request):
     account_meta = []
     for x in accounts:
         try:
-            meta = backend.get_account_meta(request.user, x)
-            groups = backend.get_account_groups(request.user, x)
+            meta = request.backend.get_account_meta(request.user, x)
+            groups = request.backend.get_account_groups(request.user, x)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         else:
@@ -185,15 +184,16 @@ def account_meta(request, v_account):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        meta = backend.get_account_meta(request.user, v_account, until)
-        groups = backend.get_account_groups(request.user, v_account)
+        meta = request.backend.get_account_meta(request.user, v_account, until)
+        groups = request.backend.get_account_groups(request.user, v_account)
+        policy = request.backend.get_account_policy(request.user, v_account)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     
     validate_modification_preconditions(request, meta)
     
     response = HttpResponse(status=204)
-    put_account_headers(response, meta, groups)
+    put_account_headers(response, meta, groups, policy)
     return response
 
 @api_method('POST')
@@ -209,14 +209,16 @@ def account_update(request, v_account):
         replace = False
     if groups:
         try:
-            backend.update_account_groups(request.user, v_account, groups, replace)
+            request.backend.update_account_groups(request.user, v_account,
+                                                    groups, replace)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except ValueError:
             raise BadRequest('Invalid groups header')
     if meta or replace:
         try:
-            backend.update_account_meta(request.user, v_account, meta, replace)
+            request.backend.update_account_meta(request.user, v_account, meta,
+                                                replace)
         except NotAllowedError:
             raise Unauthorized('Access denied')
     return HttpResponse(status=202)
@@ -231,15 +233,16 @@ def container_list(request, v_account):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        meta = backend.get_account_meta(request.user, v_account, until)
-        groups = backend.get_account_groups(request.user, v_account)
+        meta = request.backend.get_account_meta(request.user, v_account, until)
+        groups = request.backend.get_account_groups(request.user, v_account)
+        policy = request.backend.get_account_policy(request.user, v_account)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     
     validate_modification_preconditions(request, meta)
     
     response = HttpResponse()
-    put_account_headers(response, meta, groups)
+    put_account_headers(response, meta, groups, policy)
     
     marker = request.GET.get('marker')
     limit = get_int_parameter(request.GET.get('limit'))
@@ -251,7 +254,8 @@ def container_list(request, v_account):
         shared = True
     
     try:
-        containers = backend.list_containers(request.user, v_account, marker, limit, shared, until)
+        containers = request.backend.list_containers(request.user, v_account,
+                                                marker, limit, shared, until)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError:
@@ -269,8 +273,10 @@ def container_list(request, v_account):
     container_meta = []
     for x in containers:
         try:
-            meta = backend.get_container_meta(request.user, v_account, x, until)
-            policy = backend.get_container_policy(request.user, v_account, x)
+            meta = request.backend.get_container_meta(request.user, v_account,
+                                                        x, until)
+            policy = request.backend.get_container_policy(request.user,
+                                                            v_account, x)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except NameError:
@@ -299,9 +305,12 @@ def container_meta(request, v_account, v_container):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        meta = backend.get_container_meta(request.user, v_account, v_container, until)
-        meta['object_meta'] = backend.list_object_meta(request.user, v_account, v_container, until)
-        policy = backend.get_container_policy(request.user, v_account, v_container)
+        meta = request.backend.get_container_meta(request.user, v_account,
+                                                    v_container, until)
+        meta['object_meta'] = request.backend.list_object_meta(request.user,
+                                                v_account, v_container, until)
+        policy = request.backend.get_container_policy(request.user, v_account,
+                                                        v_container)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError:
@@ -310,7 +319,7 @@ def container_meta(request, v_account, v_container):
     validate_modification_preconditions(request, meta)
     
     response = HttpResponse(status=204)
-    put_container_headers(response, meta, policy)
+    put_container_headers(request, response, meta, policy)
     return response
 
 @api_method('PUT')
@@ -324,7 +333,7 @@ def container_create(request, v_account, v_container):
     meta, policy = get_container_headers(request)
     
     try:
-        backend.put_container(request.user, v_account, v_container, policy)
+        request.backend.put_container(request.user, v_account, v_container, policy)
         ret = 201
     except NotAllowedError:
         raise Unauthorized('Access denied')
@@ -333,9 +342,20 @@ def container_create(request, v_account, v_container):
     except NameError:
         ret = 202
     
-    if len(meta) > 0:
+    if ret == 202 and policy:
         try:
-            backend.update_container_meta(request.user, v_account, v_container, meta, replace=True)
+            request.backend.update_container_policy(request.user, v_account,
+                                            v_container, policy, replace=False)
+        except NotAllowedError:
+            raise Unauthorized('Access denied')
+        except NameError:
+            raise ItemNotFound('Container does not exist')
+        except ValueError:
+            raise BadRequest('Invalid policy header')
+    if meta:
+        try:
+            request.backend.update_container_meta(request.user, v_account,
+                                            v_container, meta, replace=False)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except NameError:
@@ -357,7 +377,8 @@ def container_update(request, v_account, v_container):
         replace = False
     if policy:
         try:
-            backend.update_container_policy(request.user, v_account, v_container, policy, replace)
+            request.backend.update_container_policy(request.user, v_account,
+                                                v_container, policy, replace)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except NameError:
@@ -366,12 +387,29 @@ def container_update(request, v_account, v_container):
             raise BadRequest('Invalid policy header')
     if meta or replace:
         try:
-            backend.update_container_meta(request.user, v_account, v_container, meta, replace)
+            request.backend.update_container_meta(request.user, v_account,
+                                                    v_container, meta, replace)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except NameError:
             raise ItemNotFound('Container does not exist')
-    return HttpResponse(status=202)
+    
+    content_length = -1
+    if request.META.get('HTTP_TRANSFER_ENCODING') != 'chunked':
+        content_length = get_int_parameter(request.META.get('CONTENT_LENGTH', 0))
+    content_type = request.META.get('CONTENT_TYPE')
+    hashmap = []
+    if content_type and content_type == 'application/octet-stream' and content_length != 0:
+        for data in socket_read_iterator(request, content_length,
+                                            request.backend.block_size):
+            # TODO: Raise 408 (Request Timeout) if this takes too long.
+            # TODO: Raise 499 (Client Disconnect) if a length is defined and we stop before getting this much data.
+            hashmap.append(request.backend.put_block(data))
+    
+    response = HttpResponse(status=202)
+    if hashmap:
+        response.content = '\n'.join(hashmap) + '\n'
+    return response
 
 @api_method('DELETE')
 def container_delete(request, v_account, v_container):
@@ -384,7 +422,8 @@ def container_delete(request, v_account, v_container):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        backend.delete_container(request.user, v_account, v_container, until)
+        request.backend.delete_container(request.user, v_account, v_container,
+                                            until)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError:
@@ -403,9 +442,12 @@ def object_list(request, v_account, v_container):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        meta = backend.get_container_meta(request.user, v_account, v_container, until)
-        meta['object_meta'] = backend.list_object_meta(request.user, v_account, v_container, until)
-        policy = backend.get_container_policy(request.user, v_account, v_container)
+        meta = request.backend.get_container_meta(request.user, v_account,
+                                                    v_container, until)
+        meta['object_meta'] = request.backend.list_object_meta(request.user,
+                                                v_account, v_container, until)
+        policy = request.backend.get_container_policy(request.user, v_account,
+                                                        v_container)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError:
@@ -414,7 +456,7 @@ def object_list(request, v_account, v_container):
     validate_modification_preconditions(request, meta)
     
     response = HttpResponse()
-    put_container_headers(response, meta, policy)
+    put_container_headers(request, response, meta, policy)
     
     path = request.GET.get('path')
     prefix = request.GET.get('prefix')
@@ -452,7 +494,9 @@ def object_list(request, v_account, v_container):
         shared = True
     
     try:
-        objects = backend.list_objects(request.user, v_account, v_container, prefix, delimiter, marker, limit, virtual, keys, shared, until)
+        objects = request.backend.list_objects(request.user, v_account,
+                                    v_container, prefix, delimiter, marker,
+                                    limit, virtual, keys, shared, until)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError:
@@ -474,10 +518,13 @@ def object_list(request, v_account, v_container):
             object_meta.append({'subdir': x[0]})
         else:
             try:
-                meta = backend.get_object_meta(request.user, v_account, v_container, x[0], x[1])
+                meta = request.backend.get_object_meta(request.user, v_account,
+                                                        v_container, x[0], x[1])
                 if until is None:
-                    permissions = backend.get_object_permissions(request.user, v_account, v_container, x[0])
-                    public = backend.get_object_public(request.user, v_account, v_container, x[0])
+                    permissions = request.backend.get_object_permissions(
+                                    request.user, v_account, v_container, x[0])
+                    public = request.backend.get_object_public(request.user,
+                                                v_account, v_container, x[0])
                 else:
                     permissions = None
                     public = None
@@ -490,13 +537,13 @@ def object_list(request, v_account, v_container):
                 rename_meta_key(meta, 'modified_by', 'x_object_modified_by')
                 rename_meta_key(meta, 'version', 'x_object_version')
                 rename_meta_key(meta, 'version_timestamp', 'x_object_version_timestamp')
-                update_sharing_meta(permissions, v_account, v_container, x[0], meta)
+                update_sharing_meta(request, permissions, v_account, v_container, x[0], meta)
                 update_public_meta(public, meta)
                 object_meta.append(printable_header_dict(meta))
     if request.serialization == 'xml':
         data = render_to_string('objects.xml', {'container': v_container, 'objects': object_meta})
     elif request.serialization  == 'json':
-        data = json.dumps(object_meta)
+        data = json.dumps(object_meta, default=json_encode_decimal)
     response.status_code = 200
     response.content = data
     return response
@@ -511,10 +558,13 @@ def object_meta(request, v_account, v_container, v_object):
     
     version = request.GET.get('version')
     try:
-        meta = backend.get_object_meta(request.user, v_account, v_container, v_object, version)
+        meta = request.backend.get_object_meta(request.user, v_account,
+                                                v_container, v_object, version)
         if version is None:
-            permissions = backend.get_object_permissions(request.user, v_account, v_container, v_object)
-            public = backend.get_object_public(request.user, v_account, v_container, v_object)
+            permissions = request.backend.get_object_permissions(request.user,
+                                            v_account, v_container, v_object)
+            public = request.backend.get_object_public(request.user, v_account,
+                                                        v_container, v_object)
         else:
             permissions = None
             public = None
@@ -526,7 +576,7 @@ def object_meta(request, v_account, v_container, v_object):
         raise ItemNotFound('Version does not exist')
     
     update_manifest_meta(request, v_account, meta)
-    update_sharing_meta(permissions, v_account, v_container, v_object, meta)
+    update_sharing_meta(request, permissions, v_account, v_container, v_object, meta)
     update_public_meta(public, meta)
     
     # Evaluate conditions.
@@ -561,7 +611,8 @@ def object_read(request, v_account, v_container, v_object):
             raise BadRequest('No format specified for version list.')
         
         try:
-            v = backend.list_versions(request.user, v_account, v_container, v_object)
+            v = request.backend.list_versions(request.user, v_account,
+                                                v_container, v_object)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         d = {'versions': v}
@@ -569,17 +620,20 @@ def object_read(request, v_account, v_container, v_object):
             d['object'] = v_object
             data = render_to_string('versions.xml', d)
         elif request.serialization  == 'json':
-            data = json.dumps(d)
+            data = json.dumps(d, default=json_encode_decimal)
         
         response = HttpResponse(data, status=200)
         response['Content-Length'] = len(data)
         return response
     
     try:
-        meta = backend.get_object_meta(request.user, v_account, v_container, v_object, version)
+        meta = request.backend.get_object_meta(request.user, v_account,
+                                                v_container, v_object, version)
         if version is None:
-            permissions = backend.get_object_permissions(request.user, v_account, v_container, v_object)
-            public = backend.get_object_public(request.user, v_account, v_container, v_object)
+            permissions = request.backend.get_object_permissions(request.user,
+                                            v_account, v_container, v_object)
+            public = request.backend.get_object_public(request.user, v_account,
+                                                        v_container, v_object)
         else:
             permissions = None
             public = None
@@ -591,7 +645,7 @@ def object_read(request, v_account, v_container, v_object):
         raise ItemNotFound('Version does not exist')
     
     update_manifest_meta(request, v_account, meta)
-    update_sharing_meta(permissions, v_account, v_container, v_object, meta)
+    update_sharing_meta(request, permissions, v_account, v_container, v_object, meta)
     update_public_meta(public, meta)
     
     # Evaluate conditions.
@@ -608,7 +662,8 @@ def object_read(request, v_account, v_container, v_object):
     if 'X-Object-Manifest' in meta:
         try:
             src_container, src_name = split_container_object_string('/' + meta['X-Object-Manifest'])
-            objects = backend.list_objects(request.user, v_account, src_container, prefix=src_name, virtual=False)
+            objects = request.backend.list_objects(request.user, v_account,
+                                src_container, prefix=src_name, virtual=False)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except ValueError:
@@ -618,7 +673,8 @@ def object_read(request, v_account, v_container, v_object):
         
         try:
             for x in objects:
-                s, h = backend.get_object_hashmap(request.user, v_account, src_container, x[0], x[1])
+                s, h = request.backend.get_object_hashmap(request.user,
+                                        v_account, src_container, x[0], x[1])
                 sizes.append(s)
                 hashmaps.append(h)
         except NotAllowedError:
@@ -629,7 +685,8 @@ def object_read(request, v_account, v_container, v_object):
             raise ItemNotFound('Version does not exist')
     else:
         try:
-            s, h = backend.get_object_hashmap(request.user, v_account, v_container, v_object, version)
+            s, h = request.backend.get_object_hashmap(request.user, v_account,
+                                                v_container, v_object, version)
             sizes.append(s)
             hashmaps.append(h)
         except NotAllowedError:
@@ -640,10 +697,14 @@ def object_read(request, v_account, v_container, v_object):
             raise ItemNotFound('Version does not exist')
     
     # Reply with the hashmap.
-    if request.serialization != 'text':
+    if 'hashmap' in request.GET and request.serialization != 'text':
         size = sum(sizes)
         hashmap = sum(hashmaps, [])
-        d = {'block_size': backend.block_size, 'block_hash': backend.hash_algorithm, 'bytes': size, 'hashes': hashmap}
+        d = {
+            'block_size': request.backend.block_size,
+            'block_hash': request.backend.hash_algorithm,
+            'bytes': size,
+            'hashes': hashmap}
         if request.serialization == 'xml':
             d['object'] = v_object
             data = render_to_string('hashes.xml', d)
@@ -655,6 +716,7 @@ def object_read(request, v_account, v_container, v_object):
         response['Content-Length'] = len(data)
         return response
     
+    request.serialization = 'text' # Unset.
     return object_data_response(request, sizes, hashmaps, meta)
 
 @api_method('PUT', format_allowed=True)
@@ -668,13 +730,11 @@ def object_write(request, v_account, v_container, v_object):
     #                       unauthorized (401),
     #                       badRequest (400)
     
-    if not request.GET.get('format'):
-        request.serialization = 'text'
-    
     # Evaluate conditions.
     if request.META.get('HTTP_IF_MATCH') or request.META.get('HTTP_IF_NONE_MATCH'):
         try:
-            meta = backend.get_object_meta(request.user, v_account, v_container, v_object)
+            meta = request.backend.get_object_meta(request.user, v_account,
+                                                        v_container, v_object)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except NameError:
@@ -686,18 +746,23 @@ def object_write(request, v_account, v_container, v_object):
     if copy_from or move_from:
         content_length = get_content_length(request) # Required by the API.
         
+        src_account = smart_unicode(request.META.get('HTTP_X_SOURCE_ACCOUNT'), strings_only=True)
+        if not src_account:
+            src_account = request.user
         if move_from:
             try:
                 src_container, src_name = split_container_object_string(move_from)
             except ValueError:
                 raise BadRequest('Invalid X-Move-From header')
-            version_id = copy_or_move_object(request, v_account, src_container, src_name, v_container, v_object, move=True)
+            version_id = copy_or_move_object(request, src_account, src_container, src_name,
+                                                v_account, v_container, v_object, move=True)
         else:
             try:
                 src_container, src_name = split_container_object_string(copy_from)
             except ValueError:
                 raise BadRequest('Invalid X-Copy-From header')
-            version_id = copy_or_move_object(request, v_account, src_container, src_name, v_container, v_object, move=False)
+            version_id = copy_or_move_object(request, src_account, src_container, src_name,
+                                                v_account, v_container, v_object, move=False)
         response = HttpResponse(status=201)
         response['X-Object-Version'] = version_id
         return response
@@ -710,9 +775,13 @@ def object_write(request, v_account, v_container, v_object):
     if 'Content-Type' not in meta:
         raise LengthRequired('Missing Content-Type header')
     
-    if request.serialization != 'text':
+    if 'hashmap' in request.GET:
+        if request.serialization not in ('json', 'xml'):
+            raise BadRequest('Invalid hashmap format')
+        
         data = ''
-        for block in socket_read_iterator(request, content_length, backend.block_size):
+        for block in socket_read_iterator(request, content_length,
+                                            request.backend.block_size):
             data = '%s%s' % (data, block)
         
         if request.serialization == 'json':
@@ -721,32 +790,33 @@ def object_write(request, v_account, v_container, v_object):
                 raise BadRequest('Invalid data formating')
             try:
                 hashmap = d['hashes']
-                size = d['bytes']
-            except KeyError:
+                size = int(d['bytes'])
+            except:
                 raise BadRequest('Invalid data formatting')
         elif request.serialization == 'xml':
             try:
                 xml = minidom.parseString(data)
                 obj = xml.getElementsByTagName('object')[0]
-                size = obj.attributes['bytes'].value
+                size = int(obj.attributes['bytes'].value)
                 
                 hashes = xml.getElementsByTagName('hash')
                 hashmap = []
                 for hash in hashes:
                     hashmap.append(hash.firstChild.data)
-            except Exception:
+            except:
                 raise BadRequest('Invalid data formatting')
         
-        meta.update({'hash': hashmap_hash(hashmap)}) # Update ETag.
+        meta.update({'hash': hashmap_hash(request, hashmap)}) # Update ETag.
     else:
         md5 = hashlib.md5()
         size = 0
         hashmap = []
-        for data in socket_read_iterator(request, content_length, backend.block_size):
+        for data in socket_read_iterator(request, content_length,
+                                            request.backend.block_size):
             # TODO: Raise 408 (Request Timeout) if this takes too long.
             # TODO: Raise 499 (Client Disconnect) if a length is defined and we stop before getting this much data.
             size += len(data)
-            hashmap.append(backend.put_block(data))
+            hashmap.append(request.backend.put_block(data))
             md5.update(data)
         
         meta['hash'] = md5.hexdigest().lower()
@@ -755,7 +825,9 @@ def object_write(request, v_account, v_container, v_object):
             raise UnprocessableEntity('Object ETag does not match')
     
     try:
-        version_id = backend.update_object_hashmap(request.user, v_account, v_container, v_object, size, hashmap, meta, True, permissions)
+        version_id = request.backend.update_object_hashmap(request.user,
+                        v_account, v_container, v_object, size, hashmap, meta,
+                        True, permissions)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except IndexError, e:
@@ -768,7 +840,8 @@ def object_write(request, v_account, v_container, v_object):
         raise Conflict('\n'.join(e.data) + '\n')
     if public is not None:
         try:
-            backend.update_object_public(request.user, v_account, v_container, v_object, public)
+            request.backend.update_object_public(request.user, v_account,
+                                                v_container, v_object, public)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except NameError:
@@ -797,15 +870,16 @@ def object_write_form(request, v_account, v_container, v_object):
     md5 = hashlib.md5()
     size = 0
     hashmap = []
-    for data in file.chunks(backend.block_size):
+    for data in file.chunks(request.backend.block_size):
         size += len(data)
-        hashmap.append(backend.put_block(data))
+        hashmap.append(request.backend.put_block(data))
         md5.update(data)
     
     meta['hash'] = md5.hexdigest().lower()
     
     try:
-        version_id = backend.update_object_hashmap(request.user, v_account, v_container, v_object, size, hashmap, meta, True)
+        version_id = request.backend.update_object_hashmap(request.user,
+                    v_account, v_container, v_object, size, hashmap, meta, True)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError:
@@ -824,7 +898,10 @@ def object_copy(request, v_account, v_container, v_object):
     #                       unauthorized (401),
     #                       badRequest (400)
     
-    dest_path = request.META.get('HTTP_DESTINATION')
+    dest_account = smart_unicode(request.META.get('HTTP_DESTINATION_ACCOUNT'), strings_only=True)
+    if not dest_account:
+        dest_account = request.user
+    dest_path = smart_unicode(request.META.get('HTTP_DESTINATION'), strings_only=True)
     if not dest_path:
         raise BadRequest('Missing Destination header')
     try:
@@ -836,14 +913,16 @@ def object_copy(request, v_account, v_container, v_object):
     if request.META.get('HTTP_IF_MATCH') or request.META.get('HTTP_IF_NONE_MATCH'):
         src_version = request.META.get('HTTP_X_SOURCE_VERSION')
         try:
-            meta = backend.get_object_meta(request.user, v_account, v_container, v_object, src_version)
+            meta = request.backend.get_object_meta(request.user, v_account,
+                                            v_container, v_object, src_version)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except (NameError, IndexError):
             raise ItemNotFound('Container or object does not exist')
         validate_matching_preconditions(request, meta)
     
-    version_id = copy_or_move_object(request, v_account, v_container, v_object, dest_container, dest_name, move=False)
+    version_id = copy_or_move_object(request, v_account, v_container, v_object,
+                                        dest_account, dest_container, dest_name, move=False)
     response = HttpResponse(status=201)
     response['X-Object-Version'] = version_id
     return response
@@ -856,7 +935,10 @@ def object_move(request, v_account, v_container, v_object):
     #                       unauthorized (401),
     #                       badRequest (400)
     
-    dest_path = request.META.get('HTTP_DESTINATION')
+    dest_account = smart_unicode(request.META.get('HTTP_DESTINATION_ACCOUNT'), strings_only=True)
+    if not dest_account:
+        dest_account = request.user
+    dest_path = smart_unicode(request.META.get('HTTP_DESTINATION'), strings_only=True)
     if not dest_path:
         raise BadRequest('Missing Destination header')
     try:
@@ -867,14 +949,16 @@ def object_move(request, v_account, v_container, v_object):
     # Evaluate conditions.
     if request.META.get('HTTP_IF_MATCH') or request.META.get('HTTP_IF_NONE_MATCH'):
         try:
-            meta = backend.get_object_meta(request.user, v_account, v_container, v_object)
+            meta = request.backend.get_object_meta(request.user, v_account,
+                                                    v_container, v_object)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except NameError:
             raise ItemNotFound('Container or object does not exist')
         validate_matching_preconditions(request, meta)
     
-    version_id = copy_or_move_object(request, v_account, v_container, v_object, dest_container, dest_name, move=True)
+    version_id = copy_or_move_object(request, v_account, v_container, v_object,
+                                        dest_account, dest_container, dest_name, move=True)
     response = HttpResponse(status=201)
     response['X-Object-Version'] = version_id
     return response
@@ -893,7 +977,8 @@ def object_update(request, v_account, v_container, v_object):
         del(meta['Content-Type']) # Do not allow changing the Content-Type.
     
     try:
-        prev_meta = backend.get_object_meta(request.user, v_account, v_container, v_object)
+        prev_meta = request.backend.get_object_meta(request.user, v_account,
+                                                    v_container, v_object)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError:
@@ -920,7 +1005,8 @@ def object_update(request, v_account, v_container, v_object):
         # Do permissions first, as it may fail easier.
         if permissions is not None:
             try:
-                backend.update_object_permissions(request.user, v_account, v_container, v_object, permissions)
+                request.backend.update_object_permissions(request.user,
+                                v_account, v_container, v_object, permissions)
             except NotAllowedError:
                 raise Unauthorized('Access denied')
             except NameError:
@@ -931,14 +1017,16 @@ def object_update(request, v_account, v_container, v_object):
                 raise Conflict('\n'.join(e.data) + '\n')
         if public is not None:
             try:
-                backend.update_object_public(request.user, v_account, v_container, v_object, public)
+                request.backend.update_object_public(request.user, v_account,
+                                                v_container, v_object, public)
             except NotAllowedError:
                 raise Unauthorized('Access denied')
             except NameError:
                 raise ItemNotFound('Object does not exist')
         if meta or replace:
             try:
-                version_id = backend.update_object_meta(request.user, v_account, v_container, v_object, meta, replace)
+                version_id = request.backend.update_object_meta(request.user,
+                                v_account, v_container, v_object, meta, replace)
             except NotAllowedError:
                 raise Unauthorized('Access denied')
             except NameError:
@@ -958,7 +1046,8 @@ def object_update(request, v_account, v_container, v_object):
         raise RangeNotSatisfiable('Invalid Content-Range header')
     
     try:
-        size, hashmap = backend.get_object_hashmap(request.user, v_account, v_container, v_object)
+        size, hashmap = request.backend.get_object_hashmap(request.user,
+                                            v_account, v_container, v_object)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError:
@@ -970,12 +1059,16 @@ def object_update(request, v_account, v_container, v_object):
     elif offset > size:
         raise RangeNotSatisfiable('Supplied offset is beyond object limits')
     if src_object:
+        src_account = smart_unicode(request.META.get('HTTP_X_SOURCE_ACCOUNT'), strings_only=True)
+        if not src_account:
+            src_account = request.user
         src_container, src_name = split_container_object_string(src_object)
         src_container = smart_unicode(src_container, strings_only=True)
         src_name = smart_unicode(src_name, strings_only=True)
         src_version = request.META.get('HTTP_X_SOURCE_VERSION')
         try:
-            src_size, src_hashmap = backend.get_object_hashmap(request.user, v_account, src_container, src_name, src_version)
+            src_size, src_hashmap = request.backend.get_object_hashmap(request.user,
+                                        src_account, src_container, src_name, src_version)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except NameError:
@@ -1009,18 +1102,19 @@ def object_update(request, v_account, v_container, v_object):
             raise BadRequest('Invalid X-Object-Bytes header')
     
     if src_object:
-        if offset % backend.block_size == 0:
+        if offset % request.backend.block_size == 0:
             # Update the hashes only.
             sbi = 0
             while length > 0:
-                bi = int(offset / backend.block_size)
-                bl = min(length, backend.block_size)
+                bi = int(offset / request.backend.block_size)
+                bl = min(length, request.backend.block_size)
                 if bi < len(hashmap):
-                    if bl == backend.block_size:
+                    if bl == request.backend.block_size:
                         hashmap[bi] = src_hashmap[sbi]
                     else:
-                        data = backend.get_block(src_hashmap[sbi])
-                        hashmap[bi] = backend.update_block(hashmap[bi], data[:bl], 0)
+                        data = request.backend.get_block(src_hashmap[sbi])
+                        hashmap[bi] = request.backend.update_block(hashmap[bi],
+                                                                data[:bl], 0)
                 else:
                     hashmap.append(src_hashmap[sbi])
                 offset += bl
@@ -1030,34 +1124,37 @@ def object_update(request, v_account, v_container, v_object):
             data = ''
             sbi = 0
             while length > 0:
-                data += backend.get_block(src_hashmap[sbi])
-                if length < backend.block_size:
+                data += request.backend.get_block(src_hashmap[sbi])
+                if length < request.backend.block_size:
                     data = data[:length]
-                bytes = put_object_block(hashmap, data, offset)
+                bytes = put_object_block(request, hashmap, data, offset)
                 offset += bytes
                 data = data[bytes:]
                 length -= bytes
                 sbi += 1
     else:
         data = ''
-        for d in socket_read_iterator(request, length, backend.block_size):
+        for d in socket_read_iterator(request, length,
+                                        request.backend.block_size):
             # TODO: Raise 408 (Request Timeout) if this takes too long.
             # TODO: Raise 499 (Client Disconnect) if a length is defined and we stop before getting this much data.
             data += d
-            bytes = put_object_block(hashmap, data, offset)
+            bytes = put_object_block(request, hashmap, data, offset)
             offset += bytes
             data = data[bytes:]
         if len(data) > 0:
-            put_object_block(hashmap, data, offset)
+            put_object_block(request, hashmap, data, offset)
     
     if offset > size:
         size = offset
     if dest_bytes is not None and dest_bytes < size:
         size = dest_bytes
-        hashmap = hashmap[:(int((size - 1) / backend.block_size) + 1)]
-    meta.update({'hash': hashmap_hash(hashmap)}) # Update ETag.
+        hashmap = hashmap[:(int((size - 1) / request.backend.block_size) + 1)]
+    meta.update({'hash': hashmap_hash(request, hashmap)}) # Update ETag.
     try:
-        version_id = backend.update_object_hashmap(request.user, v_account, v_container, v_object, size, hashmap, meta, replace, permissions)
+        version_id = request.backend.update_object_hashmap(request.user,
+                        v_account, v_container, v_object, size, hashmap, meta,
+                        replace, permissions)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError:
@@ -1068,7 +1165,8 @@ def object_update(request, v_account, v_container, v_object):
         raise Conflict('\n'.join(e.data) + '\n')
     if public is not None:
         try:
-            backend.update_object_public(request.user, v_account, v_container, v_object, public)
+            request.backend.update_object_public(request.user, v_account,
+                                                v_container, v_object, public)
         except NotAllowedError:
             raise Unauthorized('Access denied')
         except NameError:
@@ -1089,7 +1187,8 @@ def object_delete(request, v_account, v_container, v_object):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        backend.delete_object(request.user, v_account, v_container, v_object, until)
+        request.backend.delete_object(request.user, v_account, v_container,
+                                        v_object, until)
     except NotAllowedError:
         raise Unauthorized('Access denied')
     except NameError: