userlist = {}
# Fetch all the users
global PasswdAttrs
-
- I = 0
+
+ i = 0
for x in PasswdAttrs:
- if x[1].has_key("uidNumber") == 0 or not IsInGroup(x):
- continue
-
+ a = UDLdap.Account(x[0], x[1])
+ if not IsInGroup(x): continue
+
# Do not let people try to buffer overflow some busted passwd parser.
- if len(GetAttr(x, "gecos")) > 100 or len(GetAttr(x, "loginShell")) > 50:
- continue
-
- userlist[GetAttr(x, "uid")] = int(GetAttr(x, "gidNumber"))
- Line = "%s:%s:%s:%s:%s:%s%s:%s" % (GetAttr(x, "uid"),\
- PwdMarker,\
- GetAttr(x, "uidNumber"), GetAttr(x, "gidNumber"),\
- GetAttr(x, "gecos"), HomePrefix, GetAttr(x, "uid"),\
- GetAttr(x, "loginShell"))
-
- Line = Sanitize(Line) + "\n"
- F.write("0%u %s" % (I, Line))
- F.write(".%s %s" % (GetAttr(x, "uid"), Line))
- F.write("=%s %s" % (GetAttr(x, "uidNumber"), Line))
- I = I + 1
-
+ if len(a['gecos']) > 100 or len(a['loginShell']) > 50: continue
+
+ userlist[a['uid']] = a['gidNumber']
+ line = "%s:%s:%d:%d:%s:%s%s:%s" % (
+ a['uid'],
+ PwdMarker,
+ a['uidNumber'],
+ a['gidNumber'],
+ a['gecos'],
+ HomePrefix, a['uid'],
+ a['loginShell'])
+ line = Sanitize(line) + "\n"
+ F.write("0%u %s" % (i, line))
+ F.write(".%s %s" % (a['uid'], line))
+ F.write("=%d %s" % (a['uidNumber'], line))
+ i = i + 1
+
# Oops, something unspeakable happened.
except:
Die(File, None, F)
# Fetch all the users
global PasswdAttrs
- I = 0
+ i = 0
for x in PasswdAttrs:
- if x[1].has_key("uidNumber") == 0 or not IsInGroup(x):
- continue
-
- Pass = GetAttr(x, "userPassword")
- if Pass[0:7] != "{crypt}" or len(Pass) > 50:
- Pass = '*'
- else:
- Pass = Pass[7:]
-
+ a = UDLdap.Account(x[0], x[1])
+ if not IsInGroup(x): continue
+
# If the account is locked, mark it as such in shadow
# See Debian Bug #308229 for why we set it to 1 instead of 0
- if (GetAttr(x, "userPassword").find("*LK*") != -1) \
- or GetAttr(x, "userPassword").startswith("!"):
- ShadowExpire = '1'
- else:
- ShadowExpire = GetAttr(x, "shadowExpire")
-
- Line = "%s:%s:%s:%s:%s:%s:%s:%s:" % (GetAttr(x, "uid"),\
- Pass, GetAttr(x, "shadowLastChange"),\
- GetAttr(x, "shadowMin"), GetAttr(x, "shadowMax"),\
- GetAttr(x, "shadowWarning"), GetAttr(x, "shadowInactive"),\
- ShadowExpire)
- Line = Sanitize(Line) + "\n"
- F.write("0%u %s" % (I, Line))
- F.write(".%s %s" % (GetAttr(x, "uid"), Line))
- I = I + 1
-
+ if not a.pw_active(): ShadowExpire = '1'
+ elif 'shadowExpire' in a: ShadowExpire = str(a['shadowExpire'])
+ else: ShadowExpire = ''
+
+ values = []
+ values.append(a['uid'])
+ values.append(a.get_password())
+ for key in 'shadowLastChange', 'shadowMin', 'shadowMax', 'shadowWarning', 'shadowInactive':
+ if key in a: values.append(a[key])
+ else: values.append('')
+ values.append(ShadowExpire)
+ line = ':'.join(values)+':'
+ line = Sanitize(line) + "\n"
+ F.write("0%u %s" % (i, line))
+ F.write(".%s %s" % (a['uid'], line))
+ i = i + 1
+
# Oops, something unspeakable happened.
except:
Die(File, None, F)
global PasswdAttrs
for x in PasswdAttrs:
+ a = UDLdap.Account(x[0], x[1])
Pass = '*'
- if x[1].has_key("uidNumber") == 0 or not IsInGroup(x):
- continue
+ if not IsInGroup(x): continue
- if x[1].has_key('sudoPassword'):
- for entry in x[1]['sudoPassword']:
+ if 'sudoPassword' in a:
+ for entry in a['sudoPassword']:
Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry)
if Match == None:
continue
hosts = Match.group(3)
cryptedpass = Match.group(4)
- if status != 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', x[1]['uid'][0], uuid, hosts, cryptedpass):
+ if status != 'confirmed:'+make_passwd_hmac('password-is-confirmed', 'sudo', a['uid'], uuid, hosts, cryptedpass):
continue
for_all = hosts == "*"
for_this_host = CurrentHost in hosts.split(',')
if len(Pass) > 50:
Pass = '*'
- Line = "%s:%s" % (GetAttr(x, "uid"), Pass)
+ Line = "%s:%s" % (a['uid'], Pass)
Line = Sanitize(Line) + "\n"
F.write("%s" % (Line))
safe_makedirs(os.path.join(GlobalDir, 'userkeys'))
for x in PasswdAttrs:
+ a = UDLdap.Account(x[0], x[1])
+ if not 'sshRSAAuthKey' in a: continue
- if x[1].has_key("uidNumber") == 0 or \
- x[1].has_key("sshRSAAuthKey") == 0:
- continue
-
- User = GetAttr(x, "uid")
F = None
-
try:
OldMask = os.umask(0077)
- File = os.path.join(GlobalDir, 'userkeys', User)
+ File = os.path.join(GlobalDir, 'userkeys', a['uid'])
F = open(File + ".tmp", "w", 0600)
os.umask(OldMask)
- for I in x[1]["sshRSAAuthKey"]:
+ for I in a['sshRSAAuthKey']:
MultipleLine = "%s" % I
MultipleLine = Sanitize(MultipleLine) + "\n"
F.write(MultipleLine)
# Sort them into a list of groups having a set of users
for x in PasswdAttrs:
- uid = GetAttr(x, "uid")
- if 'gidNumber' in x[1]:
- GroupHasPrimaryMembers[ int(x[1]["gidNumber"][0]) ] = True
- if x[1].has_key("uidNumber") == 0 or not IsInGroup(x):
- continue
- if x[1].has_key("supplementaryGid") == 0:
- continue
-
+ a = UDLdap.Account(x[0], x[1])
+ GroupHasPrimaryMembers[ a['gidNumber'] ] = True
+ if not IsInGroup(x): continue
+ if not 'supplementaryGid' in a: continue
+
supgroups=[]
- addGroups(supgroups, x[1]["supplementaryGid"], uid)
+ addGroups(supgroups, a['supplementaryGid'], a['uid'])
for g in supgroups:
- GroupMap[g].append(uid)
-
+ GroupMap[g].append(a['uid'])
+
# Output the group file.
J = 0
for x in GroupMap.keys():
# Write out the email address for each user
for x in PasswdAttrs:
- if x[1].has_key("emailForward") == 0:
- continue
-
- Line = "%s: %s" % (GetAttr(x, "uid"), GetAttr(x, "emailForward"))
+ a = UDLdap.Account(x[0], x[1])
+ if not 'emailForward' in a: continue
+ Line = "%s: %s" % (a['uid'], a['emailForward'])
Line = Sanitize(Line) + "\n"
F.write(Line)
raise
Done(File, F, None)
-def GenCDB(File, Users, Key):
+def GenCDB(File, Users, key):
Fdb = None
try:
OldMask = os.umask(0022)
# Write out the email address for each user
for x in Users:
- if not Key in x[1]:
- continue
- Value = GetAttr(x, Key)
- User = GetAttr(x, "uid")
- Fdb.write("+%d,%d:%s->%s\n" % (len(User), len(Value), User, Value))
+ a = UDLdap.Account(x[0], x[1])
+ if not key in a: continue
+ value = a[key]
+ user = a['uid']
+ Fdb.write("+%d,%d:%s->%s\n" % (len(user), len(value), user, value))
Fdb.write("\n")
# Oops, something unspeakable happened.
# Write out the position for each user
for x in PasswdAttrs:
a = UDLdap.Account(x[0], x[1])
- if not ('latitude' in a and 'longitude' in a):
- continue
+ if not ('latitude' in a and 'longitude' in a): continue
try:
Line = "%8s %8s \"\""%(a.latitude_dec(True), a.longitude_dec(True))
Line = Sanitize(Line) + "\n"
# Write out the position for each user
for x in DebianDDUsers:
a = UDLdap.Account(x[0], x[1])
- if not a.is_active_user():
- continue
- if not 'privateSub' in a:
- continue
+ if not a.is_active_user(): continue
+ if not 'privateSub' in a: continue
try:
Line = "%s"%(a['privateSub'])
Line = Sanitize(Line) + "\n"
I = 0
for x in PasswdAttrs:
a = UDLdap.Account(x[0], x[1])
- if a.pw_active():
- continue
+ if a.pw_active(): continue
Line = "%s:%s" % (a['uid'], "Account is locked")
DisabledUsers.append(x)
F.write(Sanitize(Line) + "\n")
global PasswdAttrs
for x in PasswdAttrs:
- Reason = None
-
- if x[1].has_key("mailDisableMessage"):
- Reason = GetAttr(x, "mailDisableMessage")
- else:
- continue
-
- try:
- Line = "%s: %s"%(GetAttr(x, "uid"), Reason)
- Line = Sanitize(Line) + "\n"
- F.write(Line)
- except:
- pass
+ a = UDLdap.Account(x[0], x[1])
+ if not 'mailDisableMessage' in a: continue
+ Line = "%s: %s"%(a['uid'], a['mailDisableMessage'])
+ Line = Sanitize(Line) + "\n"
+ F.write(Line)
# Oops, something unspeakable happened.
except:
Done(File, F, None)
# Generate a list of uids that should have boolean affects applied
-def GenMailBool(File, Key):
+def GenMailBool(File, key):
F = None
try:
F = open(File + ".tmp", "w")
global PasswdAttrs
for x in PasswdAttrs:
- Reason = None
-
- if x[1].has_key(Key) == 0:
- continue
-
- if GetAttr(x, Key) != "TRUE":
- continue
-
- try:
- Line = "%s"%(GetAttr(x, "uid"))
- Line = Sanitize(Line) + "\n"
- F.write(Line)
- except:
- pass
-
+ a = UDLdap.Account(x[0], x[1])
+ if not key in a: continue
+ if not a[key] == 'TRUE': continue
+ Line = "%s"%(a['uid'])
+ Line = Sanitize(Line) + "\n"
+ F.write(Line)
+
# Oops, something unspeakable happened.
except:
Die(File, F, None)
Done(File, F, None)
# Generate a list of hosts for RBL or whitelist purposes.
-def GenMailList(File, Key):
+def GenMailList(File, key):
F = None
try:
F = open(File + ".tmp", "w")
# Fetch all the users
global PasswdAttrs
+ if key == "mailWhitelist": validregex = re.compile('^[-\w.]+(/[\d]+)?$')
+ else: validregex = re.compile('^[-\w.]+$')
+
for x in PasswdAttrs:
- Reason = None
-
- if x[1].has_key(Key) == 0:
- continue
-
- try:
- found = 0
- Line = None
- for z in x[1][Key]:
- if Key == "mailWhitelist":
- if re.match('^[-\w.]+(/[\d]+)?$', z) == None:
- continue
- else:
- if re.match('^[-\w.]+$', z) == None:
- continue
- if found == 0:
- found = 1
- Line = GetAttr(x, "uid")
- else:
- Line += " "
- Line += ": " + z
- if Key == "mailRHSBL":
- Line += "/$sender_address_domain"
-
- if Line != None:
- Line = Sanitize(Line) + "\n"
- F.write(Line)
- except:
- pass
-
+ a = UDLdap.Account(x[0], x[1])
+ if not key in a: continue
+
+ filtered = filter(lambda z: validregex.match(z), a[key])
+ if len(filtered) == 0: continue
+ if key == "mailRHSBL": filtered = map(lambda z: z+"/$sender_address_domain", filtered)
+ line = a['uid'] + ': ' + ' : '.join(filtered)
+ line = Sanitize(line) + "\n"
+ F.write(line)
+
# Oops, something unspeakable happened.
except:
Die(File, F, None)
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
+def isRoleAccount(account):
+ return 'debianRoleAccount' in account['objectClass']
# Generate the DNS Zone file
def GenDNS(File):
# Write out the zone file entry for each user
for x in PasswdAttrs:
- if x[1].has_key("dnsZoneEntry") == 0:
- continue
-
- # If the account has no PGP key, do not write it
- if x[1].has_key("keyFingerPrint") == 0 and not isRoleAccount(x[1]):
- continue
+ a = UDLdap.Account(x[0], x[1])
+ if not 'dnsZoneEntry' in a: continue
+ if not a.is_active_user() and not isRoleAccount(a): continue
+
try:
- F.write("; %s\n"%(EmailAddress(x)))
- for z in x[1]["dnsZoneEntry"]:
+ F.write("; %s\n"%(a.email_address()))
+ for z in a["dnsZoneEntry"]:
Split = z.lower().split()
if Split[1].lower() == 'in':
for y in range(0, len(Split)):
# Write some identification information
if not RRs.has_key(Host):
if Split[2].lower() in ["a", "aaaa"]:
- Line = "%s IN TXT \"%s\"\n"%(Split[0], EmailAddress(x))
- for y in x[1]["keyFingerPrint"]:
+ Line = "%s IN TXT \"%s\"\n"%(Split[0], a.email_address())
+ for y in a["keyFingerPrint"]:
Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0], FormatPGPKey(y))
F.write(Line)
RRs[Host] = 1
F.write(Line)
F.write("\n")
- except:
- F.write("; Errors\n")
+ except Exception, e:
+ F.write("; Errors:\n")
+ for line in str(e).split("\n"):
+ F.write("; %s\n"%(line))
pass
# Oops, something unspeakable happened.
projects / mirror / userdir-ldap.git / blobdiff