* Remove use of deprecated functions from the string module
[mirror/userdir-ldap.git] / ud-generate
index 4a0fd51..2cc48aa 100755 (executable)
@@ -3,9 +3,9 @@
 # Generates passwd, shadow and group files from the ldap directory.
 
 #   Copyright (c) 2000-2001  Jason Gunthorpe <jgg@debian.org>
-#   Copyright (c) 2001-2005  Ryan Murray <rmurray@debian.org>
 #   Copyright (c) 2003-2004  James Troup <troup@debian.org>
-#   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.org>
+#   Copyright (c) 2004-2005,7  Joey Schulze <joey@infodrom.org>
+#   Copyright (c) 2001-2007  Ryan Murray <rmurray@debian.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -21,7 +21,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;
+import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha
 from userdir_ldap import *;
 
 global Allowed;
@@ -33,11 +33,11 @@ Allowed = None;
 CurrentHost = "";
 
 EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
-BSMTPCheck = re.compile(".*mx 0 (klecker|gluck)\.debian\.org\..*",re.DOTALL);
+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,7 +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):
+      if (GetAttr(x,"userPassword").find("*LK*") != -1) \
+             or GetAttr(x,"userPassword").startswith("!"):
          continue;
 
       if x[1].has_key("uidNumber") == 0 or \
@@ -251,7 +261,6 @@ def GenGroup(l,File):
 # Generate the email forwarding list
 def GenForward(l,File):
   F = None;
-  Fdb = None;
   try:
    OldMask = os.umask(0022);
    F = open(File + ".tmp","w",0644);
@@ -280,9 +289,9 @@ def GenForward(l,File):
       
   # Oops, something unspeakable happened.
   except:
-   Die(File,F,Fdb);
+   Die(File,F,None);
    raise;
-  Done(File,F,Fdb);
+  Done(File,F,None);
 
 def GenAllForward(l,File):
   Fdb = None;
@@ -323,10 +332,8 @@ def GenAllForward(l,File):
 # Generate the anon XEarth marker file 
 def GenMarkers(l,File):
   F = None;
-  Fdb = None;
   try:
    F = open(File + ".tmp","w");
-   Fdb = None;
 
    # Fetch all the users
    global PasswdAttrs;
@@ -346,17 +353,15 @@ def GenMarkers(l,File):
       
   # Oops, something unspeakable happened.
   except:
-   Die(File,F,Fdb);
+   Die(File,F,None);
    raise;
-  Done(File,F,Fdb);
+  Done(File,F,None);
 
 # Generate the debian-private subscription list
 def GenPrivate(l,File):
   F = None;
-  Fdb = None;
   try:
    F = open(File + ".tmp","w");
-   Fdb = None;
 
    # Fetch all the users
    global PasswdAttrs;
@@ -369,7 +374,8 @@ def GenPrivate(l,File):
          continue;
 
       # If the account is locked, do not write it
-      if (string.find(GetAttr(x,"userPassword"),"*LK*")  != -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
@@ -389,9 +395,174 @@ def GenPrivate(l,File):
       
   # Oops, something unspeakable happened.
   except:
-   Die(File,F,Fdb);
+   Die(File,F,None);
+   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;
+  try:
+   F = open(File + ".tmp","w");
+
+   # Fetch all the users
+   global PasswdAttrs;
+   if PasswdAttrs == None:
+      raise "No Users";
+
+   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"
+      else:
+         if x[1].has_key("mailDisableMessage"):
+            Reason = GetAttr(x,"mailDisableMessage")
+         else:
+            continue
+
+      # Must be in the Debian group (yuk, hard coded for now)
+      if GetAttr(x,"gidNumber") != "800":
+        continue;
+
+      try:
+         Line = "%s: %s"%(GetAttr(x,"uid"),Reason);
+         Line = Sanitize(Line) + "\n";
+         F.write(Line);
+      except:
+         pass;
+      
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None);
+   raise;
+  Done(File,F,None);
+
+# Generate a list of uids that should have boolean affects applied
+def GenMailBool(l,File,Key):
+  F = None;
+  try:
+   F = open(File + ".tmp","w");
+
+   # Fetch all the users
+   global PasswdAttrs;
+   if PasswdAttrs == None:
+      raise "No Users";
+
+   for x in PasswdAttrs:
+      Reason = None
+      
+      if x[1].has_key(Key) == 0:
+         continue
+
+      # Must be in the Debian group (yuk, hard coded for now)
+      if GetAttr(x,"gidNumber") != "800":
+        continue
+
+      if GetAttr(x,Key) != "TRUE":
+         continue
+
+      try:
+         Line = "%s"%(GetAttr(x,"uid"));
+         Line = Sanitize(Line) + "\n";
+         F.write(Line);
+      except:
+         pass;
+      
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None);
    raise;
