X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=1782f096b9eb93c75008b4799f53d11cbe93b22b;hb=14908ffbe8886fdd85bf143ef14200e0171c18cd;hp=726c92d3877a265c6248c2bb1cbd6c4d43265676;hpb=1d3b3d39d8d9ff64df9b9569e0dc742f98a64147;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 726c92d..1782f09 100755 --- a/ud-generate +++ b/ud-generate @@ -7,6 +7,8 @@ # 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 @@ -22,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, shutil, errno, tarfile +import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha, shutil, errno, tarfile, grp from userdir_ldap import *; global Allowed; @@ -33,11 +35,12 @@ 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 (gluck)\.debian\.org\..*",re.DOTALL); DNSZone = ".debian.net" -Keyrings = [ "/org/keyring.debian.org/keyrings/debian-keyring.gpg", - "/org/keyring.debian.org/keyrings/debian-keyring.pgp" ] +Keyrings = ConfModule.sync_keyrings.split(":") def safe_makedirs(dir): try: @@ -114,7 +117,7 @@ def GenPasswd(l,File,HomePrefix,PwdMarker): try: F = open(File + ".tdb.tmp","w"); - userlist = [] + userlist = {} # Fetch all the users global PasswdAttrs; if PasswdAttrs == None: @@ -129,7 +132,7 @@ def GenPasswd(l,File,HomePrefix,PwdMarker): if len(GetAttr(x,"gecos")) > 100 or len(GetAttr(x,"loginShell")) > 50: continue; - userlist.append(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"),\ @@ -181,12 +184,12 @@ def GenShadow(l,File): 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)); @@ -199,6 +202,59 @@ def GenShadow(l,File): raise; Done(File,None,F); +# Generate the sudo passwd file +def GenShadowSudo(l,File): + F = None; + try: + OldMask = os.umask(0077); + F = open(File + ".tmp","w",0600); + os.umask(OldMask); + + # Fetch all the users + global PasswdAttrs; + 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 @@ -274,6 +330,7 @@ def GenSSHShadow(l,masterFileName): # Generate the group list def GenGroup(l,File): + grouprevmap = {} F = None; try: F = open(File + ".tdb.tmp","w"); @@ -304,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]); @@ -323,6 +381,8 @@ def GenGroup(l,File): raise; Done(File,None,F); + return grouprevmap + # Generate the email forwarding list def GenForward(l,File): F = None; @@ -510,18 +570,11 @@ def GenMailDisable(l,File): 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" + + 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": @@ -762,8 +815,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); @@ -783,19 +854,12 @@ def GenSSHKnown(l,File): SHost = Host.find(".") if SHost != None: HostNames += [Host[0:SHost]] - IPAdressesT = None - IPAdresses = [] - # get IP adresses back as "proto adress" to distinguish between v4 and v6 - try: - IPAdressesT = set([ (a[0],a[4][0]) for a in socket.getaddrinfo(Host, None)]) - except: - if code[0] != -2: raise - for addr in IPAdressesT: - if addr[0] == socket.AF_INET: IPAdresses += [addr[1], "::ffff:"+addr[1]] - else: IPAdresses += [addr[1]] - for I in x[1]["sshRSAHostKey"]: - Line = "%s %s" %(",".join(HostNames + IPAdresses), 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" %(",".join(HostNames + HostToIP(Host)), I); Line = Sanitize(Line) + "\n"; F.write(Line); # Oops, something unspeakable happened. @@ -839,7 +903,7 @@ def GenKeyrings(l,OutDir): 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 = F.readline().strip().split(" ") F.close(); @@ -860,12 +924,12 @@ 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",\ - "mailWhitelist"]); + "mailWhitelist", "sudoPassword"]); # Fetch all the hosts HostAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\ ["hostname","sshRSAHostKey"]); @@ -884,6 +948,7 @@ 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"); @@ -941,37 +1006,64 @@ while(1): else: userlist = GenPasswd(l,OutDir+"passwd",Split[1], "x"); sys.stdout.flush(); - GenGroup(l,OutDir+"group"); - if ExtraList.has_key("[UNTRUSTED]"): - continue; - if not ExtraList.has_key("[NOPASSWD]"): - 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') - for f in userlist: + 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. + # 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 = 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 = "nobody" - to.mode = 0600 + 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,"markers"); DoLink(GlobalDir,OutDir,"mail-forward.cdb");