Replace uniq with userid.

diff --git a/snf-pithos-app/pithos/api/functions.py b/snf-pithos-app/pithos/api/functions.py
index 0010f91..801a1ae 100644 (file)
--- a/snf-pithos-app/pithos/api/functions.py
+++ b/snf-pithos-app/pithos/api/functions.py
@@ -164,7 +164,7 @@ def account_list(request):
     if not limit:
         limit = 10000
     
-    accounts = request.backend.list_accounts(request.user_uniq, marker, limit)
+    accounts = request.backend.list_accounts(request.userid, marker, limit)
     
     if request.serialization == 'text':
         if len(accounts) == 0:
@@ -177,11 +177,11 @@ def account_list(request):
     
     account_meta = []
     for x in accounts:
-        if x == request.user_uniq:
+        if x == request.userid:
             continue
         try:
-            meta = request.backend.get_account_meta(request.user_uniq, x, 'pithos', include_user_defined=False)
-            groups = request.backend.get_account_groups(request.user_uniq, x)
+            meta = request.backend.get_account_meta(request.userid, x, 'pithos', include_user_defined=False)
+            groups = request.backend.get_account_groups(request.userid, x)
         except NotAllowedError:
             raise Forbidden('Not allowed')
         else:
@@ -207,9 +207,9 @@ def account_meta(request, v_account):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        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)
+        meta = request.backend.get_account_meta(request.userid, v_account, 'pithos', until)
+        groups = request.backend.get_account_groups(request.userid, v_account)
+        policy = request.backend.get_account_policy(request.userid, v_account)
     except NotAllowedError:
         raise Forbidden('Not allowed')
     
@@ -232,7 +232,7 @@ def account_update(request, v_account):
         replace = False
     if groups:
         try:
-            request.backend.update_account_groups(request.user_uniq, v_account,
+            request.backend.update_account_groups(request.userid, v_account,
                                                     groups, replace)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -240,7 +240,7 @@ 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,
+            request.backend.update_account_meta(request.userid, v_account,
                                                 'pithos', meta, replace)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -256,9 +256,9 @@ def container_list(request, v_account):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        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)
+        meta = request.backend.get_account_meta(request.userid, v_account, 'pithos', until)
+        groups = request.backend.get_account_groups(request.userid, v_account)
+        policy = request.backend.get_account_policy(request.userid, v_account)
     except NotAllowedError:
         raise Forbidden('Not allowed')
     
@@ -277,7 +277,7 @@ def container_list(request, v_account):
         shared = True
     
     try:
