X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=56ce0366ad7317197b7e0608daa4909294fff5e2;hb=a3437bcd185d533199ebd7c3e0f69b816cc904af;hp=d8a7090704732ab91d65ce86433f3c80ab8e83ac;hpb=33adb64b484784404b6d4ebb0d64d9ce87b79e8c;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index d8a7090..56ce036 100755 --- a/ud-generate +++ b/ud-generate @@ -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(":") @@ -117,29 +117,28 @@ def IsGidDebian(x): # 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: @@ -175,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. @@ -217,7 +216,7 @@ def GenShadow(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") @@ -263,7 +262,7 @@ def GenShadowSudo(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'): @@ -287,7 +286,7 @@ def GenShadowSudo(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 = '*' @@ -336,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 @@ -403,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" @@ -432,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 @@ -451,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)) @@ -473,7 +472,7 @@ def CheckForward(): if x[1].has_key("emailForward") == 0: continue - if IsInGroup(x) == 0: + if not IsInGroup(x): x[1].pop("emailForward") continue @@ -512,27 +511,24 @@ def GenForward(File): raise Done(File, F, None) -def GenAllForward(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 DebianUsers - + # Write out the email address for each user for x in DebianUsers: - if x[1].has_key("emailForward") == 0: + 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: @@ -620,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: @@ -713,23 +709,23 @@ def GenMailList(File, Key): 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 @@ -779,7 +775,7 @@ def GenDNS(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": @@ -908,7 +904,7 @@ def GenSSHKnown(File, mode=None): os.umask(OldMask) global HostAttrs - if HostAttrs == None: + if HostAttrs is None: raise UDEmptyList, "No Hosts" for x in HostAttrs: @@ -965,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() @@ -990,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(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") @@ -1028,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" @@ -1047,13 +1043,15 @@ else: GlobalDir = GenerateDir + "/" GenDisabledAccounts(GlobalDir + "disabled-accounts") -PasswdAttrs = filter(not IsRetired, PasswdAttrs) -DebianUsers = filter(IsGidDebian, PasswdAttrs) +PasswdAttrs = filter(lambda x: not IsRetired(x), PasswdAttrs) +#DebianUsers = filter(lambda x: IsGidDebian(x), PasswdAttrs) +DebianUsers = PasswdAttrs CheckForward() GenMailDisable(GlobalDir + "mail-disable") -GenAllForward(GlobalDir + "mail-forward.cdb") +GenCDB(GlobalDir + "mail-forward.cdb", 'emailForward') +GenCDB(GlobalDir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction') GenPrivate(GlobalDir + "debian-private") #GenSSHKnown(l,GlobalDir+"authorized_keys", 'authorized_keys') GenMailBool(GlobalDir + "mail-greylist", "mailGreylisting") @@ -1103,7 +1101,7 @@ while(1): Allowed = GroupList if Allowed == {}: - Allowed = None + Allowed = None CurrentHost = Split[0] DoLink(GlobalDir, OutDir, "debianhosts") @@ -1133,6 +1131,7 @@ while(1): 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")