Remove error for overlapping permissions. Document.
[pithos] / pithos / api / functions.py
index b93ff6e..3a3baf4 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 2011 GRNET S.A. All rights reserved.
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-import logging
-import hashlib
+from xml.dom import minidom
 
 from django.conf import settings
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.utils import simplejson as json
 from django.utils.http import parse_etags
-from django.utils.encoding import smart_unicode, smart_str
-from xml.dom import minidom
+from django.utils.encoding import smart_str
+from django.views.decorators.csrf import csrf_exempt
+
+from pithos.lib.filter import parse_filters
 
 from pithos.api.faults import (Fault, NotModified, BadRequest, Unauthorized, Forbidden, ItemNotFound, Conflict,
     LengthRequired, PreconditionFailed, RequestEntityTooLarge, RangeNotSatisfiable, UnprocessableEntity)
-from pithos.api.util import (rename_meta_key, format_header_key, printable_header_dict, get_account_headers,
-    put_account_headers, get_container_headers, put_container_headers, get_object_headers, put_object_headers,
-    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, SaveToBackendHandler,
-    object_data_response, put_object_block, hashmap_hash, api_method, json_encode_decimal)
+from pithos.api.util import (json_encode_decimal, rename_meta_key, format_header_key, printable_header_dict,
+    get_account_headers, put_account_headers, get_container_headers, put_container_headers, get_object_headers,
+    put_object_headers, 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,
+    SaveToBackendHandler, object_data_response, put_object_block, hashmap_md5, simple_list_response, api_method)
 from pithos.backends.base import NotAllowedError, QuotaError
 
+import logging
+import hashlib
+
 
 logger = logging.getLogger(__name__)
 
 
+@csrf_exempt
 def top_demux(request):
     if request.method == 'GET':
         if getattr(request, 'user', None) is not None:
@@ -64,6 +69,7 @@ def top_demux(request):
     else:
         return method_not_allowed(request)
 
+@csrf_exempt
 def account_demux(request, v_account):
     if request.method == 'HEAD':
         return account_meta(request, v_account)
@@ -74,6 +80,7 @@ def account_demux(request, v_account):
     else:
         return method_not_allowed(request)
 
+@csrf_exempt
 def container_demux(request, v_account, v_container):
     if request.method == 'HEAD':
         return container_meta(request, v_account, v_container)
@@ -88,6 +95,7 @@ def container_demux(request, v_account, v_container):
     else:
         return method_not_allowed(request)
 
+@csrf_exempt
 def object_demux(request, v_account, v_container, v_object):
     if request.method == 'HEAD':
         return object_meta(request, v_account, v_container, v_object)
@@ -111,7 +119,7 @@ def object_demux(request, v_account, v_container, v_object):
 @api_method('GET', user_required=False)
 def authenticate(request):
     # Normal Response Codes: 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       forbidden (403),
     #                       badRequest (400)
     
@@ -126,13 +134,13 @@ def authenticate(request):
         uri = uri[:uri.find('?')]
     
     response['X-Auth-Token'] = x_auth_key
-    response['X-Storage-Url'] = uri + (uri.endswith('/') and '' or '/') + x_auth_user
+    response['X-Storage-Url'] = uri + ('' if uri.endswith('/') else '/') + x_auth_user
     return response
 
 @api_method('GET', format_allowed=True)
 def account_list(request):
     # Normal Response Codes: 200, 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       badRequest (400)
     
     response = HttpResponse()
@@ -155,16 +163,23 @@ def account_list(request):
     
     account_meta = []
     for x in accounts:
+        if x == request.user_uniq:
+            continue
         try:
-            meta = request.backend.get_account_meta(request.user_uniq, x)
+            meta = request.backend.get_account_meta(request.user_uniq, x, 'pithos')
             groups = request.backend.get_account_groups(request.user_uniq, x)
         except NotAllowedError:
             raise Forbidden('Not allowed')
         else:
             rename_meta_key(meta, 'modified', 'last_modified')
             rename_meta_key(meta, 'until_timestamp', 'x_account_until_timestamp')