-        containers = request.backend.list_containers(request.user_uniq, v_account,
+        containers = request.backend.list_containers(request.userid, v_account,
                                                 marker, limit, shared, until)
     except NotAllowedError:
         raise Forbidden('Not allowed')
@@ -296,9 +296,9 @@ def container_list(request, v_account):
     container_meta = []
     for x in containers:
         try:
-            meta = request.backend.get_container_meta(request.user_uniq, v_account,
+            meta = request.backend.get_container_meta(request.userid, v_account,
                                                         x, 'pithos', until, include_user_defined=False)
-            policy = request.backend.get_container_policy(request.user_uniq,
+            policy = request.backend.get_container_policy(request.userid,
                                                             v_account, x)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -328,11 +328,11 @@ 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,
+        meta = request.backend.get_container_meta(request.userid, v_account,
                                                     v_container, 'pithos', until)
-        meta['object_meta'] = request.backend.list_container_meta(request.user_uniq,
+        meta['object_meta'] = request.backend.list_container_meta(request.userid,
                                                 v_account, v_container, 'pithos', until)
-        policy = request.backend.get_container_policy(request.user_uniq, v_account,
+        policy = request.backend.get_container_policy(request.userid, v_account,
                                                         v_container)
     except NotAllowedError:
         raise Forbidden('Not allowed')
@@ -356,7 +356,7 @@ def container_create(request, v_account, v_container):
     meta, policy = get_container_headers(request)
     
     try:
-        request.backend.put_container(request.user_uniq, v_account, v_container, policy)
+        request.backend.put_container(request.userid, v_account, v_container, policy)
         ret = 201
     except NotAllowedError:
         raise Forbidden('Not allowed')
@@ -367,7 +367,7 @@ def container_create(request, v_account, v_container):
     
     if ret == 202 and policy:
         try:
-            request.backend.update_container_policy(request.user_uniq, v_account,
+            request.backend.update_container_policy(request.userid, v_account,
                                             v_container, policy, replace=False)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -377,7 +377,7 @@ def container_create(request, v_account, v_container):
             raise BadRequest('Invalid policy header')
     if meta:
         try:
-            request.backend.update_container_meta(request.user_uniq, v_account,
+            request.backend.update_container_meta(request.userid, v_account,
                                             v_container, 'pithos', meta, replace=False)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -400,7 +400,7 @@ def container_update(request, v_account, v_container):
         replace = False
     if policy:
         try:
-            request.backend.update_container_policy(request.user_uniq, v_account,
+            request.backend.update_container_policy(request.userid, v_account,
                                                 v_container, policy, replace)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -410,7 +410,7 @@ def container_update(request, v_account, v_container):
             raise BadRequest('Invalid policy header')
     if meta or replace:
         try:
-            request.backend.update_container_meta(request.user_uniq, v_account,
+            request.backend.update_container_meta(request.userid, v_account,
                                                     v_container, 'pithos', meta, replace)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -445,7 +445,7 @@ def container_delete(request, v_account, v_container):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        request.backend.delete_container(request.user_uniq, v_account, v_container,
+        request.backend.delete_container(request.userid, v_account, v_container,
                                             until)
     except NotAllowedError:
         raise Forbidden('Not allowed')
@@ -465,11 +465,11 @@ 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,
+        meta = request.backend.get_container_meta(request.userid, v_account,
                                                     v_container, 'pithos', until)
-        meta['object_meta'] = request.backend.list_container_meta(request.user_uniq,
+        meta['object_meta'] = request.backend.list_container_meta(request.userid,
                                                 v_account, v_container, 'pithos', until)
-        policy = request.backend.get_container_policy(request.user_uniq, v_account,
+        policy = request.backend.get_container_policy(request.userid, v_account,
                                                         v_container)
     except NotAllowedError:
         raise Forbidden('Not allowed')
@@ -521,7 +521,7 @@ def object_list(request, v_account, v_container):
     
     if request.serialization == 'text':
         try:
-            objects = request.backend.list_objects(request.user_uniq, v_account,
+            objects = request.backend.list_objects(request.userid, v_account,
                                         v_container, prefix, delimiter, marker,
                                         limit, virtual, 'pithos', keys, shared, until)
         except NotAllowedError:
@@ -538,19 +538,19 @@ def object_list(request, v_account, v_container):
         return response
     
     try:
-        objects = request.backend.list_object_meta(request.user_uniq, v_account,
+        objects = request.backend.list_object_meta(request.userid, v_account,
                                     v_container, prefix, delimiter, marker,
                                     limit, virtual, 'pithos', keys, shared, until)
         object_permissions = {}
         object_public = {}
         if until is None:
             name_idx = len('/'.join((v_account, v_container, '')))
-            for x in request.backend.list_object_permissions(request.user_uniq,
+            for x in request.backend.list_object_permissions(request.userid,
                                     v_account, v_container, prefix):
                 object = x[name_idx:]
                 object_permissions[object] = request.backend.get_object_permissions(
-                                    request.user_uniq, v_account, v_container, object)
-            for k, v in request.backend.list_object_public(request.user_uniq,
+                                    request.userid, v_account, v_container, object)
+            for k, v in request.backend.list_object_public(request.userid,
                                     v_account, v_container, prefix).iteritems():
                 object_public[k[name_idx:]] = v
     except NotAllowedError:
@@ -600,12 +600,12 @@ 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,
+        meta = request.backend.get_object_meta(request.userid, v_account,
                                                 v_container, v_object, 'pithos', version)
         if version is None:
-            permissions = request.backend.get_object_permissions(request.user_uniq,
+            permissions = request.backend.get_object_permissions(request.userid,
                                             v_account, v_container, v_object)
-            public = request.backend.get_object_public(request.user_uniq, v_account,
+            public = request.backend.get_object_public(request.userid, v_account,
                                                         v_container, v_object)
         else:
             permissions = None
@@ -653,7 +653,7 @@ def object_read(request, v_account, v_container, v_object):
             raise BadRequest('No format specified for version list.')
         
         try:
-            v = request.backend.list_versions(request.user_uniq, v_account,
+            v = request.backend.list_versions(request.userid, v_account,
                                                 v_container, v_object)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -669,12 +669,12 @@ def object_read(request, v_account, v_container, v_object):
         return response
     
     try:
-        meta = request.backend.get_object_meta(request.user_uniq, v_account,
+        meta = request.backend.get_object_meta(request.userid, v_account,
                                                 v_container, v_object, 'pithos', version)
         if version is None:
-            permissions = request.backend.get_object_permissions(request.user_uniq,
+            permissions = request.backend.get_object_permissions(request.userid,
                                             v_account, v_container, v_object)
-            public = request.backend.get_object_public(request.user_uniq, v_account,
+            public = request.backend.get_object_public(request.userid, v_account,
                                                         v_container, v_object)
         else:
             permissions = None
@@ -708,7 +708,7 @@ def object_read(request, v_account, v_container, v_object):
     if 'X-Object-Manifest' in meta and not hashmap_reply:
         try:
             src_container, src_name = split_container_object_string('/' + meta['X-Object-Manifest'])
-            objects = request.backend.list_objects(request.user_uniq, v_account,
+            objects = request.backend.list_objects(request.userid, v_account,
                                 src_container, prefix=src_name, virtual=False)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -719,7 +719,7 @@ def object_read(request, v_account, v_container, v_object):
         
         try:
             for x in objects:
-                s, h = request.backend.get_object_hashmap(request.user_uniq,
+                s, h = request.backend.get_object_hashmap(request.userid,
                                         v_account, src_container, x[0], x[1])
                 sizes.append(s)
                 hashmaps.append(h)
@@ -731,7 +731,7 @@ def object_read(request, v_account, v_container, v_object):
             raise ItemNotFound('Version does not exist')
     else:
         try:
-            s, h = request.backend.get_object_hashmap(request.user_uniq, v_account,
+            s, h = request.backend.get_object_hashmap(request.userid, v_account,
                                                 v_container, v_object, version)
             sizes.append(s)
             hashmaps.append(h)
@@ -779,7 +779,7 @@ def object_write(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 = request.backend.get_object_meta(request.user_uniq, v_account,
+            meta = request.backend.get_object_meta(request.userid, v_account,
                                                         v_container, v_object, 'pithos')
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -794,7 +794,7 @@ def object_write(request, v_account, v_container, v_object):
         
         src_account = request.META.get('HTTP_X_SOURCE_ACCOUNT')
         if not src_account:
-            src_account = request.user_uniq
+            src_account = request.userid
         if move_from:
             try:
                 src_container, src_name = split_container_object_string(move_from)
@@ -871,7 +871,7 @@ def object_write(request, v_account, v_container, v_object):
             raise UnprocessableEntity('Object ETag does not match')
     
     try:
-        version_id = request.backend.update_object_hashmap(request.user_uniq,
+        version_id = request.backend.update_object_hashmap(request.userid,
                         v_account, v_container, v_object, size, content_type,
                         hashmap, checksum, 'pithos', meta, True, permissions)
     except NotAllowedError:
@@ -888,13 +888,13 @@ def object_write(request, v_account, v_container, v_object):
         # Update the MD5 after the hashmap, as there may be missing hashes.
         checksum = hashmap_md5(request, hashmap, size)
         try:
-            version_id = request.backend.update_object_checksum(request.user_uniq,
+            version_id = request.backend.update_object_checksum(request.userid,
                             v_account, v_container, v_object, version_id, checksum)
         except NotAllowedError:
             raise Forbidden('Not allowed')
     if public is not None:
         try:
-            request.backend.update_object_public(request.user_uniq, v_account,
+            request.backend.update_object_public(request.userid, v_account,
                                                 v_container, v_object, public)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -922,7 +922,7 @@ def object_write_form(request, v_account, v_container, v_object):
     
     checksum = file.etag
     try:
-        version_id = request.backend.update_object_hashmap(request.user_uniq,
+        version_id = request.backend.update_object_hashmap(request.userid,
                         v_account, v_container, v_object, file.size, file.content_type,
                         file.hashmap, checksum, 'pithos', {}, True)
     except NotAllowedError:
@@ -948,7 +948,7 @@ def object_copy(request, v_account, v_container, v_object):
     
     dest_account = request.META.get('HTTP_DESTINATION_ACCOUNT')
     if not dest_account:
-        dest_account = request.user_uniq
+        dest_account = request.userid
     dest_path = request.META.get('HTTP_DESTINATION')
     if not dest_path:
         raise BadRequest('Missing Destination header')
@@ -961,7 +961,7 @@ 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 = request.backend.get_object_meta(request.user_uniq, v_account,
+            meta = request.backend.get_object_meta(request.userid, v_account,
                                             v_container, v_object, 'pithos', src_version)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -985,7 +985,7 @@ def object_move(request, v_account, v_container, v_object):
     
     dest_account = request.META.get('HTTP_DESTINATION_ACCOUNT')
     if not dest_account:
-        dest_account = request.user_uniq
+        dest_account = request.userid
     dest_path = request.META.get('HTTP_DESTINATION')
     if not dest_path:
         raise BadRequest('Missing Destination header')
@@ -997,7 +997,7 @@ 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 = request.backend.get_object_meta(request.user_uniq, v_account,
+            meta = request.backend.get_object_meta(request.userid, v_account,
                                                     v_container, v_object, 'pithos')
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -1023,7 +1023,7 @@ def object_update(request, v_account, v_container, v_object):
     content_type, meta, permissions, public = get_object_headers(request)
     
     try:
-        prev_meta = request.backend.get_object_meta(request.user_uniq, v_account,
+        prev_meta = request.backend.get_object_meta(request.userid, v_account,
                                                     v_container, v_object, 'pithos')
     except NotAllowedError:
         raise Forbidden('Not allowed')
@@ -1046,7 +1046,7 @@ def object_update(request, v_account, v_container, v_object):
         # Do permissions first, as it may fail easier.
         if permissions is not None:
             try:
-                request.backend.update_object_permissions(request.user_uniq,
+                request.backend.update_object_permissions(request.userid,
                                 v_account, v_container, v_object, permissions)
             except NotAllowedError:
                 raise Forbidden('Not allowed')
@@ -1056,7 +1056,7 @@ def object_update(request, v_account, v_container, v_object):
                 raise BadRequest('Invalid sharing header')
         if public is not None:
             try:
-                request.backend.update_object_public(request.user_uniq, v_account,
+                request.backend.update_object_public(request.userid, v_account,
                                                 v_container, v_object, public)
             except NotAllowedError:
                 raise Forbidden('Not allowed')
@@ -1064,7 +1064,7 @@ def object_update(request, v_account, v_container, v_object):
                 raise ItemNotFound('Object does not exist')
         if meta or replace:
             try:
-                version_id = request.backend.update_object_meta(request.user_uniq,
+                version_id = request.backend.update_object_meta(request.userid,
                                 v_account, v_container, v_object, 'pithos', meta, replace)
             except NotAllowedError:
                 raise Forbidden('Not allowed')
@@ -1085,7 +1085,7 @@ def object_update(request, v_account, v_container, v_object):
         raise RangeNotSatisfiable('Invalid Content-Range header')
     
     try:
-        size, hashmap = request.backend.get_object_hashmap(request.user_uniq,
+        size, hashmap = request.backend.get_object_hashmap(request.userid,
                                             v_account, v_container, v_object)
     except NotAllowedError:
         raise Forbidden('Not allowed')
@@ -1100,11 +1100,11 @@ def object_update(request, v_account, v_container, v_object):
     if src_object:
         src_account = request.META.get('HTTP_X_SOURCE_ACCOUNT')
         if not src_account:
-            src_account = request.user_uniq
+            src_account = request.userid
         src_container, src_name = split_container_object_string(src_object)
         src_version = request.META.get('HTTP_X_SOURCE_VERSION')
         try:
-            src_size, src_hashmap = request.backend.get_object_hashmap(request.user_uniq,
+            src_size, src_hashmap = request.backend.get_object_hashmap(request.userid,
                                         src_account, src_container, src_name, src_version)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -1189,7 +1189,7 @@ def object_update(request, v_account, v_container, v_object):
         hashmap = hashmap[:(int((size - 1) / request.backend.block_size) + 1)]
     checksum = hashmap_md5(request, hashmap, size)
     try:
-        version_id = request.backend.update_object_hashmap(request.user_uniq,
+        version_id = request.backend.update_object_hashmap(request.userid,
                         v_account, v_container, v_object, size, prev_meta['type'],
                         hashmap, checksum, 'pithos', meta, replace, permissions)
     except NotAllowedError:
@@ -1202,7 +1202,7 @@ def object_update(request, v_account, v_container, v_object):
         raise RequestEntityTooLarge('Quota exceeded')
     if public is not None:
         try:
-            request.backend.update_object_public(request.user_uniq, v_account,
+            request.backend.update_object_public(request.userid, v_account,
                                                 v_container, v_object, public)
         except NotAllowedError:
             raise Forbidden('Not allowed')
@@ -1224,7 +1224,7 @@ def object_delete(request, v_account, v_container, v_object):
     
     until = get_int_parameter(request.GET.get('until'))
     try:
-        request.backend.delete_object(request.user_uniq, v_account, v_container,
+        request.backend.delete_object(request.userid, v_account, v_container,
                                         v_object, until)
     except NotAllowedError:
         raise Forbidden('Not allowed')

diff --git a/snf-pithos-app/pithos/api/public.py b/snf-pithos-app/pithos/api/public.py
index 06db2ed..a14ba24 100644 (file)
--- a/snf-pithos-app/pithos/api/public.py
+++ b/snf-pithos-app/pithos/api/public.py
@@ -67,11 +67,11 @@ def public_meta(request, v_public):
     #                       badRequest (400)
     
     try:
-        v_account, v_container, v_object = request.backend.get_public(request.user_uniq,
+        v_account, v_container, v_object = request.backend.get_public(request.userid,
                                                     decode_url(v_public))
-        meta = request.backend.get_object_meta(request.user_uniq, v_account,
+        meta = request.backend.get_object_meta(request.userid, v_account,
                                                     v_container, v_object, 'pithos')
-        public = request.backend.get_object_public(request.user_uniq, v_account,
+        public = request.backend.get_object_public(request.userid, v_account,
                                                     v_container, v_object)
     except:
         raise ItemNotFound('Object does not exist')
@@ -95,11 +95,11 @@ def public_read(request, v_public):
     #                       notModified (304)
     
     try:
-        v_account, v_container, v_object = request.backend.get_public(request.user_uniq,
+        v_account, v_container, v_object = request.backend.get_public(request.userid,
                                                     decode_url(v_public))
-        meta = request.backend.get_object_meta(request.user_uniq, v_account,
+        meta = request.backend.get_object_meta(request.userid, v_account,
                                                     v_container, v_object, 'pithos')
-        public = request.backend.get_object_public(request.user_uniq, v_account,
+        public = request.backend.get_object_public(request.userid, v_account,
                                                     v_container, v_object)
     except:
         raise ItemNotFound('Object does not exist')
@@ -122,14 +122,14 @@ def public_read(request, v_public):
     if 'X-Object-Manifest' in meta:
         try:
             src_container, src_name = split_container_object_string('/' + meta['X-Object-Manifest'])
-            objects = request.backend.list_objects(request.user_uniq, v_account,
+            objects = request.backend.list_objects(request.userid, v_account,
                                 src_container, prefix=src_name, virtual=False)
         except:
             raise ItemNotFound('Object does not exist')
         
         try:
             for x in objects:
-                s, h = request.backend.get_object_hashmap(request.user_uniq,
+                s, h = request.backend.get_object_hashmap(request.userid,
                                         v_account, src_container, x[0], x[1])
                 sizes.append(s)
                 hashmaps.append(h)
@@ -137,7 +137,7 @@ def public_read(request, v_public):
             raise ItemNotFound('Object does not exist')
     else:
         try:
-            s, h = request.backend.get_object_hashmap(request.user_uniq, v_account,
+            s, h = request.backend.get_object_hashmap(request.userid, v_account,
                                                         v_container, v_object)
             sizes.append(s)
             hashmaps.append(h)

diff --git a/snf-pithos-app/pithos/api/settings.py b/snf-pithos-app/pithos/api/settings.py
index 1558bfb..392a8ae 100644 (file)
--- a/snf-pithos-app/pithos/api/settings.py
+++ b/snf-pithos-app/pithos/api/settings.py
@@ -3,16 +3,16 @@ from django.conf import settings
 
 # Set local users, or a remote host. To disable local users set them to None.
 sample_users = {
-    '0000': 'test',
-    '0001': 'verigak',
-    '0002': 'chazapis',
-    '0003': 'gtsouk',
-    '0004': 'papagian',
-    '0005': 'louridas',
-    '0006': 'chstath',
-    '0007': 'pkanavos',
-    '0008': 'mvasilak',
-    '0009': 'διογένης'
+    '0000': {'userid': '0', 'email': ['test'], 'name': 'test', 'auth_token': '0000'},
+    '0001': {'userid': '1', 'email': ['verigak'], 'name': 'verigak', 'auth_token': '0001'},
+    '0002': {'userid': '2', 'email': ['chazapis'], 'name': 'chazapis', 'auth_token': '0002'},
+    '0003': {'userid': '3', 'email': ['gtsouk'], 'name': 'gtsouk', 'auth_token': '0003'},
+    '0004': {'userid': '4', 'email': ['papagian'], 'name': 'papagian', 'auth_token': '0004'},
+    '0005': {'userid': '5', 'email': ['louridas'], 'name': 'louridas', 'auth_token': '0005'},
+    '0006': {'userid': '6', 'email': ['chstath'], 'name': 'chstath', 'auth_token': '0006'},
+    '0007': {'userid': '7', 'email': ['pkanavos'], 'name': 'pkanavos', 'auth_token': '0007'},
+    '0008': {'userid': '8', 'email': ['mvasilak'], 'name': 'mvasilak', 'auth_token': '0008'},
+    '0009': {'userid': '9', 'email': ['διογένης'], 'name': 'διογένης', 'auth_token': '0009'}
 }
 
 AUTHENTICATION_URL = getattr(settings, 'PITHOS_AUTHENTICATION_URL', 'http://127.0.0.1:8000/im/authenticate')

diff --git a/snf-pithos-app/pithos/api/util.py b/snf-pithos-app/pithos/api/util.py
index 11642a7..bc99e20 100644 (file)
--- a/snf-pithos-app/pithos/api/util.py
+++ b/snf-pithos-app/pithos/api/util.py
@@ -225,10 +225,10 @@ def update_manifest_meta(request, v_account, meta):
         bytes = 0
         try:
             src_container, src_name = split_container_object_string('/' + meta['X-Object-Manifest'])
-            objects = request.backend.list_objects(request.user_uniq, v_account,
+            objects = request.backend.list_objects(request.userid, v_account,
                                 src_container, prefix=src_name, virtual=False)
             for x in objects:
-                src_meta = request.backend.get_object_meta(request.user_uniq,
+                src_meta = request.backend.get_object_meta(request.userid,
                                         v_account, src_container, x[0], 'pithos', x[1])
                 etag += src_meta['checksum']
                 bytes += src_meta['bytes']
@@ -256,7 +256,7 @@ def update_sharing_meta(request, permissions, v_account, v_container, v_object,
     meta['X-Object-Sharing'] = '; '.join(ret)
     if '/'.join((v_account, v_container, v_object)) != perm_path:
         meta['X-Object-Shared-By'] = perm_path
-    if request.user_uniq != v_account:
+    if request.userid != v_account:
         meta['X-Object-Allowed-To'] = allowed
 
 def update_public_meta(public, meta):
@@ -324,11 +324,11 @@ def copy_or_move_object(request, src_account, src_container, src_name, dest_acco
     src_version = request.META.get('HTTP_X_SOURCE_VERSION')
     try:
         if move:
-            version_id = request.backend.move_object(request.user_uniq, src_account, src_container, src_name,
+            version_id = request.backend.move_object(request.userid, src_account, src_container, src_name,
                                                         dest_account, dest_container, dest_name,
                                                         content_type, 'pithos', meta, False, permissions)
         else:
-            version_id = request.backend.copy_object(request.user_uniq, src_account, src_container, src_name,
+            version_id = request.backend.copy_object(request.userid, src_account, src_container, src_name,
                                                         dest_account, dest_container, dest_name,
                                                         content_type, 'pithos', meta, False, permissions, src_version)
     except NotAllowedError:
@@ -341,7 +341,7 @@ def copy_or_move_object(request, src_account, src_container, src_name, dest_acco
         raise RequestEntityTooLarge('Quota exceeded')
     if public is not None:
         try:
-            request.backend.update_object_public(request.user_uniq, dest_account, dest_container, dest_name, public)
+            request.backend.update_object_public(request.userid, dest_account, dest_container, dest_name, public)
         except NotAllowedError:
             raise Forbidden('Not allowed')
         except NameError:
@@ -888,6 +888,12 @@ def api_method(http_method=None, format_allowed=False, user_required=True):
                 request.serialization = request_serialization(request, format_allowed)
                 request.backend = get_backend()
                 
+                # XXX: Testing...
+                if len(args) > 0:
+                    from pithos.api.settings import AUTHENTICATION_USERS
+                    account = [x['userid'] for x in AUTHENTICATION_USERS.values() if args[0] in x['email']][0]
+                    args = (account,) + args[1:]
+                
                 response = func(request, *args, **kwargs)
                 update_response_headers(request, response)
                 return response