diff options
Diffstat (limited to 'mediagoblin/tools/crypto.py')
| -rw-r--r-- | mediagoblin/tools/crypto.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/tools/crypto.py b/mediagoblin/tools/crypto.py index b219a484..1107e200 100644 --- a/mediagoblin/tools/crypto.py +++ b/mediagoblin/tools/crypto.py @@ -36,7 +36,7 @@ try: except AttributeError: getrandbits = random.getrandbits - +# TODO: This should be attached to the MediaGoblinApp __itsda_secret = None @@ -51,7 +51,7 @@ def load_key(filename): def create_key(key_dir, key_filepath): global __itsda_secret - old_umask = os.umask(077) + old_umask = os.umask(0o77) key_file = None try: if not os.path.isdir(key_dir): @@ -60,7 +60,7 @@ def create_key(key_dir, key_filepath): key = str(getrandbits(192)) key_file = tempfile.NamedTemporaryFile(dir=key_dir, suffix='.bin', delete=False) - key_file.write(key) + key_file.write(key.encode('ascii')) key_file.flush() os.rename(key_file.name, key_filepath) key_file.close() @@ -73,13 +73,13 @@ def create_key(key_dir, key_filepath): _log.info("Saved new key for It's Dangerous") -def setup_crypto(): +def setup_crypto(app_config): global __itsda_secret - key_dir = mg_globals.app_config["crypto_path"] + key_dir = app_config["crypto_path"] key_filepath = os.path.join(key_dir, 'itsdangeroussecret.bin') try: load_key(key_filepath) - except IOError, error: + except IOError as error: if error.errno != errno.ENOENT: raise create_key(key_dir, key_filepath) |