-            for k, v in groups.iteritems():
-                meta['X-Container-Group-' + k] = ','.join(v)
+            m = dict([(k[15:], v) for k, v in meta.iteritems() if k.startswith('X-Account-Meta-')])
+            for k in m:
+                del(meta['X-Account-Meta-' + k])
+            if m:
+                meta['X-Account-Meta'] = printable_header_dict(m)
+            if groups:
+                meta['X-Account-Group'] = printable_header_dict(dict([(k, ','.join(v)) for k, v in groups.iteritems()]))
             account_meta.append(printable_header_dict(meta))
     if request.serialization == 'xml':
         data = render_to_string('accounts.xml', {'accounts': account_meta})
@@ -177,13 +192,13 @@ def account_list(request):
 @api_method('HEAD')
 def account_meta(request, v_account):
     # Normal Response Codes: 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       forbidden (403),
     #                       badRequest (400)
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        meta = request.backend.get_account_meta(request.user_uniq, v_account, until)
+        meta = request.backend.get_account_meta(request.user_uniq, v_account, 'pithos', until)
         groups = request.backend.get_account_groups(request.user_uniq, v_account)
         policy = request.backend.get_account_policy(request.user_uniq, v_account)
     except NotAllowedError:
@@ -198,7 +213,7 @@ def account_meta(request, v_account):
 @api_method('POST')
 def account_update(request, v_account):
     # Normal Response Codes: 202
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       forbidden (403),
     #                       badRequest (400)
     
@@ -216,8 +231,8 @@ def account_update(request, v_account):
             raise BadRequest('Invalid groups header')
     if meta or replace:
         try:
-            request.backend.update_account_meta(request.user_uniq, v_account, meta,
-                                                replace)
+            request.backend.update_account_meta(request.user_uniq, v_account,
+                                                'pithos', meta, replace)
         except NotAllowedError:
             raise Forbidden('Not allowed')
     return HttpResponse(status=202)
@@ -225,14 +240,14 @@ def account_update(request, v_account):
 @api_method('GET', format_allowed=True)
 def container_list(request, v_account):
     # Normal Response Codes: 200, 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        meta = request.backend.get_account_meta(request.user_uniq, v_account, until)
+        meta = request.backend.get_account_meta(request.user_uniq, v_account, 'pithos', until)
         groups = request.backend.get_account_groups(request.user_uniq, v_account)
         policy = request.backend.get_account_policy(request.user_uniq, v_account)
     except NotAllowedError:
@@ -273,7 +288,7 @@ def container_list(request, v_account):
     for x in containers:
         try:
             meta = request.backend.get_container_meta(request.user_uniq, v_account,
-                                                        x, until)
+                                                        x, 'pithos', until)
             policy = request.backend.get_container_policy(request.user_uniq,
                                                             v_account, x)
         except NotAllowedError:
@@ -283,8 +298,13 @@ def container_list(request, v_account):
         else:
             rename_meta_key(meta, 'modified', 'last_modified')
             rename_meta_key(meta, 'until_timestamp', 'x_container_until_timestamp')
-            for k, v in policy.iteritems():
-                meta['X-Container-Policy-' + k] = v
+            m = dict([(k[17:], v) for k, v in meta.iteritems() if k.startswith('X-Container-Meta-')])
+            for k in m:
+                del(meta['X-Container-Meta-' + k])
+            if m:
+                meta['X-Container-Meta'] = printable_header_dict(m)
+            if policy:
+                meta['X-Container-Policy'] = printable_header_dict(dict([(k, v) for k, v in policy.iteritems()]))
             container_meta.append(printable_header_dict(meta))
     if request.serialization == 'xml':
         data = render_to_string('containers.xml', {'account': v_account, 'containers': container_meta})
@@ -297,7 +317,7 @@ def container_list(request, v_account):
 @api_method('HEAD')
 def container_meta(request, v_account, v_container):
     # Normal Response Codes: 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
@@ -305,9 +325,9 @@ def container_meta(request, v_account, v_container):
     until = get_int_parameter(request.GET.get('until'))
     try:
         meta = request.backend.get_container_meta(request.user_uniq, v_account,
-                                                    v_container, until)
+                                                    v_container, 'pithos', until)
         meta['object_meta'] = request.backend.list_object_meta(request.user_uniq,
-                                                v_account, v_container, until)
+                                                v_account, v_container, 'pithos', until)
         policy = request.backend.get_container_policy(request.user_uniq, v_account,
                                                         v_container)
     except NotAllowedError:
