summaryrefslogtreecommitdiffstats
path: root/gluster/swift/common/middleware/gswauth/swauth/middleware.py
diff options
context:
space:
mode:
authorThiago da Silva <thiago@redhat.com>2013-11-12 15:26:10 -0500
committerLuis Pabon <lpabon@redhat.com>2013-11-20 13:38:28 -0800
commit47f401b2ef0023f57b1fce83b10f9c6a3aa5c757 (patch)
tree374a6cb7b1e84c43c24074aeb689907a7dcc2c73 /gluster/swift/common/middleware/gswauth/swauth/middleware.py
parentd65cee2e3bd2fb0fbf49f6a4d55a1480c915278f (diff)
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 <thiago@redhat.com> Reviewed-on: http://review.gluster.org/6254 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com> Signed-off-by: Thiago da Silva <thiago@redhat.com> Reviewed-on: http://review.gluster.org/6315
Diffstat (limited to 'gluster/swift/common/middleware/gswauth/swauth/middleware.py')
-rw-r--r--gluster/swift/common/middleware/gswauth/swauth/middleware.py46
1 files changed, 12 insertions, 34 deletions
diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
index 6388aa2..996228d 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):