luser/models.py

@@ -13,33 +13,12 @@ class LUSER():
     '''
 
 
-    def findlastuid(self):
+    def expandbase(self):
-        '''
-            Return the largest uidNumber attribute of all users in base
-        '''
-        self.ldapconnection.search(search_base=self.base,search_filter=f'(objectClass=inetOrgPerson)', attributes=['uidNumber'])
-
-        alluids = self.ldapconnection.response
-
-        max = 0
-
-        for i in alluids:
-            i_uid = i['attributes']['uidNumber']
-            if i_uid > max:
-                max = i_uid
-
-        return max
-
-    def expandbase(self, basealt = ''):
         '''
             Extract orgnaization, name of dc object and full domain part with all dc values from base
-            basealt := string base in LDAP system where users are made, if not set the function uses base specified on creation of LUSER instance (self.base)
         '''
         # Split base string with commas to find values of organization and dc
-        if basealt == '':
         baselist = self.base.split(",")
-        else:
-            baselist = self.basealt.split(",")
         
         organization = ''
         dc = ''
@@ -70,32 +49,22 @@ class LUSER():
  
         return organization, dc, dcfull, domain
 
-    def __init__(self, ldap_host, admin_user, admin_pass, base, basealt='', autoconnect=True, lastUID = 1000):
+    def __init__(self, ldap_host, admin_user, admin_pass, base, basealt='', autoconnect=True):
         self.ldap_host = ldap_host
         self.admin_user = admin_user
         self.admin_pass = admin_pass
         self.base = base
-        self.basealt = basealt
         self.organization, self.dc, self.dcfull, self.domain = self.expandbase()
-        self.organizationalt, self.dcalt, self.dcfullalt, self.domainalt = self.expandbase(self.basealt)
+        self.basealt = basealt
         self.alt = True
         self.autoconnect = autoconnect
         ldapserver = Server(ldap_host, use_ssl=True)
-        lastuidfound = 0
         if self.autoconnect:
             self.ldapconnection = Connection(ldapserver, admin_user, admin_pass, auto_bind=True)
+
         # uid and gid of most recently registered users
-            lastuidfound = self.findlastuid()
+        self.lastuid = 1337
-        else:
+        self.lastgid = 1337
-            self.ldapconnection = Connection(ldapserver, admin_user, admin_pass, auto_bind=False)
-
-        if lastuidfound == 0:
-            self.lastuid = lastUID
-            self.lastgid = lastUID
-        else:
-            self.lastuid = lastuidfound 
-            self.lastgid = lastuidfound  
-
 
         # Set alt boolean to false if basealt not set
         if basealt == '':
@@ -113,14 +82,9 @@ class LUSER():
 
         rcode2 = self.ldapconnection.add(self.base, ['top', 'organizationalUnit'], {'ou' : self.organization})
 
-        # Add dcobject and organizational units as above for base alt
+        # Return True only if all return values are true
-        rcode3 = True
-        rcode4 = True
-        if self.alt:
-            rcode3 = self.ldapconnection.add(f'dc={self.dcfull}', ['dcObject', 'organization'], {'o' : self.dc, 'dc' : self.dc})
-            rcode4 = self.ldapconnection.add(self.base, ['top', 'organizationalUnit'], {'ou' : self.organization})
 
-        return rcode1 and rcode2 and rcode3 and rcode4
+        return rcode1 and rcode2
 
     def lastpwchangenow(self):
         '''
@@ -142,6 +106,7 @@ class LUSER():
         self.lastuid += 1
         self.lastgid += 1
 
+
         # Add user to base 
         id = f"uid={user}"
 
@@ -151,7 +116,7 @@ class LUSER():
         # Attributes for a user entry
         attributes = {'cn' : user, 'sn' : user, 'givenName' : user, 'uid' : user, 'uidNumber' : self.lastuid, 'gidNumber' : self.lastgid, 'homeDirectory' : f'/home/{user}', 'loginShell' : '/usr/bin/git-shell', 'gecos' : 'SystemUser', 'shadowLastChange' : self.lastpwchangenow(), 'shadowMax' : '45', 'userPassword' : password, 'mail' : f'{user}@{self.domain}' }
 
-        attributesalt = {'cn' : user, 'sn' : user, 'givenName' : user, 'uid' : user, 'uidNumber' : self.lastuid, 'gidNumber' : self.lastgid, 'homeDirectory' : f'/home/{user}', 'loginShell' : '/usr//bin/git-shell', 'gecos' : 'SystemUser', 'shadowLastChange' : self.lastpwchangenow(), 'shadowMax' : '45', 'userPassword' : althash, 'mail' : f'{user}@{self.domainalt}'}
+        attributesalt = {'cn' : user, 'sn' : user, 'givenName' : user, 'uid' : user, 'uidNumber' : self.lastuid, 'gidNumber' : self.lastgid, 'homeDirectory' : f'/home/{user}', 'loginShell' : '/usr//bin/git-shell', 'gecos' : 'SystemUser', 'shadowLastChange' : self.lastpwchangenow(), 'shadowMax' : '45', 'userPassword' : althash, 'mail' : f'{user}@{self.domain}'}
 
         # Return boolean value of new user entry
         rcode1 = self.ldapconnection.add(f'{id},{self.base}', objectClass, attributes)