Revision 93127325 snf-pithos-app/pithos/api/util.py
| b/snf-pithos-app/pithos/api/util.py | ||
|---|---|---|
| 225 | 225 |
bytes = 0 |
| 226 | 226 |
try: |
| 227 | 227 |
src_container, src_name = split_container_object_string('/' + meta['X-Object-Manifest'])
|
| 228 |
objects = request.backend.list_objects(request.user_uniq, v_account,
|
|
| 228 |
objects = request.backend.list_objects(request.userid, v_account,
|
|
| 229 | 229 |
src_container, prefix=src_name, virtual=False) |
| 230 | 230 |
for x in objects: |
| 231 |
src_meta = request.backend.get_object_meta(request.user_uniq,
|
|
| 231 |
src_meta = request.backend.get_object_meta(request.userid,
|
|
| 232 | 232 |
v_account, src_container, x[0], 'pithos', x[1]) |
| 233 | 233 |
etag += src_meta['checksum'] |
| 234 | 234 |
bytes += src_meta['bytes'] |
| ... | ... | |
| 256 | 256 |
meta['X-Object-Sharing'] = '; '.join(ret) |
| 257 | 257 |
if '/'.join((v_account, v_container, v_object)) != perm_path: |
| 258 | 258 |
meta['X-Object-Shared-By'] = perm_path |
| 259 |
if request.user_uniq != v_account:
|
|
| 259 |
if request.userid != v_account:
|
|
| 260 | 260 |
meta['X-Object-Allowed-To'] = allowed |
| 261 | 261 |
|
| 262 | 262 |
def update_public_meta(public, meta): |
| ... | ... | |
| 324 | 324 |
src_version = request.META.get('HTTP_X_SOURCE_VERSION')
|
| 325 | 325 |
try: |
| 326 | 326 |
if move: |
| 327 |
version_id = request.backend.move_object(request.user_uniq, src_account, src_container, src_name,
|
|
| 327 |
version_id = request.backend.move_object(request.userid, src_account, src_container, src_name,
|
|
| 328 | 328 |
dest_account, dest_container, dest_name, |
| 329 | 329 |
content_type, 'pithos', meta, False, permissions) |
| 330 | 330 |
else: |
| 331 |
version_id = request.backend.copy_object(request.user_uniq, src_account, src_container, src_name,
|
|
| 331 |
version_id = request.backend.copy_object(request.userid, src_account, src_container, src_name,
|
|
| 332 | 332 |
dest_account, dest_container, dest_name, |
| 333 | 333 |
content_type, 'pithos', meta, False, permissions, src_version) |
| 334 | 334 |
except NotAllowedError: |
| ... | ... | |
| 341 | 341 |
raise RequestEntityTooLarge('Quota exceeded')
|
| 342 | 342 |
if public is not None: |
| 343 | 343 |
try: |
| 344 |
request.backend.update_object_public(request.user_uniq, dest_account, dest_container, dest_name, public)
|
|
| 344 |
request.backend.update_object_public(request.userid, dest_account, dest_container, dest_name, public)
|
|
| 345 | 345 |
except NotAllowedError: |
| 346 | 346 |
raise Forbidden('Not allowed')
|
| 347 | 347 |
except NameError: |
| ... | ... | |
| 888 | 888 |
request.serialization = request_serialization(request, format_allowed) |
| 889 | 889 |
request.backend = get_backend() |
| 890 | 890 |
|
| 891 |
# XXX: Testing... |
|
| 892 |
if len(args) > 0: |
|
| 893 |
from pithos.api.settings import AUTHENTICATION_USERS |
|
| 894 |
account = [x['userid'] for x in AUTHENTICATION_USERS.values() if args[0] in x['email']][0] |
|
| 895 |
args = (account,) + args[1:] |
|
| 896 |
|
|
| 891 | 897 |
response = func(request, *args, **kwargs) |
| 892 | 898 |
update_response_headers(request, response) |
| 893 | 899 |
return response |
Also available in: Unified diff