@@ -324,7 +344,7 @@ def container_meta(request, v_account, v_container):
 @api_method('PUT')
 def container_create(request, v_account, v_container):
     # Normal Response Codes: 201, 202
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
@@ -354,7 +374,7 @@ def container_create(request, v_account, v_container):
     if meta:
         try:
             request.backend.update_container_meta(request.user_uniq, v_account,
-                                            v_container, meta, replace=False)
+                                            v_container, 'pithos', meta, replace=False)
         except NotAllowedError:
             raise Forbidden('Not allowed')
         except NameError:
@@ -362,10 +382,10 @@ def container_create(request, v_account, v_container):
     
     return HttpResponse(status=ret)
 
-@api_method('POST')
+@api_method('POST', format_allowed=True)
 def container_update(request, v_account, v_container):
     # Normal Response Codes: 202
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
@@ -387,7 +407,7 @@ def container_update(request, v_account, v_container):
     if meta or replace:
         try:
             request.backend.update_container_meta(request.user_uniq, v_account,
-                                                    v_container, meta, replace)
+                                                    v_container, 'pithos', meta, replace)
         except NotAllowedError:
             raise Forbidden('Not allowed')
         except NameError:
@@ -407,13 +427,13 @@ def container_update(request, v_account, v_container):
     
     response = HttpResponse(status=202)
     if hashmap:
-        response.content = '\n'.join(hashmap) + '\n'
+        response.content = simple_list_response(request, hashmap)
     return response
 
 @api_method('DELETE')
 def container_delete(request, v_account, v_container):
     # Normal Response Codes: 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       conflict (409),
     #                       itemNotFound (404),
     #                       forbidden (403),
@@ -434,7 +454,7 @@ def container_delete(request, v_account, v_container):
 @api_method('GET', format_allowed=True)
 def object_list(request, v_account, v_container):
     # Normal Response Codes: 200, 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
@@ -442,9 +462,9 @@ def object_list(request, v_account, v_container):
     until = get_int_parameter(request.GET.get('until'))
     try:
         meta = request.backend.get_container_meta(request.user_uniq, v_account,
-                                                    v_container, until)
+                                                    v_container, 'pithos', until)
         meta['object_meta'] = request.backend.list_object_meta(request.user_uniq,
-                                                v_account, v_container, until)
+                                                v_account, v_container, 'pithos', until)
         policy = request.backend.get_container_policy(request.user_uniq, v_account,
                                                         v_container)
     except NotAllowedError:
@@ -482,9 +502,12 @@ def object_list(request, v_account, v_container):
     
     keys = request.GET.get('meta')
     if keys:
-        keys = keys.split(',')
-        l = [smart_str(x) for x in keys if x.strip() != '']
-        keys = [format_header_key('X-Object-Meta-' + x.strip()) for x in l]
+        keys = [smart_str(x.strip()) for x in keys.split(',') if x.strip() != '']
+        included, excluded, opers = parse_filters(keys)
+        keys = []
+        keys += [format_header_key('X-Object-Meta-' + x) for x in included]
+        keys += ['!'+format_header_key('X-Object-Meta-' + x) for x in excluded]
+        keys += ['%s%s%s' % (format_header_key('X-Object-Meta-' + k), o, v) for k, o, v in opers]
     else:
         keys = []
     
@@ -495,7 +518,7 @@ def object_list(request, v_account, v_container):
     try:
         objects = request.backend.list_objects(request.user_uniq, v_account,
                                     v_container, prefix, delimiter, marker,
-                                    limit, virtual, keys, shared, until)
+                                    limit, virtual, 'pithos', keys, shared, until)
     except NotAllowedError:
         raise Forbidden('Not allowed')
     except NameError:
@@ -518,7 +541,7 @@ def object_list(request, v_account, v_container):
         else:
             try:
                 meta = request.backend.get_object_meta(request.user_uniq, v_account,
-                                                        v_container, x[0], x[1])
+                                                        v_container, x[0], 'pithos', x[1])
                 if until is None:
                     permissions = request.backend.get_object_permissions(
                                     request.user_uniq, v_account, v_container, x[0])
