X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=45aa00c454d2f0269e8e4c39495bc142a27c542c;hb=1a9587bf5c27df5afc5465d6b76c73761504d15e;hp=6be531dd746e700dcf2ab758b08004ffdca7fe35;hpb=428c40184c9eed02dab84a3c3070eff44dca6f3b;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 6be531d..45aa00c 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-2003 Ryan Murray # Copyright (c) 2003-2004 James Troup # Copyright (c) 2004-2005 Joey Schulze +# Copyright (c) 2001-2006 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): @@ -408,6 +408,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 +448,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 +498,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)); @@ -483,7 +526,7 @@ def GenBSMTP(l,File,HomePrefix): raise; Done(File,F,None); -# Generate the shadow list +# Generate the ssh known hosts file def GenSSHKnown(l,File): F = None; try: @@ -491,14 +534,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; @@ -517,6 +557,35 @@ def GenSSHKnown(l,File): raise; Done(File,F,None); +# Generate the debianhosts file (list of all IP addresses) +def GenHosts(l,File): + F = None; + try: + OldMask = os.umask(0022); + F = open(File + ".tmp","w",0644); + os.umask(OldMask); + + # Fetch all the hosts + HostNames = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"hostname=*",\ + ["hostname"]); + + if HostNames == None: + raise "No Hosts"; + + for x in HostNames: + if x[1].has_key("hostname") == 0: + continue; + Host = GetAttr(x,"hostname"); + try: + Addr = socket.gethostbyname(Host); + F.write(Addr + "\n"); + except: + pass + # Oops, something unspeakable happened. + except: + Die(File,F,None); + raise; + Done(File,F,None); # Connect to the ldap server l = ldap.open(LDAPServer); @@ -544,6 +613,9 @@ PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\ "shadowexpire","emailForward","latitude","longitude",\ "allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\ "keyFingerPrint","privateSub"]); +# Fetch all the hosts +HostAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\ + ["hostname","sshRSAHostKey"]); # Open the control file if len(sys.argv) == 1: @@ -558,6 +630,7 @@ GenAllForward(l,GlobalDir+"mail-forward.cdb"); GenMarkers(l,GlobalDir+"markers"); GenPrivate(l,GlobalDir+"debian-private"); GenSSHKnown(l,GlobalDir+"ssh_known_hosts"); +GenHosts(l,GlobalDir+"debianhosts"); # Compatibility. GenForward(l,GlobalDir+"forward-alias"); @@ -606,16 +679,17 @@ while(1): DoLink(GlobalDir,OutDir,"markers"); DoLink(GlobalDir,OutDir,"mail-forward.cdb"); DoLink(GlobalDir,OutDir,"ssh_known_hosts"); + DoLink(GlobalDir,OutDir,"debianhosts"); # 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")