diff --git a/docker/src/lemur.conf.py b/docker/src/lemur.conf.py index 89448b29..69f9d985 100644 --- a/docker/src/lemur.conf.py +++ b/docker/src/lemur.conf.py @@ -11,10 +11,10 @@ debug = os.environ.get("DEBUG") == "True" def get_random_secret(length): - secret_key = ''.join(random.choice(string.ascii_uppercase) for x in range(length/4)) - secret_key = secret_key + ''.join(random.choice("~!@#$%^&*()_+") for x in range(length/4)) - secret_key = secret_key + ''.join(random.choice(string.ascii_lowercase) for x in range(length/4)) - return secret_key + ''.join(random.choice(string.digits) for x in range(length/4)) + secret_key = ''.join(random.choice(string.ascii_uppercase) for x in range(round(length/4))) + secret_key = secret_key + ''.join(random.choice("~!@#$%^&*()_+") for x in range(round(length/4))) + secret_key = secret_key + ''.join(random.choice(string.ascii_lowercase) for x in range(round(length/4))) + return secret_key + ''.join(random.choice(string.digits) for x in range(round(length/4))) SECRET_KEY = repr(os.environ.get('SECRET_KEY', get_random_secret(32).encode('utf8'))) diff --git a/lemur/tests/conf.py b/lemur/tests/conf.py index 62df5a68..f984aeba 100644 --- a/lemur/tests/conf.py +++ b/lemur/tests/conf.py @@ -10,10 +10,10 @@ _basedir = os.path.abspath(os.path.dirname(__file__)) # generate random secrets for unittest def get_random_secret(length): - secret_key = ''.join(random.choice(string.ascii_uppercase) for x in range(length/4)) - secret_key = secret_key + ''.join(random.choice("~!@#$%^&*()_+") for x in range(length/4)) - secret_key = secret_key + ''.join(random.choice(string.ascii_lowercase) for x in range(length/4)) - return secret_key + ''.join(random.choice(string.digits) for x in range(length/4)) + secret_key = ''.join(random.choice(string.ascii_uppercase) for x in range(round(length/4))) + secret_key = secret_key + ''.join(random.choice("~!@#$%^&*()_+") for x in range(round(length/4))) + secret_key = secret_key + ''.join(random.choice(string.ascii_lowercase) for x in range(round(length/4))) + return secret_key + ''.join(random.choice(string.digits) for x in range(round(length/4))) THREADS_PER_PAGE = 8