@@ -534,10 +557,16 @@ def object_list(request, v_account, v_container):
             else:
                 rename_meta_key(meta, 'hash', 'x_object_hash') # Will be replaced by ETag.
                 rename_meta_key(meta, 'ETag', 'hash')
+                rename_meta_key(meta, 'uuid', 'x_object_uuid')
                 rename_meta_key(meta, 'modified', 'last_modified')
                 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')
+                m = dict([(k[14:], v) for k, v in meta.iteritems() if k.startswith('X-Object-Meta-')])
+                for k in m:
+                    del(meta['X-Object-Meta-' + k])
+                if m:
+                    meta['X-Object-Meta'] = printable_header_dict(m)
                 update_sharing_meta(request, permissions, v_account, v_container, x[0], meta)
                 update_public_meta(public, meta)
                 object_meta.append(printable_header_dict(meta))
@@ -552,7 +581,7 @@ def object_list(request, v_account, v_container):
 @api_method('HEAD')
 def object_meta(request, v_account, v_container, v_object):
     # Normal Response Codes: 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
@@ -560,7 +589,7 @@ def object_meta(request, v_account, v_container, v_object):
     version = request.GET.get('version')
     try:
         meta = request.backend.get_object_meta(request.user_uniq, v_account,
-                                                v_container, v_object, version)
+                                                v_container, v_object, 'pithos', version)
         if version is None:
             permissions = request.backend.get_object_permissions(request.user_uniq,
                                             v_account, v_container, v_object)
@@ -596,7 +625,7 @@ def object_meta(request, v_account, v_container, v_object):
 @api_method('GET', format_allowed=True)
 def object_read(request, v_account, v_container, v_object):
     # Normal Response Codes: 200, 206
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       rangeNotSatisfiable (416),
     #                       preconditionFailed (412),
     #                       itemNotFound (404),
@@ -629,7 +658,7 @@ def object_read(request, v_account, v_container, v_object):
     
     try:
         meta = request.backend.get_object_meta(request.user_uniq, v_account,
-                                                v_container, v_object, version)
+                                                v_container, v_object, 'pithos', version)
         if version is None:
             permissions = request.backend.get_object_permissions(request.user_uniq,
                                             v_account, v_container, v_object)
@@ -723,7 +752,7 @@ def object_read(request, v_account, v_container, v_object):
 @api_method('PUT', format_allowed=True)
 def object_write(request, v_account, v_container, v_object):
     # Normal Response Codes: 201
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       unprocessableEntity (422),
     #                       lengthRequired (411),
     #                       conflict (409),
@@ -735,19 +764,19 @@ def object_write(request, v_account, v_container, v_object):
     if request.META.get('HTTP_IF_MATCH') or request.META.get('HTTP_IF_NONE_MATCH'):
         try:
             meta = request.backend.get_object_meta(request.user_uniq, v_account,
-                                                        v_container, v_object)
+                                                        v_container, v_object, 'pithos')
         except NotAllowedError:
             raise Forbidden('Not allowed')
         except NameError:
             meta = {}
         validate_matching_preconditions(request, meta)
     
-    copy_from = smart_unicode(request.META.get('HTTP_X_COPY_FROM'), strings_only=True)
-    move_from = smart_unicode(request.META.get('HTTP_X_MOVE_FROM'), strings_only=True)
+    copy_from = request.META.get('HTTP_X_COPY_FROM')
+    move_from = request.META.get('HTTP_X_MOVE_FROM')
     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)
+        src_account = request.META.get('HTTP_X_SOURCE_ACCOUNT')
         if not src_account:
             src_account = request.user_uniq
         if move_from:
@@ -806,8 +835,6 @@ def object_write(request, v_account, v_container, v_object):
                     hashmap.append(hash.firstChild.data)
             except:
                 raise BadRequest('Invalid data formatting')
-        
-        meta.update({'ETag': hashmap_hash(request, hashmap)}) # Update ETag.
     else:
         md5 = hashlib.md5()
         size = 0
