X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=91d95a7a18aac59d3e6b5e6b9249123de03d38d4;hb=32c616b7a9236fd172ee33c99d3006a49c0d4a10;hp=795816ca0e03594cc5b524fcee843fb89b143df6;hpb=ce64087cfde96cea951f7d016aff0128fb7cf678;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 795816c..91d95a7 100755 --- a/ud-generate +++ b/ud-generate @@ -6,12 +6,13 @@ # 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,2009,2010 Peter Palfrader # Copyright (c) 2008 Andreas Barth # Copyright (c) 2008 Mark Hymers # Copyright (c) 2008 Luk Claes # Copyright (c) 2008 Thomas Viehmann # Copyright (c) 2009 Stephen Gran +# Copyright (c) 2010 Helmut Grohne # # 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 @@ -30,6 +31,10 @@ import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha, shutil, errno, tarfile, grp from userdir_ldap import * from userdir_exceptions import * +try: + from cStringIO import StringIO +except ImportError: + from StringIO import StringIO global Allowed global CurrentHost @@ -48,7 +53,7 @@ EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$") BSMTPCheck = re.compile(".*mx 0 (master)\.debian\.org\..*",re.DOTALL) PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]") IsV6Addr = re.compile("^[a-fA-F0-9:]+$") -IsDebianHost = re.compile("[a-zA-Z0-9\.]+\.debian\.org$") +IsDebianHost = re.compile(ConfModule.dns_hostmatch) DNSZone = ".debian.net" Keyrings = ConfModule.sync_keyrings.split(":") @@ -338,6 +343,8 @@ def GenSSHShadow(): # Oops, something unspeakable happened. except IOError: Die(File, F, None) + # As neither masterFileName nor masterFile are defined at any point + # this will raise a NameError. Die(masterFileName, masterFile, None) raise @@ -385,7 +392,20 @@ def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target): to.uname = f to.gname = grname to.mode = 0400 - tf.addfile(to, file(os.path.join(GlobalDir, 'userkeys', f))) + + contents = file(os.path.join(GlobalDir, 'userkeys', f)).read() + lines = [] + for line in contents.splitlines(): + if line.startswith("allowed_hosts=") and ' ' in line: + machines, line = line.split('=', 1)[1].split(' ', 1) + if CurrentHost not in machines.split(','): + continue # skip this key + lines.append(line) + if not lines: + continue # no keys for this host + contents = "\n".join(lines) + "\n" + to.size = len(contents) + tf.addfile(to, StringIO(contents)) tf.close() os.rename(os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), target) @@ -426,6 +446,7 @@ def GenGroup(File): GroupMap = {} for x in GroupIDMap.keys(): GroupMap[x] = [] + GroupHasPrimaryMembers = {} # Fetch all the users global PasswdAttrs @@ -433,6 +454,8 @@ def GenGroup(File): # Sort them into a list of groups having a set of users for x in PasswdAttrs: uid = GetAttr(x, "uid") + if 'gidNumber' in x[1]: + GroupHasPrimaryMembers[ int(x[1]["gidNumber"][0]) ] = True if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): continue if x[1].has_key("supplementaryGid") == 0: @@ -446,9 +469,14 @@ def GenGroup(File): # Output the group file. J = 0 for x in GroupMap.keys(): - grouprevmap[GroupIDMap[x]] = x if GroupIDMap.has_key(x) == 0: continue + + if len(GroupMap[x]) == 0 and GroupIDMap[x] not in GroupHasPrimaryMembers: + continue + + grouprevmap[GroupIDMap[x]] = x + Line = "%s:x:%u:" % (x, GroupIDMap[x]) Comma = '' for I in GroupMap[x]: @@ -469,8 +497,8 @@ def GenGroup(File): return grouprevmap def CheckForward(): - global DebianUsers - for x in DebianUsers: + global PasswdAttrs + for x in PasswdAttrs: if x[1].has_key("emailForward") == 0: continue @@ -496,10 +524,10 @@ def GenForward(File): os.umask(OldMask) # Fetch all the users - global DebianUsers + global PasswdAttrs # Write out the email address for each user - for x in DebianUsers: + for x in PasswdAttrs: if x[1].has_key("emailForward") == 0: continue @@ -513,18 +541,15 @@ def GenForward(File): raise Done(File, F, None) -def GenCDB(File, Key): +def GenCDB(File, Users, Key): Fdb = None try: OldMask = os.umask(0022) Fdb = os.popen("cdbmake %s %s.tmp"%(File, File), "w") os.umask(OldMask) - # Fetch all the users - global DebianUsers - # Write out the email address for each user - for x in DebianUsers: + for x in Users: if not Key in x[1]: continue Value = GetAttr(x, Key) @@ -546,10 +571,10 @@ def GenMarkers(File): F = open(File + ".tmp", "w") # Fetch all the users - global DebianUsers + global PasswdAttrs # Write out the position for each user - for x in DebianUsers: + for x in PasswdAttrs: if x[1].has_key("latitude") == 0 or x[1].has_key("longitude") == 0: continue try: @@ -572,10 +597,10 @@ def GenPrivate(File): F = open(File + ".tmp", "w") # Fetch all the users - global DebianUsers + global DebianDDUsers # Write out the position for each user - for x in DebianUsers: + for x in DebianDDUsers: if x[1].has_key("privateSub") == 0: continue @@ -637,9 +662,9 @@ def GenMailDisable(File): F = open(File + ".tmp", "w") # Fetch all the users - global DebianUsers + global PasswdAttrs - for x in DebianUsers: + for x in PasswdAttrs: Reason = None if x[1].has_key("mailDisableMessage"): @@ -667,9 +692,9 @@ def GenMailBool(File, Key): F = open(File + ".tmp", "w") # Fetch all the users - global DebianUsers + global PasswdAttrs - for x in DebianUsers: + for x in PasswdAttrs: Reason = None if x[1].has_key(Key) == 0: @@ -698,9 +723,9 @@ def GenMailList(File, Key): F = open(File + ".tmp", "w") # Fetch all the users - global DebianUsers + global PasswdAttrs - for x in DebianUsers: + for x in PasswdAttrs: Reason = None if x[1].has_key(Key) == 0: @@ -753,27 +778,6 @@ def GenDNS(File): try: F = open(File + ".tmp", "w") -# global HostAttrs -# -# for x in HostAttrs: -# if x[1].has_key("hostname") == 0 or \ -# x[1].has_key("architecture") == 0 or\ -# x[1].has_key("sshRSAHostKey") == 0: -# continue -# -# if IsDebianHost.match(GetAttr(x, "hostname")) is not None: -# continue -# -# DNSInfo = ExtractDNSInfo(x) -# start = True -# for Line in DNSInfo: -# if start == True: -# Line = "%s.\t%s" % (GetAttr(x, "hostname"), Line) -# start = False -# else: -# Line = "\t\t\t%s" % (Line) -# F.write(Line + "\n") - # Fetch all the users global PasswdAttrs @@ -835,25 +839,26 @@ def ExtractDNSInfo(x): else: DNSInfo.append("%sIN\tA\t%s" % (TTLprefix, I)) - Host = GetAttr(x, "hostname") - Arch = GetAttr(x, "architecture") 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() - DNSInfo.append("%sIN\tSSHFP\t%u 1 %s" % (TTLprefix, Algorithm, Fingerprint)) + if 'sshRSAHostKey' in x[1]: + 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() + DNSInfo.append("%sIN\tSSHFP\t%u 1 %s" % (TTLprefix, Algorithm, Fingerprint)) - Mach = "" - if x[1].has_key("machine"): - Mach = " " + GetAttr(x, "machine") - DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian GNU/Linux")) + if 'architecture' in x[1]: + Arch = GetAttr(x, "architecture") + Mach = "" + if x[1].has_key("machine"): + Mach = " " + GetAttr(x, "machine") + DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian GNU/Linux")) if x[1].has_key("mXRecord"): for I in x[1]["mXRecord"]: @@ -871,9 +876,7 @@ def GenZoneRecords(File): global HostAttrs for x in HostAttrs: - if x[1].has_key("hostname") == 0 or \ - x[1].has_key("architecture") == 0 or\ - x[1].has_key("sshRSAHostKey") == 0: + if x[1].has_key("hostname") == 0: continue if IsDebianHost.match(GetAttr(x, "hostname")) is None: @@ -903,10 +906,10 @@ def GenBSMTP(File, HomePrefix): F = open(File + ".tmp", "w") # Fetch all the users - global DebianUsers + global PasswdAttrs # Write out the zone file entry for each user - for x in DebianUsers: + for x in PasswdAttrs: if x[1].has_key("dnsZoneEntry") == 0: continue @@ -993,7 +996,6 @@ def GenSSHKnown(File, mode=None): if 'sshdistAuthKeysHost' in x[1]: hosts += x[1]['sshdistAuthKeysHost'] 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(hosts), 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(x, False)), I) Line = Sanitize(Line) + "\n" @@ -1095,14 +1097,13 @@ GlobalDir = GenerateDir + "/" GenDisabledAccounts(GlobalDir + "disabled-accounts") PasswdAttrs = filter(lambda x: not IsRetired(x), PasswdAttrs) -#DebianUsers = filter(lambda x: IsGidDebian(x), PasswdAttrs) -DebianUsers = PasswdAttrs +DebianDDUsers = filter(lambda x: IsGidDebian(x), PasswdAttrs) CheckForward() GenMailDisable(GlobalDir + "mail-disable") -GenCDB(GlobalDir + "mail-forward.cdb", 'emailForward') -GenCDB(GlobalDir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction') +GenCDB(GlobalDir + "mail-forward.cdb", PasswdAttrs, 'emailForward') +GenCDB(GlobalDir + "mail-contentinspectionaction.cdb", PasswdAttrs, 'mailContentInspectionAction') GenPrivate(GlobalDir + "debian-private") GenSSHKnown(GlobalDir+"authorized_keys", 'authorized_keys') GenMailBool(GlobalDir + "mail-greylist", "mailGreylisting") @@ -1184,6 +1185,9 @@ for host in HostAttrs: DoLink(GlobalDir, OutDir, "mail-rbl") DoLink(GlobalDir, OutDir, "mail-rhsbl") DoLink(GlobalDir, OutDir, "mail-whitelist") + GenCDB(OutDir + "user-forward.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'emailForward') + GenCDB(OutDir + "batv-tokens.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'bATVToken') + GenCDB(OutDir + "default-mail-options.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'mailDefaultOptions') # Compatibility. DoLink(GlobalDir, OutDir, "forward-alias")