-  Done(File,F,Fdb);
+  Done(File,F,None);
+
+# Generate a list of hosts for RBL or whitelist purposes.
+def GenMailList(l,File,Key):
+  F = None;
+  try:
+   F = open(File + ".tmp","w");
+
+   # Fetch all the users
+   global PasswdAttrs;
+   if PasswdAttrs == None:
+      raise "No Users";
+
+   for x in PasswdAttrs:
+      Reason = None
+      
+      if x[1].has_key(Key) == 0:
+         continue
+
+      # Must be in the Debian group (yuk, hard coded for now)
+      if GetAttr(x,"gidNumber") != "800":
+        continue
+
+      try:
+         found = 0
+         Line = None
+         for z in x[1][Key]:
+             if Key == "mailWhitelist":
+                if re.match('^[-\w.]+(/[\d]+)?$',z) == None:
+                    continue
+            else:
+                if re.match('^[-\w.]+$',z) == None:
+                    continue
+             if found == 0:
+                 found = 1
+                 Line = GetAttr(x,"uid")
+             else:
+                 Line += " "
+             Line += ": " + z
+             if Key == "mailRHSBL":
+                 Line += "/$sender_address_domain"
+
+         if Line != None:
+             Line = Sanitize(Line) + "\n";
+             F.write(Line);
+      except:
+         pass;
+      
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None);
+   raise;
+  Done(File,F,None);
 
 # Generate the DNS Zone file
 def GenDNS(l,File,HomePrefix):
@@ -408,15 +579,19 @@ def GenDNS(l,File,HomePrefix):
    for x in PasswdAttrs:
       if x[1].has_key("dnsZoneEntry") == 0:
          continue;
+
+      # If the account has no PGP key, do not write it
+      if x[1].has_key("keyFingerPrint") == 0:
+         continue;
       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;
@@ -424,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));
@@ -444,6 +619,41 @@ def GenDNS(l,File,HomePrefix):
    raise;
   Done(File,F,None);
 
+# Generate the DNS SSHFP records
+def GenSSHFP(l,File,HomePrefix):
+  F = None
+  try:
+   F = open(File + ".tmp","w")
+   
+   # Fetch all the hosts
+   global HostAttrs
+   if HostAttrs == None:
+      raise "No Hosts"
+
+   for x in HostAttrs:
+      if x[1].has_key("hostname") == 0 or \
+         x[1].has_key("sshRSAHostKey") == 0:
+         continue
+      Host = GetAttr(x,"hostname");
+      Algorithm = None
+      for I in x[1]["sshRSAHostKey"]:
+         Split = I.split()
+         if Split[0] == 'ssh-rsa':
+            Algorithm = 1
+         if Split[0] == 'ssh-dss':
+            Algorithm = 2
+         if Algorithm == None:
+            continue
+         Fingerprint = sha.new(base64.decodestring(Split[1])).hexdigest()
+         Line = "%s. IN SSHFP %u 1 %s" % (Host,Algorithm,Fingerprint)
+         Line = Sanitize(Line) + "\n"
+         F.write(Line)
+  # Oops, something unspeakable happened.
+  except:
+   Die(File,F,None)
+   raise;
+  Done(File,F,None)
+
 # Generate the BSMTP file
 def GenBSMTP(l,File,HomePrefix):
   F = None;
@@ -459,14 +669,18 @@ def GenBSMTP(l,File,HomePrefix):
    for x in PasswdAttrs:
       if x[1].has_key("dnsZoneEntry") == 0:
          continue;
+
+      # If the account has no PGP key, do not write it
+      if x[1].has_key("keyFingerPrint") == 0:
+         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:
@@ -491,19 +705,16 @@ def GenSSHKnown(l,File):
    F = open(File + ".tmp","w",0644);
    os.umask(OldMask);
 
-   # Fetch all the hosts
-   HostKeys = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\
-                ["hostname","sshRSAHostKey"]);
-   
-   if HostKeys == None:
+   global HostAttrs
+   if HostAttrs == None:
       raise "No Hosts";
-
-   for x in HostKeys:
+   
+   for x in HostAttrs:
       if x[1].has_key("hostname") == 0 or \
          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);
@@ -536,8 +747,11 @@ def GenHosts(l,File):
       if x[1].has_key("hostname") == 0:
          continue;
       Host = GetAttr(x,"hostname");
-      Addr = socket.gethostbyname(Host);
-      F.write(Addr + "\n");
+      try:
+        Addr = socket.gethostbyname(Host);
+        F.write(Addr + "\n");
+      except:
+        pass
   # Oops, something unspeakable happened.
   except:
    Die(File,F,None);
@@ -547,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]);
 
@@ -569,7 +783,12 @@ PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\
                  "shadowMin","shadowMax","shadowWarning","shadowinactive",
                 "shadowexpire","emailForward","latitude","longitude",\
                  "allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\
-                "keyFingerPrint","privateSub"]);
+                "keyFingerPrint","privateSub","mailDisableMessage",\
+                 "mailGreylisting","mailCallout","mailRBL","mailRHSBL",\
+                 "mailWhitelist"]);
+# Fetch all the hosts
+HostAttrs    = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\
+                ["hostname","sshRSAHostKey"]);
 
 # Open the control file
 if len(sys.argv) == 1:
@@ -583,8 +802,15 @@ 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");
+GenMailBool(l,GlobalDir+"mail-greylist","mailGreylisting");
+GenMailBool(l,GlobalDir+"mail-callout","mailCallout");
+GenMailList(l,GlobalDir+"mail-rbl","mailRBL");
+GenMailList(l,GlobalDir+"mail-rhsbl","mailRHSBL");
+GenMailList(l,GlobalDir+"mail-whitelist","mailWhitelist");
 
 # Compatibility.
 GenForward(l,GlobalDir+"forward-alias");
@@ -593,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;
@@ -620,30 +846,39 @@ 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,"ssh_known_hosts");
-   DoLink(GlobalDir,OutDir,"debianhosts");
+   DoLink(GlobalDir,OutDir,"mail-disable");
+   DoLink(GlobalDir,OutDir,"mail-greylist");
+   DoLink(GlobalDir,OutDir,"mail-callout");
+   DoLink(GlobalDir,OutDir,"mail-rbl");
+   DoLink(GlobalDir,OutDir,"mail-rhsbl");
+   DoLink(GlobalDir,OutDir,"mail-whitelist");
 
    # Compatibility.
    DoLink(GlobalDir,OutDir,"forward-alias");
 
    if ExtraList.has_key("[DNS]"):
       GenDNS(l,OutDir+"dns-zone",Split[1]);
+      GenSSHFP(l,OutDir+"dns-sshfp",Split[1])
       
    if ExtraList.has_key("[BSMTP]"):
-      GenBSMTP(l,OutDir+"bsmtp",Split[1]);
+      GenBSMTP(l,OutDir+"bsmtp",Split[1])
 
    if ExtraList.has_key("[PRIVATE]"):
-      DoLink(GlobalDir,OutDir,"debian-private");
-
+      DoLink(GlobalDir,OutDir,"debian-private")