X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-generate;h=2cc48aa8eb8a8b541a28b089c7512589702ad103;hp=03a51861b4925ee3bac7f4a8bdc29dc6f20f09c8;hb=a6fb69805c3999a85c064a96c93417bb1c284c5c;hpb=186f30d63f9631fbfbda0b56f59d4f0339f8a9d2

diff --git a/ud-generate b/ud-generate
index 03a5186..2cc48aa 100755
--- a/ud-generate
+++ b/ud-generate
@@ -37,7 +37,7 @@ BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL);
 DNSZone = ".debian.net"
 
 def Sanitize(Str):
-  return string.translate(Str,string.maketrans("\n\r\t","$$$"));
+  return Str.translate(string.maketrans("\n\r\t","$$$"))
 
 def DoLink(From,To,File):
    try: posix.remove(To+File);
@@ -147,11 +147,20 @@ def GenShadow(l,File):
          Pass = '*';
       else:
          Pass = Pass[7:];
+
+      # If the account is locked, mark it as such in shadow
+      # See Debian Bug #308229 for why we set it to 1 instead of 0
+      if (GetAttr(x,"userPassword").find("*LK*") != -1) \
+          or GetAttr(x,"userPassword").startswith("!"):
+         ShadowExpire = '1'
+      else:
+         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,"shadowexpire"));
+              ShadowExpire);
       Line = Sanitize(Line) + "\n";
       F.write("0%u %s" % (I,Line));
       F.write(".%s %s" % (GetAttr(x,"uid"),Line));
@@ -180,8 +189,8 @@ def GenSSHShadow(l,File):
       # If the account is locked, do not write it.
       # This is a partial stop-gap. The ssh also needs to change this
       # to ignore ~/.ssh/authorized* files.
-      if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1) \
-             or (string.find(GetAttr(x,"userPassword"),"*PK*")  != -1):
+      if (GetAttr(x,"userPassword").find("*LK*") != -1) \
+             or GetAttr(x,"userPassword").startswith("!"):
          continue;
 
       if x[1].has_key("uidNumber") == 0 or \
@@ -365,8 +374,8 @@ def GenPrivate(l,File):
          continue;
 
       # If the account is locked, do not write it
-      if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1) \
-             or (string.find(GetAttr(x,"userPassword"),"*PK*")  != -1):
+      if (GetAttr(x,"userPassword").find("*LK*") != -1) \
+             or GetAttr(x,"userPassword").startswith("!"):
          continue;
 
       # If the account has no PGP key, do not write it
@@ -390,6 +399,39 @@ def GenPrivate(l,File):
    raise;
   Done(File,F,None);
 
+# Generate a list of locked accounts
+def GenDisabledAccounts(l,File):
+  F = None;
+  try:
+   F = open(File + ".tmp","w");
+
+   # Fetch all the users
+   global PasswdAttrs;
+   if PasswdAttrs == None:
+      raise "No Users";
+
+   I = 0;
+   for x in PasswdAttrs:
+      if x[1].has_key("uidNumber") == 0:
+         continue;
+	 
+      Pass = GetAttr(x,"userPassword");
+      Line = ""
+      # *LK* is the reference value for a locked account
+      # password starting with ! is also a locked account
+      if Pass.find("*LK*") != -1 or Pass.startswith("!"):
+	 # Format is <login>:<reason>
+	 Line = "%s:%s" % (GetAttr(x,"uid"), "Account is locked")
+
+      if Line != "":
+	 F.write(Sanitize(Line) + "\n")
+
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None);
+   raise;
+  Done(File,F,None);
+
 # Generate the list of local addresses that refuse all mail
 def GenMailDisable(l,File):
   F = None;
@@ -405,8 +447,11 @@ def GenMailDisable(l,File):
       Reason = None
       
       # If the account is locked, disable incoming mail
-      if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -1):
-         Reason = "user account locked"
+      if (GetAttr(x,"userPassword").find("*LK*") != -1):
+         if GetAttr(x,"uid") == "luther":
+	    continue
+	 else:
+            Reason = "user account locked"
       else:
          if x[1].has_key("mailDisableMessage"):
             Reason = GetAttr(x,"mailDisableMessage")
@@ -541,12 +586,12 @@ def GenDNS(l,File,HomePrefix):
       try:
          F.write("; %s\n"%(EmailAddress(x)));
          for z in x[1]["dnsZoneEntry"]:
-            Split = string.split(string.lower(z));
-	    if string.lower(Split[1]) == 'in':
+            Split = z.lower().split()
+	    if Split[1].lower() == 'in':
                for y in range(0,len(Split)):
                   if Split[y] == "$":
                      Split[y] = "\n\t";
-               Line = string.join(Split," ") + "\n";
+               Line = " ".join(Split) + "\n";
                F.write(Line);
 	       
 	       Host = Split[0] + DNSZone;
