X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=56ce0366ad7317197b7e0608daa4909294fff5e2;hb=a3437bcd185d533199ebd7c3e0f69b816cc904af;hp=909cfce7d5c25baac0c31c6fdeb5b2142709915a;hpb=0e2b42820978183528bc9b5d6517ef0d336d6da3;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 909cfce..56ce036 100755 --- a/ud-generate +++ b/ud-generate @@ -35,8 +35,8 @@ global Allowed global CurrentHost PasswdAttrs = None +DebianUsers = None DisabledUsers = [] -RetiredUsers = [] GroupIDMap = {} SubGroupMap = {} Allowed = None @@ -45,8 +45,8 @@ CurrentHost = "" 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.\-]*)(?:\|.*)?\]\]") +BSMTPCheck = re.compile(".*mx 0 (gluck|master)\.debian\.org\..*",re.DOTALL) +PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]") DNSZone = ".debian.net" Keyrings = ConfModule.sync_keyrings.split(":") @@ -101,38 +101,44 @@ def IsRetired(DnRecord): # We'll give them a few extra days over what we said age = 6 * 31 * 24 * 60 * 60 try: - if (time.time() - time.mktime(time.strptime(line[1], "%Y-%m-%d"))) > age: - return True + return (time.time() - time.mktime(time.strptime(line[1], "%Y-%m-%d"))) > age except IndexError: return False + except ValueError: + return False return False +def IsGidDebian(x): + try: + return int(GetAttr(x, "gidNumber", 0)) == 800 + except ValueError: + return False + # See if this user is in the group list def IsInGroup(DnRecord): - if Allowed == None: - return 1 + if Allowed is None: + return True # See if the primary group is in the list if Allowed.has_key(GetAttr(DnRecord, "gidNumber")) != 0: - return 1 + return True # Check the host based ACL if DnRecord[1].has_key("allowedHost") != 0: - for I in DnRecord[1]["allowedHost"]: - if CurrentHost == I: - return 1 + if CurrentHost in DnRecord[1]["allowedHost"]: + return True # See if there are supplementary groups if DnRecord[1].has_key("supplementaryGid") == 0: - return 0 + return False supgroups=[] addGroups(supgroups, DnRecord[1]["supplementaryGid"], GetAttr(DnRecord, "uid")) for g in supgroups: if Allowed.has_key(g): - return 1 - return 0 + return True + return False def Die(File, F, Fdb): if F != None: @@ -168,7 +174,7 @@ def GenPasswd(File, HomePrefix, PwdMarker): I = 0 for x in PasswdAttrs: - if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0: + if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): continue # Do not let people try to buffer overflow some busted passwd parser. @@ -198,7 +204,7 @@ def GenPasswd(File, HomePrefix, PwdMarker): return userlist # Generate the shadow list -def GenShadow(l, File): +def GenShadow(File): F = None try: OldMask = os.umask(0077) @@ -210,7 +216,7 @@ def GenShadow(l, File): I = 0 for x in PasswdAttrs: - if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0: + if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): continue Pass = GetAttr(x, "userPassword") @@ -244,7 +250,7 @@ def GenShadow(l, File): Done(File, None, F) # Generate the sudo passwd file -def GenShadowSudo(l, File, untrusted): +def GenShadowSudo(File, untrusted): F = None try: OldMask = os.umask(0077) @@ -256,7 +262,7 @@ def GenShadowSudo(l, File, untrusted): for x in PasswdAttrs: Pass = '*' - if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0: + if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): continue if x[1].has_key('sudoPassword'): @@ -280,7 +286,7 @@ def GenShadowSudo(l, File, untrusted): continue Pass = cryptedpass if for_this_host: # this makes sure we take a per-host entry over the for-all entry - break + break if len(Pass) > 50: Pass = '*' @@ -329,9 +335,9 @@ def GenSSHShadow(): # Oops, something unspeakable happened. except IOError: - Die(File, F, None) - Die(masterFileName, masterFile, None) - raise + Die(File, F, None) + Die(masterFileName, masterFile, None) + raise return userfiles @@ -396,7 +402,7 @@ def addGroups(existingGroups, newGroups, uid): # let's see if we handled this group already if group in existingGroups: - continue + continue if not GroupIDMap.has_key(group): print "Group", group, "does not exist but", uid, "is in it" @@ -425,7 +431,7 @@ def GenGroup(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: + if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): continue if x[1].has_key("supplementaryGid") == 0: continue @@ -444,8 +450,8 @@ def GenGroup(File): Line = "%s:x:%u:" % (x, GroupIDMap[x]) Comma = '' for I in GroupMap[x]: - Line = Line + ("%s%s" % (Comma, I)) - Comma = ',' + Line = Line + ("%s%s" % (Comma, I)) + Comma = ',' Line = Sanitize(Line) + "\n" F.write("0%u %s" % (J, Line)) F.write(".%s %s" % (x, Line)) @@ -461,12 +467,12 @@ def GenGroup(File): return grouprevmap def CheckForward(): - global PasswdAttrs - for x in PasswdAttrs: + global DebianUsers + for x in DebianUsers: if x[1].has_key("emailForward") == 0: continue - if IsInGroup(x) == 0: + if not IsInGroup(x): x[1].pop("emailForward") continue @@ -480,7 +486,7 @@ def CheckForward(): x[1].pop("emailForward") # Generate the email forwarding list -def GenForward(l, File): +def GenForward(File): F = None try: OldMask = os.umask(0022) @@ -488,10 +494,10 @@ def GenForward(l, File): os.umask(OldMask) # Fetch all the users - global PasswdAttrs + global DebianUsers # Write out the email address for each user - for x in PasswdAttrs: + for x in DebianUsers: if x[1].has_key("emailForward") == 0: continue @@ -505,27 +511,24 @@ def GenForward(l, File): raise Done(File, F, None) -def GenAllForward(l, File): +def GenCDB(File, 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 PasswdAttrs - + global DebianUsers + # Write out the email address for each user - for x in PasswdAttrs: - if x[1].has_key("emailForward") == 0: + for x in DebianUsers: + if not Key in x[1]: continue - - # Do not allow people to try to buffer overflow busted parsers - Forward = GetAttr(x, "emailForward") - + Value = GetAttr(x, Key) User = GetAttr(x, "uid") - Fdb.write("+%d,%d:%s->%s\n" % (len(User), len(Forward), User, Forward)) - + Fdb.write("+%d,%d:%s->%s\n" % (len(User), len(Value), User, Value)) + Fdb.write("\n") # Oops, something unspeakable happened. except: @@ -535,16 +538,16 @@ def GenAllForward(l, File): raise "cdbmake gave an error" # Generate the anon XEarth marker file -def GenMarkers(l, File): +def GenMarkers(File): F = None try: F = open(File + ".tmp", "w") # Fetch all the users - global PasswdAttrs + global DebianUsers # Write out the position for each user - for x in PasswdAttrs: + for x in DebianUsers: if x[1].has_key("latitude") == 0 or x[1].has_key("longitude") == 0: continue try: @@ -561,16 +564,16 @@ def GenMarkers(l, File): Done(File, F, None) # Generate the debian-private subscription list -def GenPrivate(l, File): +def GenPrivate(File): F = None try: F = open(File + ".tmp", "w") # Fetch all the users - global PasswdAttrs + global DebianUsers # Write out the position for each user - for x in PasswdAttrs: + for x in DebianUsers: if x[1].has_key("privateSub") == 0: continue @@ -578,10 +581,6 @@ def GenPrivate(l, File): if x[1].has_key("keyFingerPrint") == 0: continue - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x, "gidNumber") != "800": - continue - try: Line = "%s"%(GetAttr(x, "privateSub")) Line = Sanitize(Line) + "\n" @@ -617,11 +616,11 @@ def GenDisabledAccounts(File): 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") - DisabledUsers.append(x) # Oops, something unspeakable happened. except: @@ -630,15 +629,15 @@ def GenDisabledAccounts(File): Done(File, F, None) # Generate the list of local addresses that refuse all mail -def GenMailDisable(l, File): +def GenMailDisable(File): F = None try: F = open(File + ".tmp", "w") # Fetch all the users - global PasswdAttrs + global DebianUsers - for x in PasswdAttrs: + for x in DebianUsers: Reason = None if x[1].has_key("mailDisableMessage"): @@ -646,10 +645,6 @@ def GenMailDisable(l, File): else: continue - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x, "gidNumber") != "800": - continue - try: Line = "%s: %s"%(GetAttr(x, "uid"), Reason) Line = Sanitize(Line) + "\n" @@ -664,24 +659,20 @@ def GenMailDisable(l, File): Done(File, F, None) # Generate a list of uids that should have boolean affects applied -def GenMailBool(l, File, Key): +def GenMailBool(File, Key): F = None try: F = open(File + ".tmp", "w") # Fetch all the users - global PasswdAttrs + global DebianUsers - for x in PasswdAttrs: + for x in DebianUsers: Reason = None if x[1].has_key(Key) == 0: continue - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x, "gidNumber") != "800": - continue - if GetAttr(x, Key) != "TRUE": continue @@ -699,46 +690,42 @@ def GenMailBool(l, File, Key): Done(File, F, None) # Generate a list of hosts for RBL or whitelist purposes. -def GenMailList(l, File, Key): +def GenMailList(File, Key): F = None try: F = open(File + ".tmp", "w") # Fetch all the users - global PasswdAttrs + global DebianUsers - for x in PasswdAttrs: + for x in DebianUsers: Reason = None if x[1].has_key(Key) == 0: continue - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x, "gidNumber") != "800": - continue - try: found = 0 Line = None for z in x[1][Key]: if Key == "mailWhitelist": - if re.match('^[-\w.]+(/[\d]+)?$', z) == None: - continue + if re.match('^[-\w.]+(/[\d]+)?$', z) == None: + continue else: - if re.match('^[-\w.]+$', z) == None: - continue + if re.match('^[-\w.]+$', z) == None: + continue if found == 0: - found = 1 - Line = GetAttr(x, "uid") + found = 1 + Line = GetAttr(x, "uid") else: Line += " " Line += ": " + z if Key == "mailRHSBL": - Line += "/$sender_address_domain" + Line += "/$sender_address_domain" if Line != None: - Line = Sanitize(Line) + "\n" - F.write(Line) + Line = Sanitize(Line) + "\n" + F.write(Line) except: pass @@ -759,7 +746,7 @@ def isRoleAccount(pwEntry): return False # Generate the DNS Zone file -def GenDNS(l, File, HomePrefix): +def GenDNS(File, HomePrefix): F = None try: F = open(File + ".tmp", "w") @@ -788,7 +775,7 @@ def GenDNS(l, File, HomePrefix): Host = Split[0] + DNSZone if BSMTPCheck.match(Line) != None: - F.write("; Has BSMTP\n") + F.write("; Has BSMTP\n") # Write some identification information if Split[2].lower() == "a": @@ -812,7 +799,7 @@ def GenDNS(l, File, HomePrefix): Done(File, F, None) # Generate the DNS SSHFP records -def GenSSHFP(l, File, HomePrefix): +def GenSSHFP(File, HomePrefix): F = None try: F = open(File + ".tmp", "w") @@ -847,16 +834,16 @@ def GenSSHFP(l, File, HomePrefix): Done(File, F, None) # Generate the BSMTP file -def GenBSMTP(l, File, HomePrefix): +def GenBSMTP(File, HomePrefix): F = None try: F = open(File + ".tmp", "w") # Fetch all the users - global PasswdAttrs + global DebianUsers # Write out the zone file entry for each user - for x in PasswdAttrs: + for x in DebianUsers: if x[1].has_key("dnsZoneEntry") == 0: continue @@ -909,7 +896,7 @@ def HostToIP(Host): return HostToIPCache[Host] # Generate the ssh known hosts file -def GenSSHKnown(l, File, mode=None): +def GenSSHKnown(File, mode=None): F = None try: OldMask = os.umask(0022) @@ -917,7 +904,7 @@ def GenSSHKnown(l, File, mode=None): os.umask(OldMask) global HostAttrs - if HostAttrs == None: + if HostAttrs is None: raise UDEmptyList, "No Hosts" for x in HostAttrs: @@ -974,7 +961,7 @@ def GenHosts(l, File): hostnames = l.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "hostname=*", ["hostname"]) - if hostnames == None: + if hostnames is None: raise UDEmptyList, "No Hosts" seen = set() @@ -999,15 +986,14 @@ def GenHosts(l, File): seen.add(addr) # Oops, something unspeakable happened. except: - Die(File, F, None) - raise + Die(File, F, None) + raise Done(File, F, None) -def GenKeyrings(l, OutDir): +def GenKeyrings(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") @@ -1037,7 +1023,8 @@ PasswdAttrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "uid=*",\ "allowedHost", "sshRSAAuthKey", "dnsZoneEntry", "cn", "sn",\ "keyFingerPrint", "privateSub", "mailDisableMessage",\ "mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\ - "mailWhitelist", "sudoPassword", "objectClass", "accountStatus"]) + "mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\ + "mailContentInspectionAction"]) if PasswdAttrs is None: raise UDEmptyList, "No Users" @@ -1056,33 +1043,32 @@ else: GlobalDir = GenerateDir + "/" GenDisabledAccounts(GlobalDir + "disabled-accounts") -for x in PasswdAttrs: - if IsRetired(x): - RetiredUsers.append(x) - -PasswdAttrs = filter(lambda x: not x in RetiredUsers, PasswdAttrs) +PasswdAttrs = filter(lambda x: not IsRetired(x), PasswdAttrs) +#DebianUsers = filter(lambda x: IsGidDebian(x), PasswdAttrs) +DebianUsers = PasswdAttrs CheckForward() -GenMailDisable(l, GlobalDir + "mail-disable") -GenAllForward(l, GlobalDir + "mail-forward.cdb") -GenPrivate(l, GlobalDir + "debian-private") +GenMailDisable(GlobalDir + "mail-disable") +GenCDB(GlobalDir + "mail-forward.cdb", 'emailForward') +GenCDB(GlobalDir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction') +GenPrivate(GlobalDir + "debian-private") #GenSSHKnown(l,GlobalDir+"authorized_keys", 'authorized_keys') -GenMailBool(l, GlobalDir + "mail-greylist", "mailGreylisting") -GenMailBool(l, GlobalDir + "mail-callout", "mailCallout") -GenMailList(l, GlobalDir + "mail-rbl", "mailRBL") -GenMailList(l, GlobalDir + "mail-rhsbl", "mailRHSBL") -GenMailList(l, GlobalDir + "mail-whitelist", "mailWhitelist") -GenKeyrings(l, GlobalDir) +GenMailBool(GlobalDir + "mail-greylist", "mailGreylisting") +GenMailBool(GlobalDir + "mail-callout", "mailCallout") +GenMailList(GlobalDir + "mail-rbl", "mailRBL") +GenMailList(GlobalDir + "mail-rhsbl", "mailRHSBL") +GenMailList(GlobalDir + "mail-whitelist", "mailWhitelist") +GenKeyrings(GlobalDir) # Compatibility. -GenForward(l, GlobalDir + "forward-alias") +GenForward(GlobalDir + "forward-alias") PasswdAttrs = filter(lambda x: not x in DisabledUsers, PasswdAttrs) SSHFiles = GenSSHShadow() -GenMarkers(l, GlobalDir + "markers") -GenSSHKnown(l, GlobalDir + "ssh_known_hosts") +GenMarkers(GlobalDir + "markers") +GenSSHKnown(GlobalDir + "ssh_known_hosts") GenHosts(l, GlobalDir + "debianhosts") while(1): @@ -1115,7 +1101,7 @@ while(1): Allowed = GroupList if Allowed == {}: - Allowed = None + Allowed = None CurrentHost = Split[0] DoLink(GlobalDir, OutDir, "debianhosts") @@ -1129,7 +1115,7 @@ while(1): userlist = GenPasswd(OutDir + "passwd", Split[1], "x") sys.stdout.flush() grouprevmap = GenGroup(OutDir + "group") - GenShadowSudo(l, OutDir + "sudo-passwd", ExtraList.has_key("[UNTRUSTED]") or ExtraList.has_key("[NOPASSWD]")) + GenShadowSudo(OutDir + "sudo-passwd", ExtraList.has_key("[UNTRUSTED]") or ExtraList.has_key("[NOPASSWD]")) # Now we know who we're allowing on the machine, export # the relevant ssh keys @@ -1139,12 +1125,13 @@ while(1): print "[UNTRUSTED] tag is obsolete and may be removed in the future." continue if not ExtraList.has_key("[NOPASSWD]"): - GenShadow(l, OutDir + "shadow") + GenShadow(OutDir + "shadow") # Link in global things if not ExtraList.has_key("[NOMARKERS]"): DoLink(GlobalDir, OutDir, "markers") DoLink(GlobalDir, OutDir, "mail-forward.cdb") + DoLink(GlobalDir, OutDir, "mail-contentinspectionaction.cdb") DoLink(GlobalDir, OutDir, "mail-disable") DoLink(GlobalDir, OutDir, "mail-greylist") DoLink(GlobalDir, OutDir, "mail-callout") @@ -1156,11 +1143,11 @@ while(1): DoLink(GlobalDir, OutDir, "forward-alias") if ExtraList.has_key("[DNS]"): - GenDNS(l, OutDir + "dns-zone", Split[1]) - GenSSHFP(l, OutDir + "dns-sshfp", Split[1]) + GenDNS(OutDir + "dns-zone", Split[1]) + GenSSHFP(OutDir + "dns-sshfp", Split[1]) if ExtraList.has_key("[BSMTP]"): - GenBSMTP(l, OutDir + "bsmtp", Split[1]) + GenBSMTP(OutDir + "bsmtp", Split[1]) if ExtraList.has_key("[PRIVATE]"): DoLink(GlobalDir, OutDir, "debian-private")