Refactor UserIdHasher hash_data method

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

src/satosa/base.py

@@ -151,7 +151,7 @@ def _auth_resp_finish(self, context, internal_response):
             # hash all attribute values individually
             if attribute in internal_attributes:
                 hashed_values = [
-                    UserIdHasher.hash_data(self.config["USER_ID_HASH_SALT"], v)
+                    util.hash_data(self.config["USER_ID_HASH_SALT"], v)
                     for v in internal_attributes[attribute]
                 ]
                 internal_attributes[attribute] = hashed_values

src/satosa/internal_data.py

@@ -3,9 +3,10 @@
 for converting from SAML/OAuth/OpenID connect to the internal representation.
 """
 import datetime
-import hashlib
 from enum import Enum
 
+import satosa.util as util
+
 
 class UserIdHashType(Enum):
     """
@@ -57,9 +58,7 @@ def hash_data(salt, value):
         :param value: value to hash together with the salt
         :return: hash value (SHA512)
         """
-        data = '{value}{salt}'.format(value=value, salt=salt).encode()
-        hash = hashlib.sha512(data).hexdigest()
-        return hash
+        return util.hash_data(salt, value)
 
     @staticmethod
     def hash_type(state):

src/satosa/util.py

@@ -1,6 +1,7 @@
 """
 Python package file for util functions.
 """
+import hashlib
 import logging
 import random
 import string
@@ -11,6 +12,26 @@
 logger = logging.getLogger(__name__)
 
 
+def hash_data(salt, value, hash_alg=None):
+    """
+    Hashes a value together with a salt with the given hash algorithm.
+
+    :type salt: str
+    :type hash_alg: str
+    :type value: str
+    :param salt: hash salt
+    :param hash_alg: the hash algorithm to use (default: SHA512)
+    :param value: value to hash together with the salt
+    :return: hashed value
+    """
+    hash_alg = hash_alg or 'sha512'
+    hasher = hashlib.new(hash_alg)
+    hasher.update(salt.encode('utf-8'))
+    hasher.update(value.encode('utf-8'))
+    value_hashed = hasher.hexdigest()
+    return value_hashed
+
+
 def check_set_dict_defaults(dic, spec):
     for path, value in spec.items():
         keys = path.split('.')
@@ -38,21 +59,25 @@ def check_set_dict_defaults(dic, spec):
                     {})
     return dic
 
+
 def dict_set_nested(dic, keys, value):
     for key in keys[:-1]:
         dic = dic.setdefault(key, {})
     dic[keys[-1]] = value
 
+
 def dict_get_nested(dic, keys):
     for key in keys[:-1]:
         dic = dic.setdefault(key, {})
     return dic[keys[-1]]
 
+
 def get_dict_defaults(d, *keys):
     for key in keys:
-       d = d.get(key, d.get("", d.get("default", {})))
+        d = d.get(key, d.get("", d.get("default", {})))
     return d
 
+
 def rndstr(size=16, alphabet=""):
     """
     Returns a string of random ascii characters or digits