@@ -554,7 +599,7 @@ def GenDNS(l,File,HomePrefix):
 		   F.write("; Has BSMTP\n");
 			       
 	       # Write some identification information
-               if string.lower(Split[2]) == "a":
+               if Split[2].lower() == "a":
    	          Line = "%s IN TXT \"%s\"\n"%(Split[0],EmailAddress(x));
                   for y in x[1]["keyFingerPrint"]:
   	             Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0],FormatPGPKey(y));
@@ -592,7 +637,7 @@ def GenSSHFP(l,File,HomePrefix):
       Host = GetAttr(x,"hostname");
       Algorithm = None
       for I in x[1]["sshRSAHostKey"]:
-         Split = string.split(I)
+         Split = I.split()
          if Split[0] == 'ssh-rsa':
             Algorithm = 1
          if Split[0] == 'ssh-dss':
@@ -630,12 +675,12 @@ def GenBSMTP(l,File,HomePrefix):
          continue;
       try:
          for z in x[1]["dnsZoneEntry"]:
-            Split = string.split(string.lower(z));
-	    if string.lower(Split[1]) == 'in':
+            Split = z.lower().split()
+	    if Split[1].lower() == 'in':
                for y in range(0,len(Split)):
                   if Split[y] == "$":
                      Split[y] = "\n\t";
-               Line = string.join(Split," ") + "\n";
+               Line = " ".join(Split) + "\n";
 	       
 	       Host = Split[0] + DNSZone;
 	       if BSMTPCheck.match(Line) != None:
@@ -669,7 +714,7 @@ def GenSSHKnown(l,File):
          x[1].has_key("sshRSAHostKey") == 0:
          continue;
       Host = GetAttr(x,"hostname");
-      SHost = string.find(Host,".");
+      SHost = Host.find(".")
       for I in x[1]["sshRSAHostKey"]:
          if SHost == None:
             Line = "%s,%s %s" %(Host,socket.gethostbyname(Host),I);
@@ -716,7 +761,7 @@ def GenHosts(l,File):
 # Connect to the ldap server
 l = ldap.open(LDAPServer);
 F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
-Pass = string.split(string.strip(F.readline())," ");
+Pass = F.readline().strip().split(" ")
 F.close();
 l.simple_bind_s("uid="+Pass[0]+","+BaseDn,Pass[1]);
 
@@ -757,6 +802,7 @@ GenSSHShadow(l,GlobalDir+"ssh-rsa-shadow");
 GenAllForward(l,GlobalDir+"mail-forward.cdb");
 GenMarkers(l,GlobalDir+"markers");
 GenPrivate(l,GlobalDir+"debian-private");
+GenDisabledAccounts(l,GlobalDir+"disabled-accounts");
 GenSSHKnown(l,GlobalDir+"ssh_known_hosts");
 GenHosts(l,GlobalDir+"debianhosts");
 GenMailDisable(l,GlobalDir+"mail-disable");
@@ -773,13 +819,13 @@ while(1):
    Line = F.readline();
    if Line == "":
       break;
-   Line = string.strip(Line);
+   Line = Line.strip()
    if Line == "":
       continue;
    if Line[0] == '#':
       continue;
 
-   Split = string.split(Line," ");
+   Split = Line.split(" ")
    OutDir = GenerateDir + '/' + Split[0] + '/';
    try: os.mkdir(OutDir);
    except: pass;
@@ -800,20 +846,23 @@ while(1):
      Allowed = None
    CurrentHost = Split[0];
 
+   DoLink(GlobalDir,OutDir,"ssh-rsa-shadow");
+   DoLink(GlobalDir,OutDir,"debianhosts");
+   DoLink(GlobalDir,OutDir,"ssh_known_hosts");
+   DoLink(GlobalDir,OutDir,"disabled-accounts")
+
    sys.stdout.flush();
    GenPasswd(l,OutDir+"passwd",Split[1]);
    sys.stdout.flush();
    GenGroup(l,OutDir+"group");
    if ExtraList.has_key("[UNTRUSTED]"):
 	continue;
-   GenShadow(l,OutDir+"shadow");
+   if not ExtraList.has_key("[NOPASSWD]"):
+     GenShadow(l,OutDir+"shadow");
 	
    # Link in global things   
-   DoLink(GlobalDir,OutDir,"ssh-rsa-shadow");
    DoLink(GlobalDir,OutDir,"markers");
    DoLink(GlobalDir,OutDir,"mail-forward.cdb");
-   DoLink(GlobalDir,OutDir,"debianhosts");
-   DoLink(GlobalDir,OutDir,"ssh_known_hosts");
    DoLink(GlobalDir,OutDir,"mail-disable");
    DoLink(GlobalDir,OutDir,"mail-greylist");
    DoLink(GlobalDir,OutDir,"mail-callout");