summaryrefslogtreecommitdiffstats
path: root/gluster/swift/common
diff options
context:
space:
mode:
authorPrashanth Pai <ppai@redhat.com>2016-03-09 14:20:28 +0530
committerThiago da Silva <thiago@redhat.com>2016-03-18 12:43:08 -0700
commit539d20e3b13096cfa9107fc2b619943c494c4ab3 (patch)
tree9bc71575e0867cc4a60fbd2146bd777f708dc1b5 /gluster/swift/common
parentd57adf802d7c3887f14abc65a582a69dfa25f6f1 (diff)
Fix changing of auth_type in existing deployments
This changes does two things: * Adds Sha512 as a supported auth_type. * Fixes breakage when auth_type is changed in existing deployments. If an existing gswauth deployment changes `auth_type` in conf file to a different one (for example: sha1 to sha512), all attempts to authorize existing/old users will fail because of change in encoder type. With this change, the credentials match is done using an encoder with which the password was initially encoded. This allows gswauth deployments to change auth_type and old users will still be able to authorize. A note on auth_type_salt: There's still a distinction between how salt is managed in gswauth and swauth: swauth will use a random salt if a salt is not set in conf file where as gswauth will default to 'gswauthsalt' if a salt is not set in conf file. This distinction is to ensure backward compatibility. This change is derived from following upstream changes in swauth repo: e14a7b3df86969d478090b314d9660b6d835afa7 https://review.openstack.org/#/c/285195/ https://review.openstack.org/#/c/285292/ Change-Id: I9a43adc4964d8e9f9f1faf73063a6dc1cd8ff354 Signed-off-by: Prashanth Pai <ppai@redhat.com> Reviewed-on: http://review.gluster.org/13654 Reviewed-by: Thiago da Silva <thiago@redhat.com> Tested-by: Thiago da Silva <thiago@redhat.com>
Diffstat (limited to 'gluster/swift/common')
-rw-r--r--gluster/swift/common/middleware/gswauth/swauth/authtypes.py77
-rw-r--r--gluster/swift/common/middleware/gswauth/swauth/middleware.py13
2 files changed, 83 insertions, 7 deletions
diff --git a/gluster/swift/common/middleware/gswauth/swauth/authtypes.py b/gluster/swift/common/middleware/gswauth/swauth/authtypes.py
index 90aad72..fbf532d 100644
--- a/gluster/swift/common/middleware/gswauth/swauth/authtypes.py
+++ b/gluster/swift/common/middleware/gswauth/swauth/authtypes.py
@@ -35,6 +35,7 @@ value or to a default value.
"""
import hashlib
+import os
#: Maximum length any valid token should ever be.
@@ -80,6 +81,20 @@ class Sha1(object):
must be capitalized. encode and match methods must be provided and are
the only ones that will be used by swauth.
"""
+
+ def encode_w_salt(self, salt, key):
+ """
+ Encodes a user key with salt into a particular format. The result of
+ this method will be used internally.
+
+ :param salt: Salt for hashing
+ :param key: User's secret key
+ :returns: A string representing user credentials
+ """
+ enc_key = '%s%s' % (salt, key)
+ enc_val = hashlib.sha1(enc_key).hexdigest()
+ return "sha1:%s$%s" % (salt, enc_val)
+
def encode(self, key):
"""
Encodes a user key into a particular format. The result of this method
@@ -88,9 +103,8 @@ class Sha1(object):
:param key: User's secret key
:returns: A string representing user credentials
"""
- enc_key = '%s%s' % (self.salt, key)
- enc_val = hashlib.sha1(enc_key).hexdigest()
- return "sha1:%s$%s" % (self.salt, enc_val)
+ salt = self.salt or os.urandom(32).encode('base64').rstrip()
+ return self.encode_w_salt(salt, key)
def match(self, key, creds):
"""
@@ -100,4 +114,59 @@ class Sha1(object):
:param creds: User's stored credentials
:returns: True if the supplied key is valid, False otherwise
"""
- return self.encode(key) == creds
+
+ type, rest = creds.split(':')
+ salt, enc = rest.split('$')
+
+ return self.encode_w_salt(salt, key) == creds
+
+
+class Sha512(object):
+ """
+ Provides a particular auth type for encoding format for encoding and
+ matching user keys.
+
+ This class must be all lowercase except for the first character, which
+ must be capitalized. encode and match methods must be provided and are
+ the only ones that will be used by swauth.
+ """
+
+ def encode_w_salt(self, salt, key):
+ """
+ Encodes a user key with salt into a particular format. The result of
+ this method will be used internal.
+
+ :param salt: Salt for hashing
+ :param key: User's secret key
+ :returns: A string representing user credentials
+ """
+ enc_key = '%s%s' % (salt, key)
+ enc_val = hashlib.sha512(enc_key).hexdigest()
+ return "sha512:%s$%s" % (salt, enc_val)
+
+ def encode(self, key):
+ """
+ Encodes a user key into a particular format. The result of this method
+ will be used by swauth for storing user credentials.
+
+ If salt is not manually set in conf file, a random salt will be
+ generated and used.
+
+ :param key: User's secret key
+ :returns: A string representing user credentials
+ """
+ salt = self.salt or os.urandom(32).encode('base64').rstrip()
+ return self.encode_w_salt(salt, key)
+
+ def match(self, key, creds):
+ """Checks whether the user-provided key matches the user's credentials
+
+ :param key: User-supplied key
+ :param creds: User's stored credentials
+ :returns: True if the supplied key is valid, False otherwise
+ """
+
+ type, rest = creds.split(':')
+ salt, enc = rest.split('$')
+
+ return self.encode_w_salt(salt, key) == creds
diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
index e181ece..745c6f1 100644
--- a/gluster/swift/common/middleware/gswauth/swauth/middleware.py
+++ b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
@@ -1475,14 +1475,21 @@ class Swauth(object):
def credentials_match(self, user_detail, key):
"""
Returns True if the key is valid for the user_detail.
- It will use self.auth_encoder to check for a key match.
+ It will use auth_encoder type the password was encoded with,
+ to check for a key match.
:param user_detail: The dict for the user.
:param key: The key to validate for the user.
:returns: True if the key is valid for the user, False if not.
"""
- return user_detail and self.auth_encoder().match(
- key, user_detail.get('auth'))
+ if user_detail:
+ creds = user_detail.get('auth')
+ auth_type = creds.split(':')[0]
+ auth_encoder = getattr(authtypes, auth_type.title(), None)
+ if auth_encoder is None:
+ self.logger.error('Invalid auth_type %s' % auth_type)
+ return False
+ return user_detail and auth_encoder().match(key, creds)
def is_user_changing_own_key(self, req, user):
"""