moepman/bk-dss
1
0
Fork 1
mirror of https://github.com/moepman/bk-dss synced 2024-12-22 19:34:27 +01:00
Code Releases Activity

fix byte string and error handling

Browse Source
This commit is contained in:
Markus 2019-02-11 16:16:40 +01:00
parent f88da30fe6
commit 41b8689033
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dss.py
View File

@ -106,13 +106,13 @@ def create():
# add user # add user
user_dn = app.config.get('USER_DN').format(**d) user_dn = app.config.get('USER_DN').format(**d)
attrs = {} attrs = {}
for k, v in app.config.get('USER_ATTRS').iteritems(): for k, v in app.config.get('USER_ATTRS').items():
if isinstance(v, str): if isinstance(v, str):
attrs[k] = v.format(**d) attrs[k] = v.format(**d).encode()
elif isinstance(v, list): elif isinstance(v, list):
attrs[k] = [] attrs[k] = []
for e in v: for e in v:
attrs[k].append(e.format(**d)) attrs[k].append(e.format(**d).encode())
l.add_s(user_dn, ldap.modlist.addModlist(attrs)) l.add_s(user_dn, ldap.modlist.addModlist(attrs))
# add user to group # add user to group
@ -122,10 +122,10 @@ def create():
except ldap.LDAPError as e: except ldap.LDAPError as e:
l.unbind_s() l.unbind_s()
message = "LDAP Error" message = "LDAP Error"
if 'desc' in e.message: if 'desc' in e.args[0]:
message = message + " " + e.message['desc'] message = message + " " + e.args[0]['desc']
if 'info' in e.message: if 'info' in e.args[0]:
message = message + ": " + e.message['info'] message = message + ": " + e.args[0]['info']
return render_template('error.html', message=message, nav=build_nav()) return render_template('error.html', message=message, nav=build_nav())
else: else:
l.unbind_s() l.unbind_s()
@ -149,7 +149,7 @@ def edit():
l.simple_bind_s(creds['user'], creds['pswd']) l.simple_bind_s(creds['user'], creds['pswd'])
l.passwd_s(creds['user'], creds['pswd'], npwd) l.passwd_s(creds['user'], creds['pswd'], npwd)
except ldap.INVALID_CREDENTIALS as e: except ldap.INVALID_CREDENTIALS as e:
form.user.errors.append(e.message['desc']) form.user.errors.append('Invalid credentials')
l.unbind_s() l.unbind_s()
return render_template('edit.html', form=form, nav=build_nav()) return render_template('edit.html', form=form, nav=build_nav())
else: else:
@ -187,7 +187,7 @@ def login():
try: try:
l.simple_bind_s(user, pswd) l.simple_bind_s(user, pswd)
except ldap.INVALID_CREDENTIALS: except ldap.INVALID_CREDENTIALS:
form.pswd.errors.append('Invalid Credentials') form.pswd.errors.append('Invalid credentials')
l.unbind_s() l.unbind_s()
return render_template('login.html', form=form, nav=build_nav()) return render_template('login.html', form=form, nav=build_nav())
l.unbind_s() l.unbind_s()