@@ -827,20 +854,28 @@ def object_write(request, v_account, v_container, v_object):
     
     try:
         version_id = request.backend.update_object_hashmap(request.user_uniq,
-                        v_account, v_container, v_object, size, hashmap, meta,
-                        True, permissions)
+                        v_account, v_container, v_object, size, hashmap,
+                        'pithos', meta, True, permissions)
     except NotAllowedError:
         raise Forbidden('Not allowed')
     except IndexError, e:
-        raise Conflict('\n'.join(e.data) + '\n')
+        raise Conflict(simple_list_response(request, e.data))
     except NameError:
         raise ItemNotFound('Container does not exist')
     except ValueError:
         raise BadRequest('Invalid sharing header')
-    except AttributeError, e:
-        raise Conflict('\n'.join(e.data) + '\n')
     except QuotaError:
         raise RequestEntityTooLarge('Quota exceeded')
+    if 'ETag' not in meta:
+        # Update the MD5 after the hashmap, as there may be missing hashes.
+        # TODO: This will create a new version, even if done synchronously...
+        etag = hashmap_md5(request, hashmap, size)
+        meta.update({'ETag': etag}) # Update ETag.
+        try:
+            version_id = request.backend.update_object_meta(request.user_uniq,
+                            v_account, v_container, v_object, 'pithos', {'ETag': etag}, False)
+        except NotAllowedError:
+            raise Forbidden('Not allowed')
     if public is not None:
         try:
             request.backend.update_object_public(request.user_uniq, v_account,
@@ -858,7 +893,7 @@ def object_write(request, v_account, v_container, v_object):
 @api_method('POST')
 def object_write_form(request, v_account, v_container, v_object):
     # Normal Response Codes: 201
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
@@ -874,7 +909,8 @@ def object_write_form(request, v_account, v_container, v_object):
     
     try:
         version_id = request.backend.update_object_hashmap(request.user_uniq,
-                        v_account, v_container, v_object, file.size, file.hashmap, meta, True)
+                        v_account, v_container, v_object, file.size, file.hashmap,
+                        'pithos', meta, True)
     except NotAllowedError:
         raise Forbidden('Not allowed')
     except NameError:
@@ -885,20 +921,21 @@ def object_write_form(request, v_account, v_container, v_object):
     response = HttpResponse(status=201)
     response['ETag'] = meta['ETag']
     response['X-Object-Version'] = version_id
+    response.content = meta['ETag']
     return response
 
-@api_method('COPY')
+@api_method('COPY', format_allowed=True)
 def object_copy(request, v_account, v_container, v_object):
     # Normal Response Codes: 201
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
     
-    dest_account = smart_unicode(request.META.get('HTTP_DESTINATION_ACCOUNT'), strings_only=True)
+    dest_account = request.META.get('HTTP_DESTINATION_ACCOUNT')
     if not dest_account:
         dest_account = request.user_uniq
-    dest_path = smart_unicode(request.META.get('HTTP_DESTINATION'), strings_only=True)
+    dest_path = request.META.get('HTTP_DESTINATION')
     if not dest_path:
         raise BadRequest('Missing Destination header')
     try:
@@ -911,7 +948,7 @@ def object_copy(request, v_account, v_container, v_object):
         src_version = request.META.get('HTTP_X_SOURCE_VERSION')
         try:
             meta = request.backend.get_object_meta(request.user_uniq, v_account,
-                                            v_container, v_object, src_version)
+                                            v_container, v_object, 'pithos', src_version)
         except NotAllowedError:
             raise Forbidden('Not allowed')
         except (NameError, IndexError):
@@ -924,18 +961,18 @@ def object_copy(request, v_account, v_container, v_object):
     response['X-Object-Version'] = version_id
     return response
 
-@api_method('MOVE')
+@api_method('MOVE', format_allowed=True)
 def object_move(request, v_account, v_container, v_object):
     # Normal Response Codes: 201
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
     
-    dest_account = smart_unicode(request.META.get('HTTP_DESTINATION_ACCOUNT'), strings_only=True)
+    dest_account = request.META.get('HTTP_DESTINATION_ACCOUNT')
     if not dest_account:
         dest_account = request.user_uniq
