X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=1782f096b9eb93c75008b4799f53d11cbe93b22b;hb=14908ffbe8886fdd85bf143ef14200e0171c18cd;hp=5e5aecf8f99eef67dd43f0fdc67b0a8c93a3e642;hpb=312577e396c70978c657692329e3fb004c8efddf;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 5e5aecf..1782f09 100755
--- a/ud-generate
+++ b/ud-generate
@@ -35,11 +35,12 @@ 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"
-Keyrings = [ "/org/keyring.debian.org/keyrings/debian-keyring.gpg",
-             "/org/keyring.debian.org/keyrings/debian-keyring.pgp" ]
+Keyrings = ConfModule.sync_keyrings.split(":")
 
 def safe_makedirs(dir):
     try:
@@ -201,6 +202,59 @@ 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:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry.lower())
+         if Match == None:
+            continue
+         uuid = Match.group(1)
+         status = Match.group(2)
+         hosts = Match.group(3)
+         cryptedpass = Match.group(4)
+
+         if status != 'confirmed:'+make_sudopasswd_hmac('password-is-confirmed', uuid, hosts, cryptedpass):
+            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
@@ -849,7 +903,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();
@@ -875,7 +929,7 @@ PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
                  "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"]);
@@ -953,6 +1007,7 @@ while(1):
       userlist = GenPasswd(l,OutDir+"passwd",Split[1], "x");
    sys.stdout.flush();
    grouprevmap = GenGroup(l,OutDir+"group");
+   GenShadowSudo(l, OutDir+"sudo-passwd")
 
    # Now we know who we're allowing on the machine, export
    # the relevant ssh keys