X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=17e54b31500bb0a4e0f22d6b36f3d7ef98061e4a;hb=3104028493422257dbb8583d6f3e61f87c2bdb08;hp=55d05cf8ef5cf769747966696faf5d27490ce9a7;hpb=0681e6e93d9d21b85a67c4a4b81a9bd3dde848a5;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 55d05cf..17e54b3 100755 --- a/ud-generate +++ b/ud-generate @@ -6,6 +6,9 @@ # 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 @@ -21,7 +24,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, base64, sha +import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha, shutil, errno, tarfile, grp from userdir_ldap import *; global Allowed; @@ -35,9 +38,28 @@ CurrentHost = ""; EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$"); 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); @@ -93,6 +115,7 @@ def GenPasswd(l,File,HomePrefix,PwdMarker): try: F = open(File + ".tdb.tmp","w"); + userlist = {} # Fetch all the users global PasswdAttrs; if PasswdAttrs == None: @@ -107,6 +130,7 @@ def GenPasswd(l,File,HomePrefix,PwdMarker): if len(GetAttr(x,"gecos")) > 100 or len(GetAttr(x,"loginShell")) > 50: continue; + 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"),\ @@ -125,6 +149,9 @@ def GenPasswd(l,File,HomePrefix,PwdMarker): 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; @@ -151,16 +178,16 @@ def GenShadow(l,File): # 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 (string.find(GetAttr(x,"userPassword"),"*LK*") != -1) \ + if (GetAttr(x,"userPassword").find("*LK*") != -1) \ or GetAttr(x,"userPassword").startswith("!"): ShadowExpire = '1' else: - ShadowExpire = GetAttr(x,"shadowexpire") + 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,"shadowWarning"),GetAttr(x,"shadowInactive"),\ ShadowExpire); Line = Sanitize(Line) + "\n"; F.write("0%u %s" % (I,Line)); @@ -174,42 +201,81 @@ def GenShadow(l,File): Done(File,None,F); # Generate the shadow list -def GenSSHShadow(l,File): - F = None; - try: - OldMask = os.umask(0077); - F = open(File + ".tmp","w",0600); - os.umask(OldMask); - +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"); @@ -240,6 +306,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]); @@ -259,6 +326,8 @@ def GenGroup(l,File): raise; Done(File,None,F); + return grouprevmap + # Generate the email forwarding list def GenForward(l,File): F = None; @@ -375,7 +444,7 @@ 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; @@ -420,7 +489,7 @@ def GenDisabledAccounts(l,File): Line = "" # *LK* is the reference value for a locked account # password starting with ! is also a locked account - if string.find(Pass,"*LK*") != -1 or Pass.startswith("!"): + if Pass.find("*LK*") != -1 or Pass.startswith("!"): # Format is : Line = "%s:%s" % (GetAttr(x,"uid"), "Account is locked") @@ -446,18 +515,11 @@ def GenMailDisable(l,File): for x in PasswdAttrs: Reason = None - - # If the account is locked, disable incoming mail - if (string.find(GetAttr(x,"userPassword"),"*LK*") != -1): - if GetAttr(x,"uid") == "luther": - continue - else: - Reason = "user account locked" + + if x[1].has_key("mailDisableMessage"): + Reason = GetAttr(x,"mailDisableMessage") else: - if x[1].has_key("mailDisableMessage"): - Reason = GetAttr(x,"mailDisableMessage") - else: - continue + continue # Must be in the Debian group (yuk, hard coded for now) if GetAttr(x,"gidNumber") != "800": @@ -587,12 +649,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; @@ -600,7 +662,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)); @@ -638,7 +700,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': @@ -676,12 +738,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: @@ -698,8 +760,26 @@ def GenBSMTP(l,File,HomePrefix): raise; Done(File,F,None); +# 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): +def GenSSHKnown(l,File,mode=None): F = None; try: OldMask = os.umask(0022); @@ -715,12 +795,16 @@ def GenSSHKnown(l,File): 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. @@ -759,10 +843,14 @@ def GenHosts(l,File): 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); 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]); @@ -781,8 +869,8 @@ 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","mailDisableMessage",\ "mailGreylisting","mailCallout","mailRBL","mailRHSBL",\ @@ -799,12 +887,13 @@ 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"); @@ -812,21 +901,22 @@ 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; @@ -847,23 +937,77 @@ while(1): Allowed = None CurrentHost = Split[0]; - DoLink(GlobalDir,OutDir,"ssh-rsa-shadow"); + # 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(); if ExtraList.has_key("[NOPASSWD]"): - GenPasswd(l,OutDir+"passwd",Split[1], "*"); + userlist = GenPasswd(l,OutDir+"passwd",Split[1], "*"); else: - GenPasswd(l,OutDir+"passwd",Split[1], "x"); + userlist = GenPasswd(l,OutDir+"passwd",Split[1], "x"); sys.stdout.flush(); - GenGroup(l,OutDir+"group"); + grouprevmap = GenGroup(l,OutDir+"group"); + + # 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; + continue; if not ExtraList.has_key("[NOPASSWD]"): GenShadow(l,OutDir+"shadow"); - + # Link in global things DoLink(GlobalDir,OutDir,"markers"); DoLink(GlobalDir,OutDir,"mail-forward.cdb"); @@ -886,3 +1030,11 @@ while(1): if ExtraList.has_key("[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;