-    dest_path = smart_unicode(request.META.get('HTTP_DESTINATION'), strings_only=True)
+    dest_path = request.META.get('HTTP_DESTINATION')
     if not dest_path:
         raise BadRequest('Missing Destination header')
     try:
@@ -947,7 +984,7 @@ def object_move(request, v_account, v_container, v_object):
     if request.META.get('HTTP_IF_MATCH') or request.META.get('HTTP_IF_NONE_MATCH'):
         try:
             meta = request.backend.get_object_meta(request.user_uniq, v_account,
-                                                    v_container, v_object)
+                                                    v_container, v_object, 'pithos')
         except NotAllowedError:
             raise Forbidden('Not allowed')
         except NameError:
@@ -960,14 +997,15 @@ def object_move(request, v_account, v_container, v_object):
     response['X-Object-Version'] = version_id
     return response
 
-@api_method('POST')
+@api_method('POST', format_allowed=True)
 def object_update(request, v_account, v_container, v_object):
     # Normal Response Codes: 202, 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       conflict (409),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)
+    
     meta, permissions, public = get_object_headers(request)
     content_type = meta.get('Content-Type')
     if content_type:
@@ -975,7 +1013,7 @@ def object_update(request, v_account, v_container, v_object):
     
     try:
         prev_meta = request.backend.get_object_meta(request.user_uniq, v_account,
-                                                    v_container, v_object)
+                                                    v_container, v_object, 'pithos')
     except NotAllowedError:
         raise Forbidden('Not allowed')
     except NameError:
@@ -1010,8 +1048,6 @@ def object_update(request, v_account, v_container, v_object):
                 raise ItemNotFound('Object does not exist')
             except ValueError:
                 raise BadRequest('Invalid sharing header')
-            except AttributeError, e:
-                raise Conflict('\n'.join(e.data) + '\n')
         if public is not None:
             try:
                 request.backend.update_object_public(request.user_uniq, v_account,
@@ -1023,7 +1059,7 @@ def object_update(request, v_account, v_container, v_object):
         if meta or replace:
             try:
                 version_id = request.backend.update_object_meta(request.user_uniq,
-                                v_account, v_container, v_object, meta, replace)
+                                v_account, v_container, v_object, 'pithos', meta, replace)
             except NotAllowedError:
                 raise Forbidden('Not allowed')
             except NameError:
@@ -1056,12 +1092,10 @@ 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)
+        src_account = request.META.get('HTTP_X_SOURCE_ACCOUNT')
         if not src_account:
             src_account = request.user_uniq
         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 = request.backend.get_object_hashmap(request.user_uniq,
@@ -1147,19 +1181,17 @@ def object_update(request, v_account, v_container, v_object):
     if dest_bytes is not None and dest_bytes < size:
         size = dest_bytes
         hashmap = hashmap[:(int((size - 1) / request.backend.block_size) + 1)]
-    meta.update({'ETag': hashmap_hash(request, hashmap)}) # Update ETag.
+    meta.update({'ETag': hashmap_md5(request, hashmap, size)}) # Update ETag.
     try:
         version_id = request.backend.update_object_hashmap(request.user_uniq,
-                        v_account, v_container, v_object, size, hashmap, meta,
-                        replace, permissions)
+                        v_account, v_container, v_object, size, hashmap,
+                        'pithos', meta, replace, permissions)
     except NotAllowedError:
         raise Forbidden('Not allowed')
     except NameError:
         raise ItemNotFound('Container does not exist')
     except ValueError:
         raise BadRequest('Invalid sharing header')
-    except AttributeError, e:
-        raise Conflict('\n'.join(e.data) + '\n')
     except QuotaError:
         raise RequestEntityTooLarge('Quota exceeded')
     if public is not None:
@@ -1179,7 +1211,7 @@ def object_update(request, v_account, v_container, v_object):
 @api_method('DELETE')
 def object_delete(request, v_account, v_container, v_object):
     # Normal Response Codes: 204
-    # Error Response Codes: serviceUnavailable (503),
+    # Error Response Codes: internalServerError (500),
     #                       itemNotFound (404),
     #                       forbidden (403),
     #                       badRequest (400)