import simplejson
import re
import hmac
-import hashlib
from ganeti import errors
+try:
+ from hashlib import sha1
+except ImportError:
+ import sha as sha1
# Check whether the simplejson module supports indentation
_JSON_INDENT = 2
signed_dict = {
'msg': txt,
'salt': salt,
- 'hmac': hmac.new(key, salt + txt, hashlib.sha256).hexdigest(),
+ 'hmac': hmac.new(key, salt + txt, sha1).hexdigest(),
}
- return DumpJson(signed_dict)
+ return DumpJson(signed_dict, indent=False)
-def LoadSignedJson(txt, key, salt_verifier=None):
+def LoadSignedJson(txt, key):
"""Verify that a given message was signed with the given key, and load it.
@param txt: json-encoded hmac-signed message
@param key: shared hmac key
- @param salt_verifier: function taking a salt as input and returning boolean
@rtype: tuple of original data, string
- @return: (original data, salt)
+ @return: original data, salt
@raises errors.SignatureError: if the message signature doesn't verify
"""
except KeyError:
raise errors.SignatureError('Invalid external message')
- if salt and not salt_verifier:
- raise errors.SignatureError('Salted message is not verified')
- elif salt_verifier is not None:
- if not salt_verifier(salt):
- raise errors.SignatureError('Invalid salt')
-
- if hmac.new(key, salt + msg, hashlib.sha256).hexdigest() != hmac_sign:
+ if hmac.new(key, salt + msg, sha1).hexdigest() != hmac_sign:
raise errors.SignatureError('Invalid Signature')
- return LoadJson(msg)
-
-
-def SaltEqualTo(expected):
- """Helper salt verifier function that checks for equality.
-
- @type expected: string
- @param expected: expected salt
- @rtype: function
- @return: salt verifier that returns True if the target salt is "x"
-
- """
- return lambda salt: salt == expected
-
-
-def SaltIn(expected):
- """Helper salt verifier function that checks for equality.
-
- @type expected: collection
- @param expected: collection of possible valid salts
- @rtype: function
- @return: salt verifier that returns True if the salt is in the collection
-
- """
- return lambda salt: salt in expected
-
-
-def SaltInRange(min, max):
- """Helper salt verifier function that checks for equality.
-
- @type min: integer
- @param min: minimum salt value
- @type max: integer
- @param max: maximum salt value
- @rtype: function
- @return: salt verifier that returns True if the salt is in the min,max range
-
- """
- def _CheckSaltInRange(salt):
- try:
- i_salt = int(salt)
- except (TypeError, ValueError), err:
- return False
-
- return i_salt > min and i_salt < max
- return _CheckSaltInRange
+ return LoadJson(msg), salt
Dump = DumpJson