X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=f1ed0b06313f89aa670ead1a0ba147d15257b391;hb=be971636d402d3a488109573c9f1ed1e63cea40c;hp=deaf8c08db1cc0b50108c48295b234d075922c62;hpb=0cc7a5358db553d1259a32fe4434bb59e9353e12;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index deaf8c0..f1ed0b0 100755 --- a/ud-generate +++ b/ud-generate @@ -9,6 +9,8 @@ # Copyright (c) 2008 Peter Palfrader # Copyright (c) 2008 Andreas Barth # Copyright (c) 2008 Mark Hymers +# Copyright (c) 2008 Luk Claes +# Copyright (c) 2008 Thomas Viehmann # # 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 @@ -32,6 +34,7 @@ global CurrentHost; PasswdAttrs = None; GroupIDMap = {}; +SubGroupMap = {}; Allowed = None; CurrentHost = ""; @@ -39,6 +42,7 @@ 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); +PurposeHostField = re.compile(r"\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]") DNSZone = ".debian.net" Keyrings = ConfModule.sync_keyrings.split(":") @@ -87,9 +91,10 @@ def IsInGroup(DnRecord): if DnRecord[1].has_key("supplementaryGid") == 0: return 0; - # Check the supplementary groups - for I in DnRecord[1]["supplementaryGid"]: - if Allowed.has_key(I): + supgroups=[] + addGroups(supgroups, DnRecord[1]["supplementaryGid"], GetAttr(DnRecord,"uid")) + for g in supgroups: + if Allowed.has_key(g): return 1; return 0; @@ -230,7 +235,7 @@ def GenShadowSudo(l,File, untrusted): hosts = Match.group(3) cryptedpass = Match.group(4) - if status != 'confirmed:'+make_sudopasswd_hmac('password-is-confirmed', uuid, hosts, cryptedpass): + if status != 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', x[1]['uid'][0], uuid, hosts, cryptedpass): continue for_all = hosts == "*" for_this_host = CurrentHost in hosts.split(',') @@ -256,30 +261,17 @@ def GenShadowSudo(l,File, untrusted): Done(File,F,None); # Generate the shadow list -def GenSSHShadow(l,masterFileName): +def GenSSHShadow(l): # 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')) + 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. @@ -296,25 +288,18 @@ def GenSSHShadow(l,masterFileName): 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); + 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)) + MultipleLine = "%s" % I + MultipleLine = Sanitize(MultipleLine) + "\n" + F.write(MultipleLine) + + Done(File,F,None); + userfiles.append(os.path.basename(File)) # Oops, something unspeakable happened. except IOError: @@ -322,11 +307,79 @@ def GenSSHShadow(l,masterFileName): Die(masterFileName,masterFile,None) raise; - if SingleSSHFile: - Done(masterFileName,masterFile,None) - singlefile = os.path.basename(masterFileName) + return userfiles + +def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target): + 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), target) + +# add a list of groups to existing groups, +# including all subgroups thereof, recursively. +# basically this proceduces the transitive hull of the groups in +# addgroups. +def addGroups(existingGroups, newGroups, uid): + for group in newGroups: + # if it's a @host, split it and verify it's on the current host. + s = group.split('@', 1) + if len(s) == 2 and s[1] != CurrentHost: + continue; + group = s[0] + + # let's see if we handled this group already + if group in existingGroups: + continue + + if not GroupIDMap.has_key(group): + print "Group", group, "does not exist but", uid, "is in it" + continue + + existingGroups.append(group) - return singlefile, userfiles + if SubGroupMap.has_key(group): + addGroups(existingGroups, SubGroupMap[group], uid) # Generate the group list def GenGroup(l,File): @@ -347,16 +400,16 @@ def GenGroup(l,File): # Sort them into a list of groups having a set of users for x in PasswdAttrs: + uid = GetAttr(x,"uid") if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0: continue; if x[1].has_key("supplementaryGid") == 0: continue; - for I in x[1]["supplementaryGid"]: - if GroupMap.has_key(I): - GroupMap[I].append(GetAttr(x,"uid")); - else: - print "Group does not exist ",I,"but",GetAttr(x,"uid"),"is in it"; + supgroups=[] + addGroups(supgroups, x[1]["supplementaryGid"], uid) + for g in supgroups: + GroupMap[g].append(uid); # Output the group file. J = 0; @@ -851,8 +904,27 @@ def GenSSHKnown(l,File,mode=None): continue; Host = GetAttr(x,"hostname"); HostNames = [ Host ] - SHost = Host.find(".") - if SHost != None: HostNames += [Host[0:SHost]] + if Host.endswith(HostDomain): + HostNames.append(Host[:-(len(HostDomain)+1)]) + + # in the purpose field [[host|some other text]] (where some other text is optional) + # makes a hyperlink on the web thing. we now also add these hosts to the ssh known_hosts + # file. But so that we don't have to add everything we link we can add an asterisk + # and say [[*... to ignore it. In order to be able to add stuff to ssh without + # http linking it we also support [[-hostname]] entries. + for i in x[1].get("purpose",[]): + m = PurposeHostField.match(i) + if m: + m = m.group(1) + # we ignore [[*..]] entries + if m.startswith('*'): + continue; + if m.startswith('-'): + m = m[1:] + if m: + HostNames.append(m) + if m.endswith(HostDomain): + HostNames.append(m[:-(len(HostDomain)+1)]) for I in x[1]["sshRSAHostKey"]: if mode and mode == 'authorized_keys': @@ -902,6 +974,7 @@ def GenKeyrings(l,OutDir): for k in Keyrings: shutil.copy(k, OutDir) + # Connect to the ldap server l = connectLDAP() F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r"); @@ -912,13 +985,15 @@ l.simple_bind_s("uid="+Pass[0]+","+BaseDn,Pass[1]); # Fetch all the groups GroupIDMap = {}; Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"gid=*",\ - ["gid","gidNumber"]); + ["gid","gidNumber","subGroup"]); -# Generate the GroupMap and GroupIDMap +# Generate the SubGroupMap and GroupIDMap for x in Attrs: if x[1].has_key("gidNumber") == 0: continue; GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidNumber"][0]); + if x[1].has_key("subGroup") != 0: + SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"]); # Fetch all the users PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\ @@ -932,7 +1007,7 @@ PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\ "mailWhitelist", "sudoPassword"]); # Fetch all the hosts HostAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\ - ["hostname","sshRSAHostKey"]); + ["hostname","sshRSAHostKey","purpose"]); # Open the control file if len(sys.argv) == 1: @@ -942,7 +1017,7 @@ else: # Generate global things GlobalDir = GenerateDir+"/"; -SSHGlobal, SSHFiles = GenSSHShadow(l,GlobalDir+"ssh-rsa-shadow"); +SSHFiles = GenSSHShadow(l); GenAllForward(l,GlobalDir+"mail-forward.cdb"); GenMarkers(l,GlobalDir+"markers"); GenPrivate(l,GlobalDir+"debian-private"); @@ -992,10 +1067,6 @@ while(1): 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") @@ -1011,61 +1082,17 @@ while(1): # 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')) + GenSSHtarballs(userlist, SSHFiles, grouprevmap, os.path.join(OutDir, 'ssh-keys.tar.gz')) if ExtraList.has_key("[UNTRUSTED]"): + print "[UNTRUSTED] tag is obsolete and may be removed in the future." continue; if not ExtraList.has_key("[NOPASSWD]"): GenShadow(l,OutDir+"shadow"); # Link in global things - DoLink(GlobalDir,OutDir,"markers"); + if not ExtraList.has_key("[NOMARKERS]"): + DoLink(GlobalDir,OutDir,"markers"); DoLink(GlobalDir,OutDir,"mail-forward.cdb"); DoLink(GlobalDir,OutDir,"mail-disable"); DoLink(GlobalDir,OutDir,"mail-greylist");