GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00
Code Issues Projects Releases Wiki Activity

conf: simplify newlogins checks & allow missing permissions blocks if an old login is also present

Browse Source
This commit is contained in:
James Lu 2017-02-24 21:07:28 -08:00
parent c03f2d772c
commit 0ebb52e64f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.py
View File

@ -75,15 +75,15 @@ def validateConf(conf, logger=None):
old_login_valid = type(conf['login'].get('password')) == type(conf['login'].get('user')) == str old_login_valid = type(conf['login'].get('password')) == type(conf['login'].get('user')) == str
newlogins = conf['login'].get('accounts', {}) newlogins = conf['login'].get('accounts', {})
new_login_valid = len(newlogins) >= 1
validate(old_login_valid or new_login_valid, "No accounts were set, aborting!") validate(old_login_valid or newlogins, "No accounts were set, aborting!")
for account, block in newlogins.items(): for account, block in newlogins.items():
validate(type(account) == str, "Bad username format %s" % account) validate(type(account) == str, "Bad username format %s" % account)
validate(type(block.get('password')) == str, "Bad password %s for account %s" % (block.get('password'), account)) validate(type(block.get('password')) == str, "Bad password %s for account %s" % (block.get('password'), account))
validate(conf['login'].get('password') != "changeme", "You have not set the login details correctly!") validate(conf['login'].get('password') != "changeme", "You have not set the login details correctly!")
if newlogins: if newlogins and not old_login_valid:
validate(conf.get('permissions'), "New-style accounts enabled but no permissions block was found. You will not be able to administrate your PyLink instance!") validate(conf.get('permissions'), "New-style accounts enabled but no permissions block was found. You will not be able to administrate your PyLink instance!")
return conf return conf