From 2adc9663576fe29be4e066c4d637e64a98259641 Mon Sep 17 00:00:00 2001
From: Kendar <unknown@kendar.org>
Date: Fri, 28 May 2021 12:33:04 +0200
Subject: [PATCH] Working

---
 webvirtcloud/ldapbackend.py       | 24 +++++++++++++++++++-----
 webvirtcloud/settings.py.template |  6 +++---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/webvirtcloud/ldapbackend.py b/webvirtcloud/ldapbackend.py
index 5bce462..d088136 100644
--- a/webvirtcloud/ldapbackend.py
+++ b/webvirtcloud/ldapbackend.py
@@ -62,15 +62,29 @@ class LdapAuthenticationBackend(ModelBackend):
         except User.DoesNotExist:
             print("authenticate-create new user")
             user = User(username=username)
+            user.is_active = True
             user.is_staff = isStaff
             user.is_superuser = isAdmin
-            user.password = uuid.uuid4().hex
+            user.set_password(uuid.uuid4().hex)
+            user.save()
+            maxInstances = 1
+            maxCpus = 1
+            maxMemory = 128
+            maxDiskSize = 1
+            if isStaff:
+                maxMemory = 2048
+                maxDiskSize = 20
+            if isAdmin:
+                maxInstances = -1
+                maxCpus = -1
+                maxMemory = -1
+                maxDiskSize = -1
             UserAttributes.objects.create(
                  user=user,
-                 max_instances=1,
-                 max_cpus=1,
-                 max_memory=2048,
-                 max_disk_size=20,
+                 max_instances=maxInstances,
+                 max_cpus=maxCpus,
+                 max_memory=maxMemory,
+                 max_disk_size=maxDiskSize,
             )
             permission = Permission.objects.get(codename='clone_instances')
             user.user_permissions.add(permission)       
diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template
index cd7da55..57d9c49 100644
--- a/webvirtcloud/settings.py.template
+++ b/webvirtcloud/settings.py.template
@@ -220,9 +220,9 @@ USE_SSL = False
 LDAP_MASTER_DN = 'cn=admin,dc=kendar,dc=org'
 LDAP_MASTER_PW = 'secret'
 LDAP_ROOT_DN = 'dc=kendar,dc=org'
-LDAP_SEARCH_GROUP_FILTER_ADMINS = 'memberOf=dc=admins,dc=staff,dc=webvirtcloud,ou=groups,dc=kendar,dc=org'
-LDAP_SEARCH_GROUP_FILTER_STAFF = 'memberOf=dc=staff,dc=webvirtcloud,ou=groups,dc=kendar,dc=org'
-LDAP_SEARCH_GROUP_FILTER_USERS = 'memberOf=dc=webvirtcloud,ou=groups,dc=kendar,dc=org'
+LDAP_SEARCH_GROUP_FILTER_ADMINS = 'memberOf=cn=admins,cn=staff,cn=webvirtcloud,ou=groups,dc=kendar,dc=org'
+LDAP_SEARCH_GROUP_FILTER_STAFF = 'memberOf=cn=staff,cn=webvirtcloud,ou=groups,dc=kendar,dc=org'
+LDAP_SEARCH_GROUP_FILTER_USERS = 'memberOf=cn=webvirtcloud,ou=groups,dc=kendar,dc=org'
 LDAP_USER_UID_PREFIX = 'cn'
 
 #sudo sed -r "s/SECRET_KEY = ''/SECRET_KEY = '"`python3 /srv/webvirtcloud/conf/runit/secret_generator.py`"'/" -i /srv/webvirtcloud/webvirtcloud/settings.py
\ No newline at end of file