First successful search of users.

diff --git a/etc/mk-home.ini.default b/etc/mk-home.ini.default
index e87570aa6509fbf63ca03e5a0540f82d5b106865..23d9e054c0b6390e20b2c3a5be20c0a79c9fbb31 100644 (file)
--- a/etc/mk-home.ini.default
+++ b/etc/mk-home.ini.default
@@ -11,6 +11,6 @@ bind_dn = cn=admin
 
 [mk-home]
 initial_uid = 999999999
-chroot_homedir = '/mnt/nfs/home'
+chroot_homedir = '/mnt/nfs'
 
 # vim: filetype=dosini

diff --git a/pp_lib/ldap_app.py b/pp_lib/ldap_app.py
index 22d2df2905db25db5071e2b4ed5272b2f298eac6..4f96e9b7e1a25a8a40072d22b237613320a5ec50 100644 (file)
--- a/pp_lib/ldap_app.py
+++ b/pp_lib/ldap_app.py
@@ -23,6 +23,12 @@ import six
 
 import ldap3
 
+# ldap3 classes and objects
+from ldap3 import Server, ServerPool, Connection, Reader
+# ldap3 constants
+from ldap3 import IP_V4_PREFERRED, ROUND_ROBIN, AUTO_BIND_NONE, ALL_ATTRIBUTES
+from ldap3 import SUBTREE
+
 from ldap3.core.exceptions import LDAPPasswordIsMandatoryError
 
 # Own modules
@@ -36,7 +42,7 @@ from .merge import merge_structure
 
 from .cfg_app import PpCfgAppError, PpConfigApplication
 
-__version__ = '0.3.4'
+__version__ = '0.4.1'
 LOG = logging.getLogger(__name__)
 
 
@@ -188,13 +194,13 @@ class PpLdapApplication(PpConfigApplication):
 
         # ----------------------
         def _get_ldap_server(host):
-            return ldap3.Server(
+            return Server(
                 host, port=self.ldap_port, use_ssl=self.ldap_use_ssl,
-                mode=ldap3.IP_V4_PREFERRED, connect_timeout=self.ldap_timeout)
+                mode=IP_V4_PREFERRED, connect_timeout=self.ldap_timeout)
 
         # Init LDAP Server objects
         if len(self.ldap_hosts) > 1:
-            self.ldap_server = ldap3.ServerPool(None, ldap3.ROUND_ROBIN)
+            self.ldap_server = ServerPool(None, ROUND_ROBIN)
             for h in self.ldap_hosts:
                 server = _get_ldap_server(h)
                 self.ldap_server.add(server)
@@ -205,9 +211,9 @@ class PpLdapApplication(PpConfigApplication):
             raise PpLdapAppError(msg)
 
         # Init LDAP connection object
-        self.ldap_connection = ldap3.Connection(
+        self.ldap_connection = Connection(
             self.ldap_server, user=self.ldap_bind_dn, password=self.ldap_bind_pw,
-            auto_bind=ldap3.AUTO_BIND_NONE, lazy=True, auto_range=True
+            auto_bind=AUTO_BIND_NONE, lazy=True, auto_range=True
         )
 
     # -------------------------------------------------------------------------
@@ -240,9 +246,7 @@ class PpLdapApplication(PpConfigApplication):
         LOG.debug("Executing nothing ...")
 
     # -------------------------------------------------------------------------
-    def ldap_search(
-        self, query_filter, dn=None, attributes=ldap3.ALL_ATTRIBUTES,
-            scope=ldap3.SUBTREE):
+    def ldap_search(self, query_filter, dn=None, attributes=ALL_ATTRIBUTES, scope=SUBTREE):
 
         if self.verbose > 1:
             LOG.debug("Query string: {q!r}, attributes: {a}".format(
@@ -251,6 +255,20 @@ class PpLdapApplication(PpConfigApplication):
         if dn is None:
             dn = self.ldap_base_dn
 
+        cursor = Reader(
+            self.ldap_connection,
+            query=query_filter, base=dn, attributes=attributes
+        )
+
+        try:
+            cursor.search()
+        except LDAPPasswordIsMandatoryError as e:
+            msg = "Please configure [LDAP]/bind_pw in configuration - " + str(e)
+            LOG.error(msg)
+            return []
+
+        return cursor.entries
+
         try:
             self.ldap_connection.search(
                 dn, query_filter, search_scope=scope, attributes=attributes)
@@ -261,6 +279,22 @@ class PpLdapApplication(PpConfigApplication):
         entries = self.ldap_connection.entries
         return entries
 
+    # -------------------------------------------------------------------------
+    def ldap_search_subtree(self, obj_def, query=None, base=None):
+
+        if base is None:
+            base = self.ldap_base_dn
+
+        cursor = Reader(
+            self.ldap_connection,
+            object_def=obj_def, query=query, base=base)
+
+        if self.verbose > 1:
+            LOG.debug("LDAP-Reader:\n{}".format(cursor))
+
+        cursor.search()
+        return cursor.entries
+
     # -------------------------------------------------------------------------
     def post_run(self):
         """

diff --git a/pp_lib/mk_home_app.py b/pp_lib/mk_home_app.py
index f24a6cf901b547a8680f65ef443cab34cc3ea843..a684f3cf788866dba3032dced3c422f0cae47c66 100644 (file)
--- a/pp_lib/mk_home_app.py
+++ b/pp_lib/mk_home_app.py
@@ -23,6 +23,10 @@ import six
 
 import ldap3
 
+from ldap3 import ObjectDef, AttrDef
+
+from ldap3.core.exceptions import LDAPKeyError
+
 # Own modules
 from .global_version import __version__ as __global_version__
 
@@ -34,7 +38,7 @@ from .merge import merge_structure
 
 from .ldap_app import PpLdapAppError, PpLdapApplication
 
-__version__ = '0.1.2'
+__version__ = '0.3.1'
 LOG = logging.getLogger(__name__)
 
 
@@ -51,7 +55,7 @@ class PpMkHomeApp(PpLdapApplication):
     """
 
     default_initial_uid = 999999999
-    default_chroot_homedir = os.sep + os.path.join('mnt', 'nfs', 'home')
+    default_chroot_homedir = os.sep + os.path.join('mnt', 'nfs')
 
     # -------------------------------------------------------------------------
     def __init__(self, appname=None, version=__version__):
@@ -59,6 +63,7 @@ class PpMkHomeApp(PpLdapApplication):
         self.initial_uid = self.default_initial_uid
         self.chroot_homedir = self.default_chroot_homedir
         self.simulate = False
+        self.user_entries = []
 
         description = textwrap.dedent('''\
             Home Directory and UIDNumber generation - this script will search for
@@ -176,30 +181,61 @@ class PpMkHomeApp(PpLdapApplication):
             LOG.error(msg)
             self.exit(1)
 
+        if self.simulate:
+            LOG.warn("Simulation mode - nothing is really done.")
+
     # -------------------------------------------------------------------------
     def _run(self):
 
-        LOG.debug("Executing something ...")
+        self.get_all_user_entries()
+        self.check_numeric_uids()
+        self.check_home_dirs()
 
-        query_filter = (
-            '(&'
-            '(objectclass=posixAccount)'
-            '(objectclass=shadowAccount)'
-            '(uid=frank.brehm)'
-            ')'
-        )
+    # -------------------------------------------------------------------------
+    def get_all_user_entries(self):
 
-        entries = self.ldap_search(query_filter)
+        LOG.info("Reading Accounts from LDAP ...")
+
+        query_filter = '(&(objectclass=posixAccount)(objectclass=shadowAccount))'
+        attributes = ["uid", "uidNumber", "homeDirectory", "gidNumber"]
+
+        person = ObjectDef(['posixAccount', 'shadowAccount'])
+        person += ["uid", "uidNumber", "homeDirectory", "gidNumber"]
+
+        #self.user_entries = self.ldap_search(query_filter, attributes=attributes)
+        self.user_entries = self.ldap_search_subtree(person, query_filter)
+        LOG.debug("Found {} LDAP entries.".format(len(self.user_entries)))
+
+    # -------------------------------------------------------------------------
+    def check_numeric_uids(self):
+
+        LOG.info("Checking UID's for new Users ...")
+
+    # -------------------------------------------------------------------------
+    def check_home_dirs(self):
+
+        LOG.info("Checking home directories ...")
 
-        print("Found {} LDAP entries.".format(len(entries)))
         i = 0
-        for entry in entries:
+        for entry in self.user_entries:
+
             i += 1
-            print("\n{}".format(entry))
+            if self.verbose > 3:
+                LOG.debug("Found {c}:\n{e}".format(c=entry.__class__.__name__, e=pp(entry)))
+            dn = entry.entry_get_dn()
+            LOG.debug("Checking home of {!r} ...".format(dn))
+
+            try:
+                home_dir = entry['homeDirectory']
+            except LDAPKeyError as e:
+                LOG.debug("LDAP user {!r} has no home directory.".format(dn))
+
+            home = entry['homeDirectory'][0]
+            LOG.debug("Checking home directory {!r} ...".format(home))
+
             if i >= 5:
                 break
 
-
 # =============================================================================
 
 if __name__ == "__main__":