From 2282142e4f2610577b2119280eb4688ca721054c Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Tue, 12 Nov 2013 15:26:10 -0500 Subject: fix metadata overwrite during a post request During a post request, the object-server is ovewriting the existing object metadata. This fix prevents the overwrite of the system metadata while it allows for the user to add/remove user metadata Change-Id: Ic62cd064589b625ee425a9934be8766650622c13 Signed-off-by: Thiago da Silva Reviewed-on: http://review.gluster.org/6254 Reviewed-by: Luis Pabon Tested-by: Luis Pabon --- .../common/middleware/gswauth/swauth/middleware.py | 46 ++++++---------------- 1 file changed, 12 insertions(+), 34 deletions(-) (limited to 'gluster/swift/common/middleware/gswauth/swauth/middleware.py') diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py index f01182f..c7f92f9 100644 --- a/gluster/swift/common/middleware/gswauth/swauth/middleware.py +++ b/gluster/swift/common/middleware/gswauth/swauth/middleware.py @@ -40,13 +40,9 @@ from swift.common.utils import cache_from_env, get_logger, get_remote_client, \ import swift.common.wsgi -from gluster.swift.common.middleware.gswauth.swauth import swift_version from gluster.swift.common.middleware.gswauth.swauth import authtypes -MEMCACHE_TIME = swift_version.newer_than('1.7.7-dev') - - class Swauth(object): """ Scalable authentication and authorization system that uses Swift as its @@ -349,14 +345,9 @@ class Swauth(object): expires_from_now = float(resp.getheader('x-auth-ttl')) groups = resp.getheader('x-auth-groups') if memcache_client: - if MEMCACHE_TIME: - memcache_client.set( - memcache_key, (time() + expires_from_now, groups), - time=expires_from_now) - else: - memcache_client.set( - memcache_key, (time() + expires_from_now, groups), - timeout=expires_from_now) + memcache_client.set( + memcache_key, (time() + expires_from_now, groups), + timeout=expires_from_now) else: path = quote('/v1/%s/.token_%s/%s' % (self.auth_account, token[-1], token)) @@ -375,16 +366,10 @@ class Swauth(object): groups.append(detail['account_id']) groups = ','.join(groups) if memcache_client: - if MEMCACHE_TIME: - memcache_client.set( - memcache_key, - (detail['expires'], groups), - time=float(detail['expires'] - time())) - else: - memcache_client.set( - memcache_key, - (detail['expires'], groups), - timeout=float(detail['expires'] - time())) + memcache_client.set( + memcache_key, + (detail['expires'], groups), + timeout=float(detail['expires'] - time())) return groups def authorize(self, req): @@ -1369,18 +1354,11 @@ class Swauth(object): if not memcache_client: raise Exception( 'No memcache set up; required for Swauth middleware') - if MEMCACHE_TIME: - memcache_client.set( - memcache_key, - (self.itoken_expires, - '.auth,.reseller_admin,%s.auth' % self.reseller_prefix), - time=self.token_life) - else: - memcache_client.set( - memcache_key, - (self.itoken_expires, - '.auth,.reseller_admin,%s.auth' % self.reseller_prefix), - timeout=self.token_life) + memcache_client.set( + memcache_key, + (self.itoken_expires, + '.auth,.reseller_admin,%s.auth' % self.reseller_prefix), + timeout=self.token_life) return self.itoken def get_admin_detail(self, req): -- cgit