From dc2afe0e2a2e1c216c28e3f5340fdbfa810fa5b1 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Tue, 22 Mar 2016 00:41:31 +0100
Subject: [PATCH] Fix user creation.

---
 config.cfg.example |  8 +++++---
 index.py           | 15 +++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/config.cfg.example b/config.cfg.example
index 56a49a8..b31dc60 100644
--- a/config.cfg.example
+++ b/config.cfg.example
@@ -5,11 +5,11 @@ SESSION_TIMEOUT = 3600
 LDAP_URI = "ldaps://ldap.example.com"
 LDAP_BASE = "dc=example,dc=com"
 
-USER_DN = "cn={user},ou=people,dc=example,dc=com"
-
 ADMINS = [ "cn=admin,ou=people,dc=example,dc=com" ]
 
-CREATE_ATTRS = {
+USER_DN = "cn={user},ou=people,dc=example,dc=com"
+
+USER_ATTRS = {
 	'objectClass' : ['top', 'inetOrgPerson', 'organizationalPerson', 'person', 'posixAccount'],
 	'cn' : '{user}',
 	'givenName' : '{gn}',
@@ -21,5 +21,7 @@ CREATE_ATTRS = {
 	'gidNumber' : '1000'
 }
 
+GROUP_DN = 'cn=user,ou=Groups,dc=binary-kitchen,dc=de'
+
 REDIS_HOST = "127.0.0.1"
 REDIS_PSWD = "foobared"
diff --git a/index.py b/index.py
index c0d84d8..6a68f6c 100755
--- a/index.py
+++ b/index.py
@@ -85,16 +85,23 @@ def create():
 				'gn' : form.gn.data,
 				'sn' : form.sn.data,
 			}
-			dn = app.config.get('USER_DN').format(**d)
+
+			# add user
+			user_dn = app.config.get('USER_DN').format(**d)
 			attrs = {}
-			for k,v in app.config.get('CREATE_ATTRS').iteritems():
+			for k,v in app.config.get('USER_ATTRS').iteritems():
 				if type(v) == str:
 					attrs[k] = v.format(**d)
 				elif isinstance(v, list):
 					attrs[k] = []
 					for e in v:
 						attrs[k].append(e.format(**d))
-			l.add_s(dn, ldap.modlist.addModlist(attrs))
+			l.add_s(user_dn, ldap.modlist.addModlist(attrs))
+
+			# add user to group
+			group_dn = app.config.get('GROUP_DN').format(**d)
+			l.modify_s(group_dn, [(ldap.MOD_ADD, 'memberUid', str(form.user.data))])
+
 		except ldap.LDAPError as e:
 			l.unbind_s()
 			return render_template('error.html', message=e.message['desc'] + ": " + e.message['info'], nav=buildNav())
@@ -138,7 +145,7 @@ def login():
 	form = LoginForm()
 
 	if form.validate_on_submit():
-		user = "" 
+		user = ""
 		if form.user.data.endswith(app.config.get('LDAP_BASE','')):
 			user = form.user.data
 		else: