X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=0239c3f437a001c4bd0f82ed2275a27eb18a186b;hb=25daaab6b3f6c694a4d4cb117cb845f4726ec4c1;hp=18c008b61284032ec892a811822899c83b777a1c;hpb=268b4bb0d628223d7bb04a501d651d7d4bd7cb12;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 18c008b..0239c3f 100755 --- a/ud-generate +++ b/ud-generate @@ -35,6 +35,7 @@ global Allowed global CurrentHost PasswdAttrs = None +DebianUsers = None DisabledUsers = [] GroupIDMap = {} SubGroupMap = {} @@ -44,8 +45,9 @@ 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 (master)\.debian\.org\..*",re.DOTALL) +PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]") +IsV6Addr = re.compile("^[a-fA-F0-9:]+$") DNSZone = ".debian.net" Keyrings = ConfModule.sync_keyrings.split(":") @@ -100,10 +102,11 @@ 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 @@ -115,29 +118,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: @@ -173,7 +175,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. @@ -215,7 +217,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") @@ -261,7 +263,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'): @@ -285,7 +287,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 = '*' @@ -334,9 +336,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 @@ -401,7 +403,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" @@ -430,7 +432,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 @@ -449,8 +451,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)) @@ -471,7 +473,7 @@ def CheckForward(): if x[1].has_key("emailForward") == 0: continue - if IsInGroup(x) == 0: + if not IsInGroup(x): x[1].pop("emailForward") continue @@ -510,27 +512,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: @@ -618,11 +617,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: @@ -711,23 +710,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 @@ -748,7 +747,7 @@ def isRoleAccount(pwEntry): return False # Generate the DNS Zone file -def GenDNS(File, HomePrefix): +def GenDNS(File): F = None try: F = open(File + ".tmp", "w") @@ -777,7 +776,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": @@ -801,7 +800,7 @@ def GenDNS(File, HomePrefix): Done(File, F, None) # Generate the DNS SSHFP records -def GenSSHFP(File, HomePrefix): +def GenSSHFP(File): F = None try: F = open(File + ".tmp", "w") @@ -813,10 +812,13 @@ def GenSSHFP(File, HomePrefix): 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 Host = GetAttr(x, "hostname") + Arch = GetAttr(x, "architecture") Algorithm = None + for I in x[1]["sshRSAHostKey"]: Split = I.split() if Split[0] == 'ssh-rsa': @@ -829,6 +831,29 @@ def GenSSHFP(File, HomePrefix): Line = "%s. IN SSHFP %u 1 %s" % (Host, Algorithm, Fingerprint) Line = Sanitize(Line) + "\n" F.write(Line) + + Mach = "" + if x[1].has_key("machine"): + Mach = " " + GetAttr(x, "machine") + Line = "%s. IN HINFO \"%s%s\" \"%s\"" % (Host, Arch, Mach, "Debian GNU/Linux") + Line = Sanitize(Line) + "\n" + F.write(Line) + + if x[1].has_key("ipHostNumber"): + for I in x[1]["ipHostNumber"]: + if IsV6Addr.match(I) != None: + Line = "%s. IN AAAA %s" % (Host, I) + else: + Line = "%s. IN A %s" % (Host, I) + Line = Sanitize(Line) + "\n" + F.write(Line) + + if x[1].has_key("mXRecord"): + for I in x[1]["mXRecord"]: + Line = "%s. IN MX %s" % (Host, I) + Line = Sanitize(Line) + "\n" + F.write(Line) + # Oops, something unspeakable happened. except: Die(File, F, None) @@ -906,7 +931,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: @@ -939,8 +964,8 @@ 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(HNames + 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) + 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) else: Line = "%s %s" %(",".join(HostNames + HostToIP(Host)), I) Line = Sanitize(Line) + "\n" @@ -963,7 +988,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() @@ -988,15 +1013,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") @@ -1026,34 +1050,32 @@ 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" # Fetch all the hosts -HostAttrs = l.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "sshRSAHostKey=*",\ - ["hostname", "sshRSAHostKey", "purpose"]) - -# Open the control file -if len(sys.argv) == 1: - F = open(GenerateConf, "r") -else: - F = open(sys.argv[1], "r") +HostAttrs = l.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "objectClass=debianServer",\ + ["hostname", "sshRSAHostKey", "purpose", "allowedGroups", "exportOptions",\ + "mXRecord", "ipHostNumber", "machine", "architecture"]) # Generate global things 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') +GenSSHKnown(GlobalDir+"authorized_keys", 'authorized_keys') GenMailBool(GlobalDir + "mail-greylist", "mailGreylisting") GenMailBool(GlobalDir + "mail-callout", "mailCallout") GenMailList(GlobalDir + "mail-rbl", "mailRBL") @@ -1071,18 +1093,12 @@ GenMarkers(GlobalDir + "markers") GenSSHKnown(GlobalDir + "ssh_known_hosts") GenHosts(l, GlobalDir + "debianhosts") -while(1): - Line = F.readline() - if Line == "": - break - Line = Line.strip() - if Line == "": - continue - if Line[0] == '#': +for host in HostAttrs: + if not "hostname" in host[1]: continue - Split = Line.split(" ") - OutDir = GenerateDir + '/' + Split[0] + '/' + CurrentHost = host[1]['hostname'][0] + OutDir = GenerateDir + '/' + CurrentHost + '/' try: os.mkdir(OutDir) except: @@ -1090,47 +1106,49 @@ while(1): # Get the group list and convert any named groups to numerics GroupList = {} + for groupname in AllowedGroupsPreload.strip().split(" "): + GroupList[groupname] = True + if 'allowedGroups' in host[1]: + for groupname in host[1]['allowedGroups']: + GroupList[groupname] = True + for groupname in GroupList.keys(): + if groupname in GroupIDMap: + GroupList[str(GroupIDMap[groupname])] = True + ExtraList = {} - for I in Split[2:]: - if I[0] == '[': - ExtraList[I] = None - continue - GroupList[I] = None - if GroupIDMap.has_key(I): - GroupList[str(GroupIDMap[I])] = None + if 'exportOptions' in host[1]: + for extra in host[1]['exportOptions']: + ExtraList[extra.upper()] = True Allowed = GroupList if Allowed == {}: - Allowed = None - CurrentHost = Split[0] + Allowed = None DoLink(GlobalDir, OutDir, "debianhosts") DoLink(GlobalDir, OutDir, "ssh_known_hosts") DoLink(GlobalDir, OutDir, "disabled-accounts") sys.stdout.flush() - if ExtraList.has_key("[NOPASSWD]"): - userlist = GenPasswd(OutDir + "passwd", Split[1], "*") + if 'NOPASSWD' in ExtraList: + userlist = GenPasswd(OutDir + "passwd", HomePrefix, "*") else: - userlist = GenPasswd(OutDir + "passwd", Split[1], "x") + userlist = GenPasswd(OutDir + "passwd", HomePrefix, "x") sys.stdout.flush() grouprevmap = GenGroup(OutDir + "group") - GenShadowSudo(OutDir + "sudo-passwd", ExtraList.has_key("[UNTRUSTED]") or ExtraList.has_key("[NOPASSWD]")) + GenShadowSudo(OutDir + "sudo-passwd", ('UNTRUSTED' in ExtraList) or ('NOPASSWD' in ExtraList)) # Now we know who we're allowing on the machine, export # the relevant ssh keys GenSSHtarballs(userlist, SSHFiles, grouprevmap, os.path.join(OutDir, 'ssh-keys.tar.gz')) - if ExtraList.has_key("[UNTRUSTED]"): - print "[UNTRUSTED] tag is obsolete and may be removed in the future." - continue - if not ExtraList.has_key("[NOPASSWD]"): + if not 'NOPASSWD' in ExtraList: GenShadow(OutDir + "shadow") # Link in global things - if not ExtraList.has_key("[NOMARKERS]"): + if not 'NOMARKERS' in ExtraList: 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") @@ -1141,17 +1159,20 @@ while(1): # Compatibility. DoLink(GlobalDir, OutDir, "forward-alias") - if ExtraList.has_key("[DNS]"): - GenDNS(OutDir + "dns-zone", Split[1]) - GenSSHFP(OutDir + "dns-sshfp", Split[1]) + if 'DNS' in ExtraList: + GenDNS(OutDir + "dns-zone") + GenSSHFP(OutDir + "dns-sshfp") + + if 'AUTHKEYS' in ExtraList: + DoLink(GlobalDir, OutDir, "authorized_keys") - if ExtraList.has_key("[BSMTP]"): - GenBSMTP(OutDir + "bsmtp", Split[1]) + if 'BSMTP' in ExtraList: + GenBSMTP(OutDir + "bsmtp", HomePrefix) - if ExtraList.has_key("[PRIVATE]"): + if 'PRIVATE' in ExtraList: DoLink(GlobalDir, OutDir, "debian-private") - if ExtraList.has_key("[KEYRING]"): + if 'KEYRING' in ExtraList: for k in Keyrings: DoLink(GlobalDir, OutDir, os.path.basename(k)) else: