X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=48520038ec0fc5e99a338ec3f3b84efa175e16a5;hb=5f0890953c9bf981431b461530ff7c196d7d3861;hp=10a124d257018716522c5464dc889e64f73bd056;hpb=a599d46c4f33a68d1033bba48060089749ec5e0d;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 10a124d..4852003 100755
--- a/ud-generate
+++ b/ud-generate
@@ -35,6 +35,8 @@ GroupIDMap = {};
 Allowed = None;
 CurrentHost = "";
 
+UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+
 EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
 BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL);
 DNSZone = ".debian.net"
@@ -182,12 +184,12 @@ def GenShadow(l,File):
           or GetAttr(x,"userPassword").startswith("!"):
          ShadowExpire = '1'
       else:
-         ShadowExpire = GetAttr(x,"shadowexpire")
+         ShadowExpire = GetAttr(x,"shadowExpire")
 
       Line = "%s:%s:%s:%s:%s:%s:%s:%s:" % (GetAttr(x,"uid"),\
               Pass,GetAttr(x,"shadowLastChange"),\
               GetAttr(x,"shadowMin"),GetAttr(x,"shadowMax"),\
-              GetAttr(x,"shadowWarning"),GetAttr(x,"shadowinactive"),\
+              GetAttr(x,"shadowWarning"),GetAttr(x,"shadowInactive"),\
               ShadowExpire);
       Line = Sanitize(Line) + "\n";
       F.write("0%u %s" % (I,Line));
@@ -200,6 +202,58 @@ def GenShadow(l,File):
    raise;
   Done(File,None,F);
 
+# Generate the sudo passwd file
+def GenShadowSudo(l,File):
+  F = None;
+  try:
+   OldMask = os.umask(0077);
+   F = open(File + ".tmp","w",0600);
+   os.umask(OldMask);
+
+   # Fetch all the users
+   global PasswdAttrs;
+   if PasswdAttrs == None:
+      raise "No Users";
+
+   for x in PasswdAttrs:
+      if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0:
+         continue;
+      if not x[1].has_key('sudoPassword'):
+         continue
+
+      Pass = None
+      for entry in x[1]['sudoPassword']:
+         Match = re.compile('^('+UUID_FORMAT+') (confirmed|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry.lower())
+         if Match == None:
+            continue
+         status = Match.group(2)
+         hosts = Match.group(3)
+         cryptedpass = Match.group(4)
+
+         if status != 'confirmed':
+            continue
+         for_all = hosts == "*"
+         for_this_host = CurrentHost in hosts.split(',')
+         if not (for_all or for_this_host):
+            continue
+         Pass = cryptedpass
+         if for_this_host: # this makes sure we take a per-host entry over the for-all entry
+           break
+      if not Pass:
+         continue
+      if len(Pass) > 50:
+         continue
+
+      Line = "%s:%s" % (GetAttr(x,"uid"), Pass)
+      Line = Sanitize(Line) + "\n";
+      F.write("%s" % (Line));
+
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None);
+   raise;
+  Done(File,F,None);
+
 # Generate the shadow list
 def GenSSHShadow(l,masterFileName):
    # Fetch all the users
@@ -515,18 +569,11 @@ def GenMailDisable(l,File):
 
    for x in PasswdAttrs:
       Reason = None
-      
-      # If the account is locked, disable incoming mail
-      if (GetAttr(x,"userPassword").find("*LK*") != -1):
-         if GetAttr(x,"uid") == "luther":
-	    continue
-	 else:
-            Reason = "user account locked"
+
+      if x[1].has_key("mailDisableMessage"):
+         Reason = GetAttr(x,"mailDisableMessage")
       else:
-         if x[1].has_key("mailDisableMessage"):
-            Reason = GetAttr(x,"mailDisableMessage")
-         else:
-            continue
+         continue
 
       # Must be in the Debian group (yuk, hard coded for now)
       if GetAttr(x,"gidNumber") != "800":
@@ -855,7 +902,7 @@ def GenKeyrings(l,OutDir):
     shutil.copy(k, OutDir)
 
 # Connect to the ldap server
-l = ldap.open(LDAPServer);
+l = connectLDAP()
 F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
 Pass = F.readline().strip().split(" ")
 F.close();
@@ -876,12 +923,12 @@ for x in Attrs:
 PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
                 ["uid","uidNumber","gidNumber","supplementaryGid",\
                  "gecos","loginShell","userPassword","shadowLastChange",\
-                 "shadowMin","shadowMax","shadowWarning","shadowinactive",
-	         "shadowexpire","emailForward","latitude","longitude",\
+                 "shadowMin","shadowMax","shadowWarning","shadowInactive",
+	         "shadowExpire","emailForward","latitude","longitude",\
                  "allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\
 	         "keyFingerPrint","privateSub","mailDisableMessage",\
                  "mailGreylisting","mailCallout","mailRBL","mailRHSBL",\
-                 "mailWhitelist"]);
+                 "mailWhitelist", "sudoPassword"]);
 # Fetch all the hosts
 HostAttrs    = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\
                 ["hostname","sshRSAHostKey"]);
@@ -959,10 +1006,7 @@ while(1):
       userlist = GenPasswd(l,OutDir+"passwd",Split[1], "x");
    sys.stdout.flush();
    grouprevmap = GenGroup(l,OutDir+"group");
-   if ExtraList.has_key("[UNTRUSTED]"):
-	continue;
-   if not ExtraList.has_key("[NOPASSWD]"):
-     GenShadow(l,OutDir+"shadow");
+   GenShadowSudo(l, OutDir+"sudo-passwd")
 
    # Now we know who we're allowing on the machine, export
    # the relevant ssh keys
@@ -1007,13 +1051,18 @@ while(1):
         # to give a shit^W^W^Wcare about the UIDoffset stuff.
         to.uname = f
         to.gname = grname
-        to.mode  = 0600
+        to.mode  = 0400
         tf.addfile(to, file(os.path.join(GlobalDir, 'userkeys', f)))
 
       tf.close()
       os.rename(os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost),
                 os.path.join(OutDir, 'ssh-keys.tar.gz'))
 
+   if ExtraList.has_key("[UNTRUSTED]"):
+     continue;
+   if not ExtraList.has_key("[NOPASSWD]"):
+     GenShadow(l,OutDir+"shadow");
+
    # Link in global things   
    DoLink(GlobalDir,OutDir,"markers");
    DoLink(GlobalDir,OutDir,"mail-forward.cdb");