ud-generate: Move main code into a ud_generate()

[mirror/userdir-ldap.git] / ud-generate

diff --git a/ud-generate b/ud-generate
index 27088e9..6362a54 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -28,7 +28,7 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, hashlib, shutil, errno, tarfile, grp
+import string, re, time, ldap, optparse, sys, os, pwd, posix, socket, base64, hashlib, shutil, errno, tarfile, grp
 import lockfile
 from userdir_ldap import *
 from userdir_exceptions import *
@@ -1248,77 +1248,110 @@ def generate_host(host, global_dir, accounts, ssh_files):
             pass
    DoLink(global_dir, OutDir, "last_update.trace")
 
-l = make_ldap_conn()
 
-mods = l.search_s('cn=log',
-      ldap.SCOPE_ONELEVEL,
-      '(&(&(!(reqMod=activity-from*))(!(reqMod=activity-pgp*)))(|(reqType=add)(reqType=delete)(reqType=modify)(reqType=modrdn)))',
-      ['reqEnd'])
+def getLastLDAPChangeTime(l):
+   mods = l.search_s('cn=log',
+         ldap.SCOPE_ONELEVEL,
+         '(&(&(!(reqMod=activity-from*))(!(reqMod=activity-pgp*)))(|(reqType=add)(reqType=delete)(reqType=modify)(reqType=modrdn)))',
+         ['reqEnd'])
 
-last = 0
+   last = 0
 
-# Sort the list by reqEnd
-sorted_mods = sorted(mods, key=lambda mod: mod[1]['reqEnd'][0].split('.')[0])
-# Take the last element in the array
-last = sorted_mods[-1][1]['reqEnd'][0].split('.')[0]
+   # Sort the list by reqEnd
+   sorted_mods = sorted(mods, key=lambda mod: mod[1]['reqEnd'][0].split('.')[0])
+   # Take the last element in the array
+   last = sorted_mods[-1][1]['reqEnd'][0].split('.')[0]
 
-# override globaldir for testing
-if 'UD_GENERATEDIR' in os.environ:
-   GenerateDir = os.environ['UD_GENERATEDIR']
+   return last
 
-cache_last_mod = 0
+def getLastBuildTime():
+   cache_last_mod = 0
 
-try:
-   fd = open(os.path.join(GenerateDir, "last_update.trace"), "r")
-   cache_last_mod=fd.read().split()
    try:
-      cache_last_mod = cache_last_mod[0]
-   except IndexError:
-      pass
-   fd.close()
-except IOError, e:
-   if e.errno == errno.ENOENT:
-      pass
-   else:
-      raise e
+      fd = open(os.path.join(GenerateDir, "last_update.trace"), "r")
+      cache_last_mod=fd.read().split()
+      try:
+         cache_last_mod = cache_last_mod[0]
+      except IndexError:
+         pass
+      fd.close()
+   except IOError, e:
+      if e.errno == errno.ENOENT:
+         pass
+      else:
+         raise e
 
-if cache_last_mod >= last:
-   fd = open(os.path.join(GenerateDir, "last_update.trace"), "w")
-   fd.write("%s\n%s\n" % (last, int(time.time())))
-   fd.close()
-   sys.exit(0)
+   return cache_last_mod
 
-# Fetch all the groups
-GroupIDMap = {}
-attrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "gid=*",\
-                  ["gid", "gidNumber", "subGroup"])
-
-# Generate the SubGroupMap and GroupIDMap
-for x in attrs:
-   if x[1].has_key("accountStatus") and x[1]['accountStatus'] == "disabled":
-      continue
-   if x[1].has_key("gidNumber") == 0:
-      continue
-   GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidNumber"][0])
-   if x[1].has_key("subGroup") != 0:
-      SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"])
-
-lock = None
-try:
-   lockf = os.path.join(GenerateDir, 'ud-generate.lock')
-   lock = get_lock( lockf )
-   if lock is None:
-      sys.stderr.write("Could not acquire lock %s.\n"%(lockf))
+
+
+
+def ud_generate():
+   global GenerateDir
+   global GroupIDMap
+   parser = optparse.OptionParser()
+   parser.add_option("-g", "--generatedir", dest="generatedir", metavar="DIR",
+     help="Output directory.")
+   parser.add_option("-f", "--force", dest="force", action="store_true",
+     help="Force generation, even if not update to LDAP has happened.")
+
+   (options, args) = parser.parse_args()
+   if len(args) > 0:
+      parser.print_help()
       sys.exit(1)
 
-   tracefd = open(os.path.join(GenerateDir, "last_update.trace"), "w")
-   generate_all(GenerateDir, l)
-   tracefd.write("%s\n%s\n" % (last, int(time.time())))
-   tracefd.close()
 
-finally:
-   if lock is not None:
-      lock.release()
+   l = make_ldap_conn()
+
+   if options.generatedir is not None:
+      GenerateDir = os.environ['UD_GENERATEDIR']
+   elif 'UD_GENERATEDIR' in os.environ:
+      GenerateDir = os.environ['UD_GENERATEDIR']
+
+   ldap_last_mod = getLastLDAPChangeTime(l)
+   cache_last_mod = getLastBuildTime()
+   need_update = ldap_last_mod > cache_last_mod
+
+   if not options.force and not need_update:
+      fd = open(os.path.join(GenerateDir, "last_update.trace"), "w")
+      fd.write("%s\n%s\n" % (ldap_last_mod, int(time.time())))
+      fd.close()
+      sys.exit(0)
+
+   # Fetch all the groups
+   GroupIDMap = {}
+   attrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "gid=*",\
+                     ["gid", "gidNumber", "subGroup"])
+
+   # Generate the SubGroupMap and GroupIDMap
+   for x in attrs:
+      if x[1].has_key("accountStatus") and x[1]['accountStatus'] == "disabled":
+         continue
+      if x[1].has_key("gidNumber") == 0:
+         continue
+      GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidNumber"][0])
+      if x[1].has_key("subGroup") != 0:
+         SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"])
+
+   lock = None
+   try:
+      lockf = os.path.join(GenerateDir, 'ud-generate.lock')
+      lock = get_lock( lockf )
+      if lock is None:
+         sys.stderr.write("Could not acquire lock %s.\n"%(lockf))
+         sys.exit(1)
+
+      tracefd = open(os.path.join(GenerateDir, "last_update.trace"), "w")
+      generate_all(GenerateDir, l)
+      tracefd.write("%s\n%s\n" % (ldap_last_mod, int(time.time())))
+      tracefd.close()
+
+   finally:
+      if lock is not None:
+         lock.release()
+
+if __name__ == "__main__":
+   ud_generate()
 
 
 # vim:set et: