X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=bc85714419cc5fbee327bf76920646552374c394;hb=9126d4b7859fcd0865b4c0d0e6681bae1c838df4;hp=4a0fd51f304923c6563f314300aa1deeefb3df77;hpb=108188be721a6e5cf678918d530143aa71dad2d3;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 4a0fd51..bc85714 100755 --- a/ud-generate +++ b/ud-generate @@ -3,9 +3,9 @@ # Generates passwd, shadow and group files from the ldap directory. # Copyright (c) 2000-2001 Jason Gunthorpe -# Copyright (c) 2001-2005 Ryan Murray # Copyright (c) 2003-2004 James Troup # Copyright (c) 2004-2005 Joey Schulze +# Copyright (c) 2001-2007 Ryan Murray # # 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,7 +33,7 @@ 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): @@ -251,7 +251,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 +279,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 +322,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 +343,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; @@ -389,9 +384,138 @@ def GenPrivate(l,File): # Oops, something unspeakable happened. except: - Die(File,F,Fdb); + 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 (string.find(GetAttr(x,"userPassword"),"*LK*") != -1): + 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,6 +532,10 @@ 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"]: @@ -444,6 +572,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 = string.split(I) + 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,6 +622,10 @@ 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)); @@ -491,14 +658,11 @@ 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; @@ -536,8 +700,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); @@ -569,7 +736,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: @@ -585,6 +757,12 @@ GenMarkers(l,GlobalDir+"markers"); GenPrivate(l,GlobalDir+"debian-private"); 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"); @@ -632,18 +810,24 @@ while(1): 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,"ssh_known_hosts"); + 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")