X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=1681e9725d433a8b20019117efb9966d2eb168bf;hb=0d0ec9c38991f84768628eee0de17888f29d48ea;hp=0b67ff898285997ee25f16cbee09216f9d037e0a;hpb=002a05d5273a6ab1a606a00c404cffa973c23f9c;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 0b67ff8..1681e97 100755 --- a/ud-generate +++ b/ud-generate @@ -469,8 +469,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 +496,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 +513,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 +543,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 +569,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 +634,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 +664,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 +695,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,26 +750,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) - 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") +# 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 @@ -823,14 +820,17 @@ def GenDNS(File): def ExtractDNSInfo(x): - DNSInfo = [] + 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("IN\tAAAA\t%s" % (I)) + DNSInfo.append("%sIN\tAAAA\t%s" % (TTLprefix, I)) else: - DNSInfo.append("IN\tA\t%s" % (I)) + DNSInfo.append("%sIN\tA\t%s" % (TTLprefix, I)) Host = GetAttr(x, "hostname") Arch = GetAttr(x, "architecture") @@ -845,16 +845,16 @@ def ExtractDNSInfo(x): if Algorithm == None: continue Fingerprint = sha.new(base64.decodestring(Split[1])).hexdigest() - DNSInfo.append("IN\tSSHFP\t%u 1 %s" % (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("IN\tHINFO\t\"%s%s\" \"%s\"" % (Arch, Mach, "Debian GNU/Linux")) + 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("IN\tMX\t%s" % (I)) + DNSInfo.append("%sIN\tMX\t%s" % (TTLprefix, I)) return DNSInfo @@ -900,10 +900,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 @@ -986,7 +986,10 @@ 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(x)), 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(x, False)), I) @@ -1015,6 +1018,9 @@ def GenHosts(File): 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: @@ -1046,6 +1052,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]) @@ -1072,7 +1080,7 @@ PasswdAttrs.sort(lambda x, y: cmp((GetAttr(x, "uid")).lower(), (GetAttr(y, "uid" # 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" @@ -1084,14 +1092,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") @@ -1173,6 +1180,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")