X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=8001012c159f10c066400a5f1c3264437e16b57b;hb=d91d0c5fd96a36bae43ecf2aa0460f663655c0fd;hp=dfb3fb6f6a45a15e81aeb81aac9293b7106b650b;hpb=23d16a206665d2170958463f13409868daffb7e0;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index dfb3fb6..8001012 100755 --- a/ud-generate +++ b/ud-generate @@ -28,11 +28,14 @@ import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha, shutil, errno, tarfile, grp from userdir_ldap import *; +from userdir_exceptions import * global Allowed; global CurrentHost; PasswdAttrs = None; +DisabledUsers = [] +RetiredUsers = [] GroupIDMap = {}; SubGroupMap = {}; Allowed = None; @@ -72,6 +75,36 @@ def DoLink(From,To,File): except: pass; posix.link(From+File,To+File); +def IsRetired(DnRecord): + """ + Looks for accountStatus in the LDAP record and tries to + match it against one of the known retired statuses + """ + + status = GetAttr(DnRecord,"accountStatus", None) + if status is None: + return False + + line = status.split() + status = line[0] + + if status == "inactive": + return True + + elif status == "memorial": + return True + + elif status == "retiring": + # 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 + except IndexError: + return False + + return False + # See if this user is in the group list def IsInGroup(DnRecord): if Allowed == None: @@ -91,13 +124,10 @@ def IsInGroup(DnRecord): if DnRecord[1].has_key("supplementaryGid") == 0: return 0; - # Check the supplementary groups - for I in DnRecord[1]["supplementaryGid"]: - s = I.split('@', 1) - group = s[0] - if len(s) == 2 and s[1] != CurrentHost: - continue; - if Allowed.has_key(group): + supgroups=[] + addGroups(supgroups, DnRecord[1]["supplementaryGid"], GetAttr(DnRecord,"uid")) + for g in supgroups: + if Allowed.has_key(g): return 1; return 0; @@ -128,8 +158,6 @@ def GenPasswd(l,File,HomePrefix,PwdMarker): userlist = {} # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; I = 0; for x in PasswdAttrs: @@ -172,8 +200,6 @@ def GenShadow(l,File): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; I = 0; for x in PasswdAttrs: @@ -220,8 +246,6 @@ def GenShadowSudo(l,File, untrusted): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; for x in PasswdAttrs: Pass = '*' @@ -270,23 +294,19 @@ def GenSSHShadow(l): userfiles = [] global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; safe_rmtree(os.path.join(GlobalDir, 'userkeys')) safe_makedirs(os.path.join(GlobalDir, 'userkeys')) for x in PasswdAttrs: - # If the account is locked, do not write it. - # This is a partial stop-gap. The ssh also needs to change this - # to ignore ~/.ssh/authorized* files. - if (GetAttr(x,"userPassword").find("*LK*") != -1) \ - or GetAttr(x,"userPassword").startswith("!"): - continue; + + if x in DisabledUsers: + continue if x[1].has_key("uidNumber") == 0 or \ x[1].has_key("sshRSAAuthKey") == 0: continue; + User = GetAttr(x,"uid"); F = None; @@ -382,7 +402,7 @@ def addGroups(existingGroups, newGroups, uid): existingGroups.append(group) if SubGroupMap.has_key(group): - addGroups(existingGroups, SubGroupMap[group]) + addGroups(existingGroups, SubGroupMap[group], uid) # Generate the group list def GenGroup(l,File): @@ -398,8 +418,6 @@ def GenGroup(l,File): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; # Sort them into a list of groups having a set of users for x in PasswdAttrs: @@ -449,8 +467,6 @@ def GenForward(l,File): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; # Write out the email address for each user for x in PasswdAttrs: @@ -483,8 +499,6 @@ def GenAllForward(l,File): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; # Write out the email address for each user for x in PasswdAttrs: @@ -518,8 +532,6 @@ def GenMarkers(l,File): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; # Write out the position for each user for x in PasswdAttrs: @@ -546,19 +558,12 @@ def GenPrivate(l,File): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; # Write out the position for each user for x in PasswdAttrs: if x[1].has_key("privateSub") == 0: continue; - # If the account is locked, do not write it - if (GetAttr(x,"userPassword").find("*LK*") != -1) \ - or GetAttr(x,"userPassword").startswith("!"): - continue; - # If the account has no PGP key, do not write it if x[1].has_key("keyFingerPrint") == 0: continue; @@ -588,8 +593,7 @@ def GenDisabledAccounts(l,File): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; + global DisabledUsers I = 0; for x in PasswdAttrs: @@ -607,6 +611,8 @@ def GenDisabledAccounts(l,File): if Line != "": F.write(Sanitize(Line) + "\n") + DisabledUsers.append(x) + # Oops, something unspeakable happened. except: Die(File,F,None); @@ -621,8 +627,6 @@ def GenMailDisable(l,File): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; for x in PasswdAttrs: Reason = None @@ -657,8 +661,6 @@ def GenMailBool(l,File,Key): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; for x in PasswdAttrs: Reason = None @@ -694,8 +696,6 @@ def GenMailList(l,File,Key): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; for x in PasswdAttrs: Reason = None @@ -738,6 +738,16 @@ def GenMailList(l,File,Key): raise; Done(File,F,None); +def isRoleAccount(pwEntry): + if not pwEntry.has_key("objectClass"): + raise "pwEntry has no objectClass" + oc = pwEntry['objectClass'] + try: + i = oc.index('debianRoleAccount') + return True + except ValueError: + return False + # Generate the DNS Zone file def GenDNS(l,File,HomePrefix): F = None; @@ -746,8 +756,6 @@ def GenDNS(l,File,HomePrefix): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; # Write out the zone file entry for each user for x in PasswdAttrs: @@ -755,7 +763,7 @@ def GenDNS(l,File,HomePrefix): continue; # If the account has no PGP key, do not write it - if x[1].has_key("keyFingerPrint") == 0: + if x[1].has_key("keyFingerPrint") == 0 and not isRoleAccount(x[1]): continue; try: F.write("; %s\n"%(EmailAddress(x))); @@ -802,7 +810,7 @@ def GenSSHFP(l,File,HomePrefix): # Fetch all the hosts global HostAttrs if HostAttrs == None: - raise "No Hosts" + raise UDEmptyList, "No Hosts" for x in HostAttrs: if x[1].has_key("hostname") == 0 or \ @@ -836,8 +844,6 @@ def GenBSMTP(l,File,HomePrefix): # Fetch all the users global PasswdAttrs; - if PasswdAttrs == None: - raise "No Users"; # Write out the zone file entry for each user for x in PasswdAttrs: @@ -882,9 +888,10 @@ def HostToIP(Host): except socket.gaierror, (code): if code[0] != -2: raise IPAdresses = [] - for addr in IPAdressesT: - if addr[0] == socket.AF_INET: IPAdresses += [addr[1], "::ffff:"+addr[1]] - else: IPAdresses += [addr[1]] + 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] @@ -899,7 +906,7 @@ def GenSSHKnown(l,File,mode=None): global HostAttrs if HostAttrs == None: - raise "No Hosts"; + raise UDEmptyList, "No Hosts" for x in HostAttrs: if x[1].has_key("hostname") == 0 or \ @@ -945,33 +952,44 @@ def GenSSHKnown(l,File,mode=None): # Generate the debianhosts file (list of all IP addresses) def GenHosts(l,File): - F = None; + 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 == None: - raise "No Hosts"; - - for x in HostNames: - if x[1].has_key("hostname") == 0: - continue; - Host = GetAttr(x,"hostname"); - try: - Addr = socket.gethostbyname(Host); - F.write(Addr + "\n"); - except: - pass + 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 == 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) # Oops, something unspeakable happened. except: - Die(File,F,None); - raise; - Done(File,F,None); + Die(File,F,None) + raise + Done(File,F,None) def GenKeyrings(l,OutDir): for k in Keyrings: @@ -1007,7 +1025,11 @@ PasswdAttrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"uid=*",\ "allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\ "keyFingerPrint","privateSub","mailDisableMessage",\ "mailGreylisting","mailCallout","mailRBL","mailRHSBL",\ - "mailWhitelist", "sudoPassword"]); + "mailWhitelist", "sudoPassword", "objectClass", "accountStatus"]) + +if PasswdAttrs is None: + raise UDEmptyList, "No Users" + # Fetch all the hosts HostAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\ ["hostname","sshRSAHostKey","purpose"]); @@ -1020,6 +1042,14 @@ else: # Generate global things GlobalDir = GenerateDir+"/"; +GenMailDisable(l,GlobalDir+"mail-disable") + +for x in PasswdAttrs: + if IsRetired(x): + RetiredUsers.append(x) + +PasswdAttrs = filter(lambda x: not x in RetiredUsers, PasswdAttrs) + SSHFiles = GenSSHShadow(l); GenAllForward(l,GlobalDir+"mail-forward.cdb"); GenMarkers(l,GlobalDir+"markers"); @@ -1028,7 +1058,6 @@ GenDisabledAccounts(l,GlobalDir+"disabled-accounts"); GenSSHKnown(l,GlobalDir+"ssh_known_hosts"); #GenSSHKnown(l,GlobalDir+"authorized_keys", 'authorized_keys'); GenHosts(l,GlobalDir+"debianhosts"); -GenMailDisable(l,GlobalDir+"mail-disable"); GenMailBool(l,GlobalDir+"mail-greylist","mailGreylisting"); GenMailBool(l,GlobalDir+"mail-callout","mailCallout"); GenMailList(l,GlobalDir+"mail-rbl","mailRBL"); @@ -1039,6 +1068,8 @@ GenKeyrings(l,GlobalDir); # Compatibility. GenForward(l,GlobalDir+"forward-alias"); +PasswdAttrs = filter(lambda x: not x in DisabledUsers, PasswdAttrs) + while(1): Line = F.readline(); if Line == "":