X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=5d46963cd942376d47db291c1dcb7ace53274ae8;hb=4d4ea5e8539d9139b8e417cbc566b582d0c2564c;hp=887176ccf0b98c4486010294d6fd0813b960755f;hpb=360ebdcf8443f1fc2b4ca03a4ac3246d078dc8f6;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 887176c..5d46963 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,10 +31,19 @@ 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 * +import UDLdap +try: + from cStringIO import StringIO +except ImportError: + from StringIO import StringIO global Allowed global CurrentHost +if os.getuid() == 0: + sys.stderr.write("You should probably not run ud-generate as root.\n") + sys.exit(1) + PasswdAttrs = None DebianUsers = None DisabledUsers = [] @@ -48,7 +58,8 @@ 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) +isSSHFP = re.compile("^\s*IN\s+SSHFP") DNSZone = ".debian.net" Keyrings = ConfModule.sync_keyrings.split(":") @@ -173,29 +184,30 @@ def GenPasswd(File, HomePrefix, PwdMarker): userlist = {} # Fetch all the users global PasswdAttrs - - I = 0 + + i = 0 for x in PasswdAttrs: - if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): - continue - + a = UDLdap.Account(x[0], x[1]) + if not IsInGroup(x): continue + # Do not let people try to buffer overflow some busted passwd parser. - 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"),\ - GetAttr(x, "gecos"), HomePrefix, GetAttr(x, "uid"),\ - GetAttr(x, "loginShell")) - - Line = Sanitize(Line) + "\n" - F.write("0%u %s" % (I, Line)) - F.write(".%s %s" % (GetAttr(x, "uid"), Line)) - F.write("=%s %s" % (GetAttr(x, "uidNumber"), Line)) - I = I + 1 - + if len(a['gecos']) > 100 or len(a['loginShell']) > 50: continue + + userlist[a['uid']] = a['gidNumber'] + line = "%s:%s:%d:%d:%s:%s%s:%s" % ( + a['uid'], + PwdMarker, + a['uidNumber'], + a['gidNumber'], + a['gecos'], + HomePrefix, a['uid'], + a['loginShell']) + line = Sanitize(line) + "\n" + F.write("0%u %s" % (i, line)) + F.write(".%s %s" % (a['uid'], line)) + F.write("=%d %s" % (a['uidNumber'], line)) + i = i + 1 + # Oops, something unspeakable happened. except: Die(File, None, F) @@ -216,35 +228,30 @@ def GenShadow(File): # Fetch all the users global PasswdAttrs - I = 0 + i = 0 for x in PasswdAttrs: - if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): - continue - - Pass = GetAttr(x, "userPassword") - if Pass[0:7] != "{crypt}" or len(Pass) > 50: - Pass = '*' - else: - Pass = Pass[7:] - + a = UDLdap.Account(x[0], x[1]) + if not IsInGroup(x): continue + # 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"),\ - ShadowExpire) - Line = Sanitize(Line) + "\n" - F.write("0%u %s" % (I, Line)) - F.write(".%s %s" % (GetAttr(x, "uid"), Line)) - I = I + 1 - + if not a.pw_active(): ShadowExpire = '1' + elif 'shadowExpire' in a: ShadowExpire = str(a['shadowExpire']) + else: ShadowExpire = '' + + values = [] + values.append(a['uid']) + values.append(a.get_password()) + for key in 'shadowLastChange', 'shadowMin', 'shadowMax', 'shadowWarning', 'shadowInactive': + if key in a: values.append(a[key]) + else: values.append('') + values.append(ShadowExpire) + line = ':'.join(values)+':' + line = Sanitize(line) + "\n" + F.write("0%u %s" % (i, line)) + F.write(".%s %s" % (a['uid'], line)) + i = i + 1 + # Oops, something unspeakable happened. except: Die(File, None, F) @@ -263,12 +270,12 @@ def GenShadowSudo(File, untrusted): global PasswdAttrs for x in PasswdAttrs: + a = UDLdap.Account(x[0], x[1]) Pass = '*' - if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): - continue + if not IsInGroup(x): continue - if x[1].has_key('sudoPassword'): - for entry in x[1]['sudoPassword']: + if 'sudoPassword' in a: + for entry in a['sudoPassword']: Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry) if Match == None: continue @@ -277,7 +284,7 @@ def GenShadowSudo(File, untrusted): hosts = Match.group(3) cryptedpass = Match.group(4) - if status != 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', x[1]['uid'][0], uuid, hosts, cryptedpass): + if status != 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', a['uid'], uuid, hosts, cryptedpass): continue for_all = hosts == "*" for_this_host = CurrentHost in hosts.split(',') @@ -292,7 +299,7 @@ def GenShadowSudo(File, untrusted): if len(Pass) > 50: Pass = '*' - Line = "%s:%s" % (GetAttr(x, "uid"), Pass) + Line = "%s:%s" % (a['uid'], Pass) Line = Sanitize(Line) + "\n" F.write("%s" % (Line)) @@ -313,21 +320,17 @@ def GenSSHShadow(): safe_makedirs(os.path.join(GlobalDir, 'userkeys')) for x in PasswdAttrs: + a = UDLdap.Account(x[0], x[1]) + if not 'sshRSAAuthKey' in a: continue - if x[1].has_key("uidNumber") == 0 or \ - x[1].has_key("sshRSAAuthKey") == 0: - continue - - User = GetAttr(x, "uid") F = None - try: OldMask = os.umask(0077) - File = os.path.join(GlobalDir, 'userkeys', User) + File = os.path.join(GlobalDir, 'userkeys', a['uid']) F = open(File + ".tmp", "w", 0600) os.umask(OldMask) - for I in x[1]["sshRSAAuthKey"]: + for I in a['sshRSAAuthKey']: MultipleLine = "%s" % I MultipleLine = Sanitize(MultipleLine) + "\n" F.write(MultipleLine) @@ -338,6 +341,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 +390,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,29 +444,34 @@ def GenGroup(File): GroupMap = {} for x in GroupIDMap.keys(): GroupMap[x] = [] + GroupHasPrimaryMembers = {} # Fetch all the users global PasswdAttrs # 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 not IsInGroup(x): - continue - if x[1].has_key("supplementaryGid") == 0: - continue - + a = UDLdap.Account(x[0], x[1]) + GroupHasPrimaryMembers[ a['gidNumber'] ] = True + if not IsInGroup(x): continue + if not 'supplementaryGid' in a: continue + supgroups=[] - addGroups(supgroups, x[1]["supplementaryGid"], uid) + addGroups(supgroups, a['supplementaryGid'], a['uid']) for g in supgroups: - GroupMap[g].append(uid) - + GroupMap[g].append(a['uid']) + # 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 +492,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,14 +519,13 @@ 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: - if x[1].has_key("emailForward") == 0: - continue - - Line = "%s: %s" % (GetAttr(x, "uid"), GetAttr(x, "emailForward")) + for x in PasswdAttrs: + a = UDLdap.Account(x[0], x[1]) + if not 'emailForward' in a: continue + Line = "%s: %s" % (a['uid'], a['emailForward']) Line = Sanitize(Line) + "\n" F.write(Line) @@ -513,23 +535,20 @@ 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: - if not Key in x[1]: - continue - Value = GetAttr(x, Key) - User = GetAttr(x, "uid") - Fdb.write("+%d,%d:%s->%s\n" % (len(User), len(Value), User, Value)) + for x in Users: + a = UDLdap.Account(x[0], x[1]) + if not key in a: continue + value = a[key] + user = a['uid'] + Fdb.write("+%d,%d:%s->%s\n" % (len(user), len(value), user, value)) Fdb.write("\n") # Oops, something unspeakable happened. @@ -546,14 +565,14 @@ 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: - if x[1].has_key("latitude") == 0 or x[1].has_key("longitude") == 0: - continue + for x in PasswdAttrs: + a = UDLdap.Account(x[0], x[1]) + if not ('latitude' in a and 'longitude' in a): continue try: - Line = "%8s %8s \"\""%(DecDegree(GetAttr(x, "latitude"), 1), DecDegree(GetAttr(x, "longitude"), 1)) + Line = "%8s %8s \"\""%(a.latitude_dec(True), a.longitude_dec(True)) Line = Sanitize(Line) + "\n" F.write(Line) except: @@ -572,19 +591,15 @@ 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: - if x[1].has_key("privateSub") == 0: - continue - - # If the account has no PGP key, do not write it - if x[1].has_key("keyFingerPrint") == 0: - continue - + for x in DebianDDUsers: + a = UDLdap.Account(x[0], x[1]) + if not a.is_active_user(): continue + if not 'privateSub' in a: continue try: - Line = "%s"%(GetAttr(x, "privateSub")) + Line = "%s"%(a['privateSub']) Line = Sanitize(Line) + "\n" F.write(Line) except: @@ -608,22 +623,12 @@ def GenDisabledAccounts(File): 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") - DisabledUsers.append(x) - - if Line != "": - F.write(Sanitize(Line) + "\n") - - + a = UDLdap.Account(x[0], x[1]) + if a.pw_active(): continue + Line = "%s:%s" % (a['uid'], "Account is locked") + DisabledUsers.append(x) + F.write(Sanitize(Line) + "\n") + # Oops, something unspeakable happened. except: Die(File, F, None) @@ -637,22 +642,14 @@ def GenMailDisable(File): F = open(File + ".tmp", "w") # Fetch all the users - global DebianUsers - - for x in DebianUsers: - Reason = None - - if x[1].has_key("mailDisableMessage"): - Reason = GetAttr(x, "mailDisableMessage") - else: - continue + global PasswdAttrs - try: - Line = "%s: %s"%(GetAttr(x, "uid"), Reason) - Line = Sanitize(Line) + "\n" - F.write(Line) - except: - pass + for x in PasswdAttrs: + a = UDLdap.Account(x[0], x[1]) + if not 'mailDisableMessage' in a: continue + Line = "%s: %s"%(a['uid'], a['mailDisableMessage']) + Line = Sanitize(Line) + "\n" + F.write(Line) # Oops, something unspeakable happened. except: @@ -661,30 +658,22 @@ def GenMailDisable(File): Done(File, F, None) # Generate a list of uids that should have boolean affects applied -def GenMailBool(File, Key): +def GenMailBool(File, key): F = None try: F = open(File + ".tmp", "w") # Fetch all the users - global DebianUsers - - for x in DebianUsers: - Reason = None - - if x[1].has_key(Key) == 0: - continue - - if GetAttr(x, Key) != "TRUE": - continue + global PasswdAttrs - try: - Line = "%s"%(GetAttr(x, "uid")) - Line = Sanitize(Line) + "\n" - F.write(Line) - except: - pass - + for x in PasswdAttrs: + a = UDLdap.Account(x[0], x[1]) + if not key in a: continue + if not a[key] == 'TRUE': continue + Line = "%s"%(a['uid']) + Line = Sanitize(Line) + "\n" + F.write(Line) + # Oops, something unspeakable happened. except: Die(File, F, None) @@ -692,60 +681,36 @@ def GenMailBool(File, Key): Done(File, F, None) # Generate a list of hosts for RBL or whitelist purposes. -def GenMailList(File, Key): +def GenMailList(File, key): F = None try: F = open(File + ".tmp", "w") # Fetch all the users - global DebianUsers - - for x in DebianUsers: - Reason = None - - if x[1].has_key(Key) == 0: - 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" + global PasswdAttrs - if Line != None: - Line = Sanitize(Line) + "\n" - F.write(Line) - except: - pass - + if key == "mailWhitelist": validregex = re.compile('^[-\w.]+(/[\d]+)?$') + else: validregex = re.compile('^[-\w.]+$') + + for x in PasswdAttrs: + a = UDLdap.Account(x[0], x[1]) + if not key in a: continue + + filtered = filter(lambda z: validregex.match(z), a[key]) + if len(filtered) == 0: continue + if key == "mailRHSBL": filtered = map(lambda z: z+"/$sender_address_domain", filtered) + line = a['uid'] + ': ' + ' : '.join(filtered) + line = Sanitize(line) + "\n" + F.write(line) + # Oops, something unspeakable happened. except: Die(File, F, None) raise Done(File, F, None) -def isRoleAccount(pwEntry): - if not pwEntry.has_key("objectClass"): - raise "pwEntry has no objectClass" - oc = pwEntry['objectClass'] - try: - i = oc.index('debianRoleAccount') - return True - except ValueError: - return False +def isRoleAccount(account): + return 'debianRoleAccount' in account['objectClass'] # Generate the DNS Zone file def GenDNS(File): @@ -753,37 +718,19 @@ 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 - - print "%s %s" % (GetAttr(x, "hostname"), IsDebianHost.match(GetAttr(x, "hostname"))) - if IsDebianHost.match(GetAttr(x, "hostname")) is not None: - continue - - DNSInfo = ExtractDNSInfo(x) - for Line in DNSInfo: - Line = Sanitize(Line) + "\n" - F.write(Line) - # Fetch all the users global PasswdAttrs + RRs = {} # Write out the zone file entry for each user 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 and not isRoleAccount(x[1]): - continue + a = UDLdap.Account(x[0], x[1]) + if not 'dnsZoneEntry' in a: continue + if not a.is_active_user() and not isRoleAccount(a): continue + try: - F.write("; %s\n"%(EmailAddress(x))) - for z in x[1]["dnsZoneEntry"]: + F.write("; %s\n"%(a.email_address())) + for z in a["dnsZoneEntry"]: Split = z.lower().split() if Split[1].lower() == 'in': for y in range(0, len(Split)): @@ -797,18 +744,22 @@ def GenDNS(File): F.write("; Has BSMTP\n") # Write some identification information - 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)) - F.write(Line) + if not RRs.has_key(Host): + if Split[2].lower() in ["a", "aaaa"]: + Line = "%s IN TXT \"%s\"\n"%(Split[0], a.email_address()) + for y in a["keyFingerPrint"]: + Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0], FormatPGPKey(y)) + F.write(Line) + RRs[Host] = 1 else: Line = "; Err %s"%(str(Split)) F.write(Line) F.write("\n") - except: - F.write("; Errors\n") + except Exception, e: + F.write("; Errors:\n") + for line in str(e).split("\n"): + F.write("; %s\n"%(line)) pass # Oops, something unspeakable happened. @@ -819,37 +770,42 @@ def GenDNS(File): def ExtractDNSInfo(x): - DNSInfo = [] - 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("%s. IN SSHFP %u 1 %s" % (Host, Algorithm, Fingerprint)) - - Mach = "" - if x[1].has_key("machine"): - Mach = " " + GetAttr(x, "machine") - DNSInfo.append("%s. IN HINFO \"%s%s\" \"%s\"" % (Host, Arch, Mach, "Debian GNU/Linux")) + TTLprefix="\t" + if 'dnsTTL' in x[1]: + TTLprefix="%s\t"%(x[1]["dnsTTL"][0]) + DNSInfo = [] if x[1].has_key("ipHostNumber"): for I in x[1]["ipHostNumber"]: if IsV6Addr.match(I) != None: - DNSInfo.append("%s. IN AAAA %s" % (Host, I)) + DNSInfo.append("%sIN\tAAAA\t%s" % (TTLprefix, I)) else: - DNSInfo.append("%s. IN A %s" % (Host, I)) + DNSInfo.append("%sIN\tA\t%s" % (TTLprefix, I)) + + Algorithm = None + + 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)) + + 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"]: - DNSInfo.append("%s. IN MX %s" % (Host, I)) + DNSInfo.append("%sIN\tMX\t%s" % (TTLprefix, I)) return DNSInfo @@ -863,18 +819,45 @@ 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: continue DNSInfo = ExtractDNSInfo(x) + start = True for Line in DNSInfo: - Line = Sanitize(Line) + "\n" - F.write(Line) + if start == True: + Line = "%s.\t%s" % (GetAttr(x, "hostname"), Line) + start = False + else: + Line = "\t\t\t%s" % (Line) + + F.write(Line + "\n") + + # this would write sshfp lines for services on machines + # but we can't yet, since some are cnames and we'll make + # an invalid zonefile + # + # 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: + # if not m.endswith(HostDomain): + # continue + # if not m.endswith('.'): + # m = m + "." + # for Line in DNSInfo: + # if isSSHFP.match(Line): + # Line = "%s\t%s" % (m, Line) + # F.write(Line + "\n") # Oops, something unspeakable happened. except: @@ -889,10 +872,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 @@ -923,26 +906,17 @@ def GenBSMTP(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 = [] - if not IPAdressesT is None: - 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] +def HostToIP(Host, mapped=True): + + IPAdresses = [] + + if Host[1].has_key("ipHostNumber"): + for addr in Host[1]["ipHostNumber"]: + IPAdresses.append(addr) + if IsV6Addr.match(addr) is None and mapped == "True": + IPAdresses.append("::ffff:"+addr) + + return IPAdresses # Generate the ssh known hosts file def GenSSHKnown(File, mode=None): @@ -984,10 +958,12 @@ def GenSSHKnown(File, mode=None): for I in x[1]["sshRSAHostKey"]: 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(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) + hosts = HostToIP(x) + 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) else: - Line = "%s %s" %(",".join(HostNames + HostToIP(Host)), I) + Line = "%s %s" %(",".join(HostNames + HostToIP(x, False)), I) Line = Sanitize(Line) + "\n" F.write(Line) # Oops, something unspeakable happened. @@ -997,40 +973,32 @@ def GenSSHKnown(File, mode=None): Done(File, F, None) # Generate the debianhosts file (list of all IP addresses) -def GenHosts(l, File): +def GenHosts(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 is None: - raise UDEmptyList, "No Hosts" - seen = set() - for x in hostnames: - host = GetAttr(x, "hostname", None) - if host: - addrs = [] - try: - addrs += socket.getaddrinfo(host, None, socket.AF_INET) - except socket.error: - pass - try: - addrs += socket.getaddrinfo(host, None, socket.AF_INET6) - except socket.error: - pass - - for addrinfo in addrs: - if addrinfo[0] in (socket.AF_INET, socket.AF_INET6): - addr = addrinfo[4][0] - if addr not in seen: - print >> F, addrinfo[4][0] - seen.add(addr) + + global HostAttrs + + for x in HostAttrs: + + if IsDebianHost.match(GetAttr(x, "hostname")) is None: + continue + + if not 'ipHostNumber' in x[1]: + continue + + addrs = x[1]["ipHostNumber"] + for addr in addrs: + if addr not in seen: + seen.add(addr) + addr = Sanitize(addr) + "\n" + F.write(addr) + # Oops, something unspeakable happened. except: Die(File, F, None) @@ -1043,9 +1011,14 @@ def GenKeyrings(OutDir): # Connect to the ldap server l = connectLDAP() -F = open(PassDir + "/pass-" + pwd.getpwuid(os.getuid())[0], "r") -Pass = F.readline().strip().split(" ") -F.close() +# for testing purposes it's sometimes useful to pass username/password +# via the environment +if 'UD_CREDENTIALS' in os.environ: + Pass = os.environ['UD_CREDENTIALS'].split() +else: + F = open(PassDir + "/pass-" + pwd.getpwuid(os.getuid())[0], "r") + Pass = F.readline().strip().split(" ") + F.close() l.simple_bind_s("uid=" + Pass[0] + "," + BaseDn, Pass[1]) # Fetch all the groups @@ -1055,6 +1028,8 @@ Attrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "gid=*",\ # Generate the SubGroupMap and GroupIDMap for x in Attrs: + if x[1].has_key("accountStatus") and x[1]['accountStatus'] == "disabled": + continue if x[1].has_key("gidNumber") == 0: continue GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidNumber"][0]) @@ -1062,7 +1037,7 @@ for x in Attrs: SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"]) # Fetch all the users -PasswdAttrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "uid=*",\ +PasswdAttrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "(&(uid=*)(!(uidNumber=0)))",\ ["uid", "uidNumber", "gidNumber", "supplementaryGid",\ "gecos", "loginShell", "userPassword", "shadowLastChange",\ "shadowMin", "shadowMax", "shadowWarning", "shadowInactive", @@ -1076,27 +1051,34 @@ PasswdAttrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "uid=*",\ if PasswdAttrs is None: raise UDEmptyList, "No Users" +PasswdAttrs.sort(lambda x, y: cmp((GetAttr(x, "uid")).lower(), (GetAttr(y, "uid")).lower())) + # Fetch all the hosts HostAttrs = l.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "objectClass=debianServer",\ ["hostname", "sshRSAHostKey", "purpose", "allowedGroups", "exportOptions",\ - "mXRecord", "ipHostNumber", "machine", "architecture"]) + "mXRecord", "ipHostNumber", "dnsTTL", "machine", "architecture"]) if HostAttrs == None: raise UDEmptyList, "No Hosts" +HostAttrs.sort(lambda x, y: cmp((GetAttr(x, "hostname")).lower(), (GetAttr(y, "hostname")).lower())) + +# override globaldir for testing +if 'UD_GENERATEDIR' in os.environ: + GenerateDir = os.environ['UD_GENERATEDIR'] + # Generate global things 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") @@ -1114,7 +1096,7 @@ PasswdAttrs = filter(lambda x: not x in DisabledUsers, PasswdAttrs) SSHFiles = GenSSHShadow() GenMarkers(GlobalDir + "markers") GenSSHKnown(GlobalDir + "ssh_known_hosts") -GenHosts(l, GlobalDir + "debianhosts") +GenHosts(GlobalDir + "debianhosts") for host in HostAttrs: if not "hostname" in host[1]: @@ -1178,6 +1160,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")