global CurrentHost;
PasswdAttrs = None;
+disabledusers = []
GroupIDMap = {};
SubGroupMap = {};
Allowed = None;
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
+
+ if status.find("inactive") != -1:
+ return True
+
+ if status.find("memorial") != -1:
+ return True
+
+ if status.find("retiring") != -1:
+ line = status.split()
+ # We'll give them a few extra days over what we said
+ age = 6 * 31 * 24 * 60 * 60
+ if (time.time() - time.mktime(time.strptime(line[1], "%Y-%m-%d")) > (age):
+ return True
+
+ return False
+
# See if this user is in the group list
def IsInGroup(DnRecord):
if Allowed == None:
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;
I = 0;
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0:
continue;
I = 0;
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0:
continue;
raise "No Users";
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
Pass = '*'
if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0:
continue;
safe_makedirs(os.path.join(GlobalDir, 'userkeys'))
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
# 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.
continue
if not GroupIDMap.has_key(group):
- print "Group does not exist ",group,"but",uid,"is in it"
+ print "Group", group, "does not exist but", uid, "is in it"
continue
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):
# Write out the email address for each user
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
if x[1].has_key("emailForward") == 0 or IsInGroup(x) == 0:
continue;
# Write out the email address for each user
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
if x[1].has_key("emailForward") == 0:
continue;
# Write out the position for each user
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
if x[1].has_key("latitude") == 0 or x[1].has_key("longitude") == 0:
continue;
try:
# Write out the position for each user
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
if x[1].has_key("privateSub") == 0:
continue;
# Fetch all the users
global PasswdAttrs;
+ global disabledusers
if PasswdAttrs == None:
raise "No Users";
if Line != "":
F.write(Sanitize(Line) + "\n")
+ disabledusers.append(x)
+
# Oops, something unspeakable happened.
except:
Die(File,F,None);
raise "No Users";
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
Reason = None
if x[1].has_key("mailDisableMessage"):
raise "No Users";
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
Reason = None
if x[1].has_key(Key) == 0:
raise "No Users";
for x in PasswdAttrs:
+ if IsRetired(x):
+ continue
+
Reason = None
if x[1].has_key(Key) == 0:
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;
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)));
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]
if Host.endswith(HostDomain):
HostNames.append(Host[:-(len(HostDomain)+1)])
- #<weasel> [[]] makes http links
- #<weasel> but integrating it somehow into the purpose line might be a good idea
- #<weasel> maybe [[*fooobar]] things would be a link but not added to the ssh key list,
- # and [[-..]] or something would be just an ssh entry but no link
# in the purpose field [[host|some other text]] (where some other text is optional)
# makes a hyperlink on the web thing. we now also add these hosts to the ssh known_hosts
# file. But so that we don't have to add everything we link we can add an asterisk
# 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 "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:
"allowedHost","sshRSAAuthKey","dnsZoneEntry","cn","sn",\
"keyFingerPrint","privateSub","mailDisableMessage",\
"mailGreylisting","mailCallout","mailRBL","mailRHSBL",\
- "mailWhitelist", "sudoPassword"]);
+ "mailWhitelist", "sudoPassword", "objectClass", "accountStatus"]);
# Fetch all the hosts
HostAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"sshRSAHostKey=*",\
["hostname","sshRSAHostKey","purpose"]);
# Compatibility.
GenForward(l,GlobalDir+"forward-alias");
+PasswdAttrs = filter(lambda x: not x in disabledusers, PasswdAttrs)
+
while(1):
Line = F.readline();
if Line == "":
projects / mirror / userdir-ldap.git / blobdiff