Commit be7f82cb authored by Julian Rother's avatar Julian Rother
Browse files

Merge branch 'LoginName' into 'master'

Handle unwanted symbols in login username

See merge request !38
parents 35557684 7345d8ed
......@@ -7,7 +7,8 @@ if 'LDAP_HOST' in config:
import ldap3
def ldapauth(user, password): # pylint: disable=function-redefined
user = LDAP_USERRE.sub(r'', user.lower())
if LDAP_USERRE.search(user):
return {}, []
try:
server = ldap3.Server(config['LDAP_HOST'], port=config['LDAP_PORT'], use_ssl=True)
conn = ldap3.Connection(server, 'fsmpi\\%s'%user, password, auto_bind=True, check_names=False)
......@@ -26,7 +27,8 @@ else:
}
def ldapauth(user, password): # pylint: disable=function-redefined
user = LDAP_USERRE.sub(r'', user.lower())
if LDAP_USERRE.search(user):
return {}, []
if config.get('DEBUG') and user in NOTLDAP and password == NOTLDAP[user][0]:
return NOTLDAP[user][2], NOTLDAP[user][1]
return {}, []
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment