IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the auto-generated CSRF_SESSION_KEY, SECRET_KEY,

Browse Source 
SECURITY_PASSWORD_SALT keys are decoded as string for python 3
compatibility.

Fixes #1871
This commit is contained in:
Ashesh Vashi 2016-10-20 13:15:50 +05:30
parent a1c0042a1e
commit d4c439d64a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/setup.py
View File

@ -350,10 +350,10 @@ CREATE TABLE keys (
PRIMARY KEY (name))
""")
sql = "INSERT INTO keys (name, value) VALUES ('CSRF_SESSION_KEY', '%s')" % base64.urlsafe_b64encode(os.urandom(32))
sql = "INSERT INTO keys (name, value) VALUES ('CSRF_SESSION_KEY', '%s')" % base64.urlsafe_b64encode(os.urandom(32)).decode()
db.engine.execute(sql)
sql = "INSERT INTO keys (name, value) VALUES ('SECRET_KEY', '%s')" % base64.urlsafe_b64encode(os.urandom(32))
sql = "INSERT INTO keys (name, value) VALUES ('SECRET_KEY', '%s')" % base64.urlsafe_b64encode(os.urandom(32)).decode()
db.engine.execute(sql)
# If SECURITY_PASSWORD_SALT is not in the config, but we're upgrading, then it must (unless the
@ -433,9 +433,9 @@ Exiting...""" % (version.value))
do_upgrade(app, user_datastore, version)
else:
# Get some defaults for the various keys
config.CSRF_SESSION_KEY = base64.urlsafe_b64encode(os.urandom(32))
config.SECRET_KEY = base64.urlsafe_b64encode(os.urandom(32))
config.SECURITY_PASSWORD_SALT = base64.urlsafe_b64encode(os.urandom(32))
config.CSRF_SESSION_KEY = base64.urlsafe_b64encode(os.urandom(32)).decode()
config.SECRET_KEY = base64.urlsafe_b64encode(os.urandom(32)).decode()
config.SECURITY_PASSWORD_SALT = base64.urlsafe_b64encode(os.urandom(32)).decode()
app.config.from_object(config)