X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=1782f096b9eb93c75008b4799f53d11cbe93b22b;hb=14908ffbe8886fdd85bf143ef14200e0171c18cd;hp=b27ceacd187245542cb39dba3e7fefbe815e20f0;hpb=351040d84035249bcb81f31a2d0371e0201e6e33;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index b27ceac..1782f09 100755 --- a/ud-generate +++ b/ud-generate @@ -2,7 +2,29 @@ # -*- mode: python -*- # Generates passwd, shadow and group files from the ldap directory. -import string, re, time, ldap, getopt, sys, os, pwd, posix, socket; +# Copyright (c) 2000-2001 Jason Gunthorpe +# Copyright (c) 2003-2004 James Troup +# Copyright (c) 2004-2005,7 Joey Schulze +# Copyright (c) 2001-2007 Ryan Murray +# Copyright (c) 2008 Peter Palfrader +# Copyright (c) 2008 Andreas Barth +# Copyright (c) 2008 Mark Hymers +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# 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, base64, sha, shutil, errno, tarfile, grp from userdir_ldap import *; global Allowed; @@ -13,12 +35,33 @@ 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 (klecker|gluck)\.debian\.org\..*",re.DOTALL); +BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL); DNSZone = ".debian.net" +Keyrings = ConfModule.sync_keyrings.split(":") + +def safe_makedirs(dir): + try: + os.makedirs(dir) + except OSError, e: + if e.errno == errno.EEXIST: + pass + else: + raise e + +def safe_rmtree(dir): + try: + shutil.rmtree(dir) + except OSError, e: + if e.errno == errno.ENOENT: + pass + else: + raise e 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); @@ -69,11 +112,12 @@ def Done(File,F,Fdb): os.rename(File + ".tdb.tmp",File+".tdb"); # Generate the password list -def GenPasswd(l,File,HomePrefix): +def GenPasswd(l,File,HomePrefix,PwdMarker): F = None; try: F = open(File + ".tdb.tmp","w"); + userlist = {} # Fetch all the users global PasswdAttrs; if PasswdAttrs == None: @@ -88,7 +132,9 @@ def GenPasswd(l,File,HomePrefix): if len(GetAttr(x,"gecos")) > 100 or len(GetAttr(x,"loginShell")) > 50: continue; - Line = "%s:x:%s:%s:%s:%s%s:%s" % (GetAttr(x,"uid"),\ + userlist[GetAttr(x, "uid")] = int(GetAttr(x, "gidNumber")) + Line = "%s:%s:%s:%s:%s:%s%s:%s" % (GetAttr(x,"uid"),\ + PwdMarker,\ GetAttr(x,"uidNumber"),GetAttr(x,"gidNumber"),\ GetAttr(x,"gecos"),HomePrefix,GetAttr(x,"uid"),\ GetAttr(x,"loginShell")); @@ -105,6 +151,9 @@ def GenPasswd(l,File,HomePrefix): raise; Done(File,None,F); + # Return the list of users so we know which keys to export + return userlist + # Generate the shadow list def GenShadow(l,File): F = None; @@ -128,11 +177,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")); + GetAttr(x,"shadowWarning"),GetAttr(x,"shadowInactive"),\ + ShadowExpire); Line = Sanitize(Line) + "\n"; F.write("0%u %s" % (I,Line)); F.write(".%s %s" % (GetAttr(x,"uid"),Line)); @@ -144,8 +202,8 @@ def GenShadow(l,File): raise; Done(File,None,F); -# Generate the shadow list -def GenSSHShadow(l,File): +# Generate the sudo passwd file +def GenShadowSudo(l,File): F = None; try: OldMask = os.umask(0077); @@ -157,29 +215,122 @@ def GenSSHShadow(l,File): 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 + singlefile = None + userfiles = [] + # Depending on config, we write out either a single file, + # multiple files, or both + if SingleSSHFile: + try: + OldMask = os.umask(0077); + masterFile = open(masterFileName + ".tmp","w",0600); + os.umask(OldMask); + except IOError: + Die(masterFileName,masterFile,None) + raise + + global PasswdAttrs; + if PasswdAttrs == None: + raise "No Users"; + + # If we're going to be dealing with multiple keys, empty the + # directory before we start to avoid old keys hanging around + if MultipleSSHFiles: + safe_rmtree(os.path.join(GlobalDir, 'userkeys')) + safe_makedirs(os.path.join(GlobalDir, 'userkeys')) + for x in PasswdAttrs: # 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 \ x[1].has_key("sshRSAAuthKey") == 0: continue; - for I in x[1]["sshRSAAuthKey"]: - User = GetAttr(x,"uid"); - Line = "%s: %s" %(User,I); - Line = Sanitize(Line) + "\n"; - F.write(Line); - # Oops, something unspeakable happened. - except: - Die(File,F,None); - raise; - Done(File,F,None); + User = GetAttr(x,"uid"); + F = None; + + try: + if MultipleSSHFiles: + OldMask = os.umask(0077); + File = os.path.join(GlobalDir, 'userkeys', User) + F = open(File + ".tmp","w",0600); + os.umask(OldMask); + + for I in x[1]["sshRSAAuthKey"]: + if MultipleSSHFiles: + MultipleLine = "%s" % I + MultipleLine = Sanitize(MultipleLine) + "\n" + F.write(MultipleLine) + if SingleSSHFile: + SingleLine = "%s: %s" % (User, I) + SingleLine = Sanitize(SingleLine) + "\n" + masterFile.write(SingleLine) + + if MultipleSSHFiles: + Done(File,F,None); + userfiles.append(os.path.basename(File)) + + # Oops, something unspeakable happened. + except IOError: + Die(File,F,None) + Die(masterFileName,masterFile,None) + raise; + + if SingleSSHFile: + Done(masterFileName,masterFile,None) + singlefile = os.path.basename(masterFileName) + + return singlefile, userfiles # Generate the group list def GenGroup(l,File): + grouprevmap = {} F = None; try: F = open(File + ".tdb.tmp","w"); @@ -210,6 +361,7 @@ def GenGroup(l,File): # Output the group file. J = 0; for x in GroupMap.keys(): + grouprevmap[GroupIDMap[x]] = x if GroupIDMap.has_key(x) == 0: continue; Line = "%s:x:%u:" % (x,GroupIDMap[x]); @@ -229,10 +381,11 @@ def GenGroup(l,File): raise; Done(File,None,F); + return grouprevmap + # Generate the email forwarding list def GenForward(l,File): F = None; - Fdb = None; try: OldMask = os.umask(0022); F = open(File + ".tmp","w",0644); @@ -261,9 +414,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; @@ -304,10 +457,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; @@ -327,17 +478,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; @@ -350,7 +499,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 @@ -370,9 +520,167 @@ def GenPrivate(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 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 : + 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 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,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): @@ -389,15 +697,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; @@ -405,7 +717,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)); @@ -425,6 +737,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; @@ -440,14 +787,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: @@ -464,32 +815,51 @@ def GenBSMTP(l,File,HomePrefix): raise; Done(File,F,None); -# Generate the shadow list -def GenSSHKnown(l,File): +# cache IP adresses +HostToIPCache = {} +def HostToIP(Host): + global HostToIPCache + if not Host in HostToIPCache: + IPAdressesT = None + try: + IPAdressesT = list(set([ (a[0],a[4][0]) for a in socket.getaddrinfo(Host, None)])) + except socket.gaierror, (code): + if code[0] != -2: raise + IPAdresses = [] + for addr in IPAdressesT: + if addr[0] == socket.AF_INET: IPAdresses += [addr[1], "::ffff:"+addr[1]] + else: IPAdresses += [addr[1]] + HostToIPCache[Host] = IPAdresses + return HostToIPCache[Host] + + +# Generate the ssh known hosts file +def GenSSHKnown(l,File,mode=None): F = None; try: OldMask = os.umask(0022); 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,"."); + HostNames = [ Host ] + SHost = Host.find(".") + if SHost != None: HostNames += [Host[0:SHost]] + for I in x[1]["sshRSAHostKey"]: - if SHost == None: - Line = "%s,%s %s" %(Host,socket.gethostbyname(Host),I); + if mode and mode == 'authorized_keys': + #Line = 'command="rsync --server --sender -pr . /var/cache/userdir-ldap/hosts/%s",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="%s" %s' % (Host, ",".join(HNames + HostToIP(Host)), I) + Line = 'command="rsync --server --sender -pr . /var/cache/userdir-ldap/hosts/%s",no-port-forwarding,no-X11-forwarding,no-agent-forwarding %s' % (Host,I) else: - Line = "%s,%s,%s %s" %(Host,Host[0:SHost],socket.gethostbyname(Host),I); + Line = "%s %s" %(",".join(HostNames + HostToIP(Host)), I); Line = Sanitize(Line) + "\n"; F.write(Line); # Oops, something unspeakable happened. @@ -498,11 +868,44 @@ 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); + +def GenKeyrings(l,OutDir): + for k in Keyrings: + 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 = string.split(string.strip(F.readline())," "); +Pass = F.readline().strip().split(" ") F.close(); l.simple_bind_s("uid="+Pass[0]+","+BaseDn,Pass[1]); @@ -521,10 +924,15 @@ for x in Attrs: PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\ ["uid","uidNumber","gidNumber","supplementaryGid",\ "gecos","loginShell","userPassword","shadowLastChange",\ - "shadowMin","shadowMax","shadowWarning","shadowinactive", - "shadowexpire","emailForward","latitude","longitude",\ + "shadowMin","shadowMax","shadowWarning","shadowInactive", + "shadowExpire","emailForward","latitude","longitude",\ "allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\ - "keyFingerPrint","privateSub"]); + "keyFingerPrint","privateSub","mailDisableMessage",\ + "mailGreylisting","mailCallout","mailRBL","mailRHSBL",\ + "mailWhitelist", "sudoPassword"]); +# Fetch all the hosts +HostAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\ + ["hostname","sshRSAHostKey"]); # Open the control file if len(sys.argv) == 1: @@ -534,26 +942,36 @@ else: # Generate global things GlobalDir = GenerateDir+"/"; -GenSSHShadow(l,GlobalDir+"ssh-rsa-shadow"); +SSHGlobal, SSHFiles = 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"); +#GenSSHKnown(l,GlobalDir+"authorized_keys", 'authorized_keys'); +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"); +GenKeyrings(l,GlobalDir); # Compatibility. GenForward(l,GlobalDir+"forward-alias"); - + 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; @@ -570,31 +988,109 @@ while(1): GroupList[str(GroupIDMap[I])] = None; Allowed = GroupList; + if Allowed == {}: + Allowed = None CurrentHost = Split[0]; + # If we're using a single SSH file, deal with it + if SSHGlobal is not None: + DoLink(GlobalDir, OutDir, SSHGlobal) + + DoLink(GlobalDir,OutDir,"debianhosts"); + DoLink(GlobalDir,OutDir,"ssh_known_hosts"); + DoLink(GlobalDir,OutDir,"disabled-accounts") + sys.stdout.flush(); - GenPasswd(l,OutDir+"passwd",Split[1]); + if ExtraList.has_key("[NOPASSWD]"): + userlist = GenPasswd(l,OutDir+"passwd",Split[1], "*"); + else: + userlist = GenPasswd(l,OutDir+"passwd",Split[1], "x"); sys.stdout.flush(); - GenGroup(l,OutDir+"group"); - if CurrentHost == "haydn.debian.org": - continue; - GenShadow(l,OutDir+"shadow"); - + 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 + if MultipleSSHFiles: + OldMask = os.umask(0077); + tf = tarfile.open(name=os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), mode='w:gz') + os.umask(OldMask); + for f in userlist.keys(): + if f not in SSHFiles: + continue + # If we're not exporting their primary group, don't export + # the key and warn + grname = None + if userlist[f] in grouprevmap.keys(): + grname = grouprevmap[userlist[f]] + else: + try: + if int(userlist[f]) <= 100: + # In these cases, look it up in the normal way so we + # deal with cases where, for instance, users are in group + # users as their primary group. + grname = grp.getgrgid(userlist[f])[0] + except Exception, e: + pass + + if grname is None: + print "User %s is supposed to have their key exported to host %s but their primary group (gid: %d) isn't in LDAP" % (f, CurrentHost, userlist[f]) + continue + + to = tf.gettarinfo(os.path.join(GlobalDir, 'userkeys', f), f) + # These will only be used where the username doesn't + # exist on the target system for some reason; hence, + # in those cases, the safest thing is for the file to + # be owned by root but group nobody. This deals with + # the bloody obscure case where the group fails to exist + # whilst the user does (in which case we want to avoid + # ending up with a file which is owned user:root to avoid + # a fairly obvious attack vector) + to.uid = 0 + to.gid = 65534 + # Using the username / groupname fields avoids any need + # to give a shit^W^W^Wcare about the UIDoffset stuff. + to.uname = f + to.gname = grname + to.mode = 0400 + tf.addfile(to, file(os.path.join(GlobalDir, 'userkeys', f))) + + tf.close() + os.rename(os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), + os.path.join(OutDir, 'ssh-keys.tar.gz')) + + if ExtraList.has_key("[UNTRUSTED]"): + continue; + 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,"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") + + if ExtraList.has_key("[KEYRING]"): + for k in Keyrings: + DoLink(GlobalDir,OutDir,os.path.basename(k)) + else: + for k in Keyrings: + try: posix.remove(OutDir+os.path.basename(k)); + except: pass;