X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=795816ca0e03594cc5b524fcee843fb89b143df6;hb=ce64087cfde96cea951f7d016aff0128fb7cf678;hp=2319787eb460cd505eddec25bf076762fea8726b;hpb=32271a3e086af9ccd6f2827148fe019e53ffbfa2;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 2319787..795816c 100755 --- a/ud-generate +++ b/ud-generate @@ -753,21 +753,26 @@ 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) - for Line in DNSInfo: - Line = Sanitize(Line) + "\n" - F.write(Line) +# 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 @@ -818,7 +823,18 @@ def GenDNS(File): def ExtractDNSInfo(x): + 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("%sIN\tAAAA\t%s" % (TTLprefix, I)) + else: + DNSInfo.append("%sIN\tA\t%s" % (TTLprefix, I)) + Host = GetAttr(x, "hostname") Arch = GetAttr(x, "architecture") Algorithm = None @@ -832,23 +848,16 @@ def ExtractDNSInfo(x): if Algorithm == None: continue Fingerprint = sha.new(base64.decodestring(Split[1])).hexdigest() - DNSInfo.append("%s. IN SSHFP %u 1 %s" % (Host, Algorithm, Fingerprint)) + DNSInfo.append("%sIN\tSSHFP\t%u 1 %s" % (TTLprefix, 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")) - - 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)) - else: - DNSInfo.append("%s. IN A %s" % (Host, I)) + 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 @@ -871,9 +880,15 @@ def GenZoneRecords(File): 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") # Oops, something unspeakable happened. except: @@ -922,26 +937,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): @@ -983,10 +989,13 @@ 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) + 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) #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 = "%s %s" %(",".join(HostNames + HostToIP(x, False)), I) Line = Sanitize(Line) + "\n" F.write(Line) # Oops, something unspeakable happened. @@ -996,40 +1005,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) @@ -1054,6 +1055,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]) @@ -1075,10 +1078,12 @@ 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" @@ -1115,7 +1120,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]: