X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=5529d93a312b93d899aa177ac87a1c035b99c5c7;hb=9b17f1fdeb031eb57906422dd4615d5a31f0f8a4;hp=e5c1ae38eafa6f10875b5667dc02147f3ceeab54;hpb=0b086a5406ec0ccae9c660050af7c9f343cf89e6;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index e5c1ae3..5529d93 100755 --- a/ud-generate +++ b/ud-generate @@ -31,22 +31,34 @@ 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 * +import UDLdap try: from cStringIO import StringIO except ImportError: from StringIO import StringIO +try: + import simplejson as json +except ImportError: + import json + if not '__author__' in json.__dict__: + sys.stderr.write("Warning: This is probably the wrong json module. We want python 2.6's json\n") + sys.stderr.write("module, or simplejson on pytyon 2.5. Let's see if/how stuff blows up.\n") -global Allowed -global CurrentHost +if os.getuid() == 0: + sys.stderr.write("You should probably not run ud-generate as root.\n") + sys.exit(1) -PasswdAttrs = None -DebianUsers = None -DisabledUsers = [] + +# +# GLOBAL STATE +# GroupIDMap = {} SubGroupMap = {} Allowed = None 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("^([^ <>@]+@[^ ,<>@]+)?$") @@ -54,6 +66,7 @@ BSMTPCheck = re.compile(".*mx 0 (master)\.debian\.org\..*",re.DOTALL) PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]") IsV6Addr = re.compile("^[a-fA-F0-9:]+$") IsDebianHost = re.compile(ConfModule.dns_hostmatch) +isSSHFP = re.compile("^\s*IN\s+SSHFP") DNSZone = ".debian.net" Keyrings = ConfModule.sync_keyrings.split(":") @@ -85,19 +98,17 @@ def DoLink(From, To, File): pass posix.link(From + File, To + File) -def IsRetired(DnRecord): +def IsRetired(account): """ 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 + status = account['accountStatus'] line = status.split() status = line[0] - + if status == "inactive": return True @@ -116,32 +127,25 @@ def IsRetired(DnRecord): return False -def IsGidDebian(x): - try: - return int(GetAttr(x, "gidNumber", 0)) == 800 - except ValueError: - return False +#def IsGidDebian(account): +# return account['gidNumber'] == 800 # See if this user is in the group list -def IsInGroup(DnRecord): +def IsInGroup(account): if Allowed is None: return True # See if the primary group is in the list - if Allowed.has_key(GetAttr(DnRecord, "gidNumber")) != 0: - return True + if str(account['gidNumber']) in Allowed: return True # Check the host based ACL - if DnRecord[1].has_key("allowedHost") != 0: - if CurrentHost in DnRecord[1]["allowedHost"]: - return True + if account.is_allowed_by_hostacl(CurrentHost): return True # See if there are supplementary groups - if DnRecord[1].has_key("supplementaryGid") == 0: - return False + if not 'supplementaryGid' in account: return False supgroups=[] - addGroups(supgroups, DnRecord[1]["supplementaryGid"], GetAttr(DnRecord, "uid")) + addGroups(supgroups, account['supplementaryGid'], account['uid']) for g in supgroups: if Allowed.has_key(g): return True @@ -170,37 +174,34 @@ def Done(File, F, Fdb): os.rename(File + ".tdb.tmp", File + ".tdb") # Generate the password list -def GenPasswd(File, HomePrefix, PwdMarker): +def GenPasswd(accounts, File, HomePrefix, PwdMarker): F = None try: F = open(File + ".tdb.tmp", "w") - + userlist = {} - # Fetch all the users - global PasswdAttrs - - I = 0 - for x in PasswdAttrs: - if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): - continue - + i = 0 + for a in accounts: + if not IsInGroup(a): 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) @@ -210,46 +211,58 @@ def GenPasswd(File, HomePrefix, PwdMarker): # Return the list of users so we know which keys to export return userlist +def GenAllUsers(accounts, file): + f = None + try: + OldMask = os.umask(0022) + f = open(file + ".tmp", "w", 0644) + os.umask(OldMask) + + all = [] + for a in accounts: + all.append( { 'uid': a['uid'], + 'uidNumber': a['uidNumber'], + 'active': a.pw_active() and a.shadow_active() } ) + json.dump(all, f) + + # Oops, something unspeakable happened. + except: + Die(file, f, None) + raise + Done(file, f, None) + # Generate the shadow list -def GenShadow(File): +def GenShadow(accounts, File): F = None try: OldMask = os.umask(0077) F = open(File + ".tdb.tmp", "w", 0600) os.umask(OldMask) - - # Fetch all the users - global PasswdAttrs - - 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:] - + + i = 0 + for a in accounts: + Pass = '*' + if not IsInGroup(a): 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) @@ -257,23 +270,19 @@ def GenShadow(File): Done(File, None, F) # Generate the sudo passwd file -def GenShadowSudo(File, untrusted): +def GenShadowSudo(accounts, File, untrusted): F = None try: OldMask = os.umask(0077) F = open(File + ".tmp", "w", 0600) os.umask(OldMask) - - # Fetch all the users - global PasswdAttrs - - for x in PasswdAttrs: + + for a in accounts: Pass = '*' - if x[1].has_key("uidNumber") == 0 or not IsInGroup(x): - continue + if not IsInGroup(a): 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 @@ -282,7 +291,7 @@ def GenShadowSudo(File, untrusted): 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(',') @@ -297,7 +306,7 @@ def GenShadowSudo(File, untrusted): 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)) @@ -308,31 +317,24 @@ def GenShadowSudo(File, untrusted): Done(File, F, None) # Generate the shadow list -def GenSSHShadow(): +def GenSSHShadow(global_dir, accounts): # Fetch all the users userfiles = [] - global PasswdAttrs - - safe_rmtree(os.path.join(GlobalDir, 'userkeys')) - safe_makedirs(os.path.join(GlobalDir, 'userkeys')) + safe_rmtree(os.path.join(global_dir, 'userkeys')) + safe_makedirs(os.path.join(global_dir, 'userkeys')) - for x in PasswdAttrs: + for a in accounts: + 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(global_dir, '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) @@ -350,9 +352,9 @@ def GenSSHShadow(): return userfiles -def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target): +def GenSSHtarballs(global_dir, userlist, SSHFiles, grouprevmap, target): OldMask = os.umask(0077) - tf = tarfile.open(name=os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), mode='w:gz') + tf = tarfile.open(name=os.path.join(global_dir, 'ssh-keys-%s.tar.gz' % CurrentHost), mode='w:gz') os.umask(OldMask) for f in userlist.keys(): if f not in SSHFiles: @@ -376,7 +378,7 @@ def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target): print "User %s is supposed to have their key exported to host %s but their primary group (gid: %d) isn't in LDAP" % (f, CurrentHost, userlist[f]) continue - to = tf.gettarinfo(os.path.join(GlobalDir, 'userkeys', f), f) + to = tf.gettarinfo(os.path.join(global_dir, 'userkeys', f), f) # These will only be used where the username doesn't # exist on the target system for some reason; hence, # in those cases, the safest thing is for the file to @@ -393,7 +395,7 @@ def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target): to.gname = grname to.mode = 0400 - contents = file(os.path.join(GlobalDir, 'userkeys', f)).read() + contents = file(os.path.join(global_dir, 'userkeys', f)).read() lines = [] for line in contents.splitlines(): if line.startswith("allowed_hosts=") and ' ' in line: @@ -408,7 +410,7 @@ def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target): tf.addfile(to, StringIO(contents)) tf.close() - os.rename(os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), target) + os.rename(os.path.join(global_dir, 'ssh-keys-%s.tar.gz' % CurrentHost), target) # add a list of groups to existing groups, # including all subgroups thereof, recursively. @@ -436,7 +438,7 @@ def addGroups(existingGroups, newGroups, uid): addGroups(existingGroups, SubGroupMap[group], uid) # Generate the group list -def GenGroup(File): +def GenGroup(accounts, File): grouprevmap = {} F = None try: @@ -447,25 +449,18 @@ def GenGroup(File): for x in GroupIDMap.keys(): GroupMap[x] = [] GroupHasPrimaryMembers = {} - - # Fetch all the users - global PasswdAttrs - + # 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 - + for a in accounts: + GroupHasPrimaryMembers[ a['gidNumber'] ] = True + if not IsInGroup(a): 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(): @@ -496,52 +491,43 @@ def GenGroup(File): return grouprevmap -def CheckForward(): - global PasswdAttrs - for x in PasswdAttrs: - if x[1].has_key("emailForward") == 0: - continue - - if not IsInGroup(x): - x[1].pop("emailForward") - continue +def CheckForward(accounts): + for a in accounts: + if not 'emailForward' in a: continue - # Do not allow people to try to buffer overflow busted parsers - if len(GetAttr(x, "emailForward")) > 200: - x[1].pop("emailForward") - continue + delete = False + + if not IsInGroup(a): delete = True + # Do not allow people to try to buffer overflow busted parsers + elif len(a['emailForward']) > 200: delete = True # Check the forwarding address - if EmailCheck.match(GetAttr(x, "emailForward")) == None: - x[1].pop("emailForward") + elif EmailCheck.match(a['emailForward']) is None: delete = True + + if delete: + a.delete_mailforward() # Generate the email forwarding list -def GenForward(File): +def GenForward(accounts, File): F = None try: OldMask = os.umask(0022) F = open(File + ".tmp", "w", 0644) os.umask(OldMask) - - # Fetch all the users - global PasswdAttrs - - # 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")) + + for a in accounts: + if not 'emailForward' in a: continue + Line = "%s: %s" % (a['uid'], a['emailForward']) Line = Sanitize(Line) + "\n" F.write(Line) - + # Oops, something unspeakable happened. except: Die(File, F, None) raise Done(File, F, None) -def GenCDB(File, Users, Key): +def GenCDB(accounts, File, key): Fdb = None try: OldMask = os.umask(0022) @@ -549,12 +535,11 @@ def GenCDB(File, Users, Key): os.umask(OldMask) # 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)) + for a in accounts: + 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. @@ -565,20 +550,16 @@ def GenCDB(File, Users, Key): raise "cdbmake gave an error" # Generate the anon XEarth marker file -def GenMarkers(File): +def GenMarkers(accounts, File): F = None try: F = open(File + ".tmp", "w") - - # Fetch all the users - global PasswdAttrs - + # Write out the position for each user - for x in PasswdAttrs: - if x[1].has_key("latitude") == 0 or x[1].has_key("longitude") == 0: - continue + for a in accounts: + if not ('latitude' in a and 'longitude' in a): continue try: - Line = "%8s %8s \"\""%(DecDegree(GetAttr(x, "latitude"), 1), DecDegree(GetAttr(x, "longitude"), 1)) + Line = "%8s %8s \"\""%(a.latitude_dec(True), a.longitude_dec(True)) Line = Sanitize(Line) + "\n" F.write(Line) except: @@ -591,25 +572,17 @@ def GenMarkers(File): Done(File, F, None) # Generate the debian-private subscription list -def GenPrivate(File): +def GenPrivate(accounts, File): F = None try: F = open(File + ".tmp", "w") - - # Fetch all the users - global DebianDDUsers - + # Write out the position for each user - for x in DebianDDUsers: - if x[1].has_key("privateSub") == 0: - continue - - # If the account has no PGP key, do not write it - if x[1].has_key("keyFingerPrint") == 0: - continue - + for a in accounts: + if not a.is_active_user(): continue + if not 'privateSub' in a: continue try: - Line = "%s"%(GetAttr(x, "privateSub")) + Line = "%s"%(a['privateSub']) Line = Sanitize(Line) + "\n" F.write(Line) except: @@ -622,63 +595,38 @@ def GenPrivate(File): Done(File, F, None) # Generate a list of locked accounts -def GenDisabledAccounts(File): +def GenDisabledAccounts(accounts, File): F = None try: F = open(File + ".tmp", "w") - + disabled_accounts = [] + # Fetch all the users - global PasswdAttrs - global DisabledUsers - - I = 0 - for x in PasswdAttrs: - if x[1].has_key("uidNumber") == 0: - continue - - Pass = GetAttr(x, "userPassword") - Line = "" - # *LK* is the reference value for a locked account - # password starting with ! is also a locked account - 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") - - + for a in accounts: + if a.pw_active(): continue + Line = "%s:%s" % (a['uid'], "Account is locked") + disabled_accounts.append(a) + F.write(Sanitize(Line) + "\n") + # Oops, something unspeakable happened. except: Die(File, F, None) raise Done(File, F, None) + return disabled_accounts # Generate the list of local addresses that refuse all mail -def GenMailDisable(File): +def GenMailDisable(accounts, File): F = None try: F = open(File + ".tmp", "w") - - # Fetch all the users - 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 - + + for a in accounts: + 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: Die(File, F, None) @@ -686,30 +634,18 @@ def GenMailDisable(File): Done(File, F, None) # Generate a list of uids that should have boolean affects applied -def GenMailBool(File, Key): +def GenMailBool(accounts, File, key): F = None try: F = open(File + ".tmp", "w") - - # Fetch all the users - 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 - + + for a in accounts: + 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) @@ -717,102 +653,50 @@ def GenMailBool(File, Key): Done(File, F, None) # Generate a list of hosts for RBL or whitelist purposes. -def GenMailList(File, Key): +def GenMailList(accounts, File, key): F = None try: F = open(File + ".tmp", "w") - - # Fetch all the users - global PasswdAttrs - - 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 - + + if key == "mailWhitelist": validregex = re.compile('^[-\w.]+(/[\d]+)?$') + else: validregex = re.compile('^[-\w.]+$') + + for a in accounts: + 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): +def GenDNS(accounts, File): F = None try: F = open(File + ".tmp", "w") - -# global HostAttrs -# -# 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 -# -# if IsDebianHost.match(GetAttr(x, "hostname")) is not None: -# continue -# -# DNSInfo = ExtractDNSInfo(x) -# start = True -# for Line in DNSInfo: -# if start == True: -# Line = "%s.\t%s" % (GetAttr(x, "hostname"), Line) -# start = False -# else: -# Line = "\t\t\t%s" % (Line) -# F.write(Line + "\n") # Fetch all the users - global PasswdAttrs - + RRs = {} + # 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 + for a in accounts: + 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)): @@ -826,18 +710,22 @@ def GenDNS(File): F.write("; Has BSMTP\n") # Write some identification information - if Split[2].lower() == "a": - Line = "%s IN TXT \"%s\"\n"%(Split[0], EmailAddress(x)) - for y in x[1]["keyFingerPrint"]: - Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0], FormatPGPKey(y)) - F.write(Line) + if not RRs.has_key(Host): + if Split[2].lower() in ["a", "aaaa"]: + 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 else: Line = "; Err %s"%(str(Split)) 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. @@ -888,15 +776,13 @@ def ExtractDNSInfo(x): return DNSInfo # Generate the DNS records -def GenZoneRecords(File): +def GenZoneRecords(host_attrs, File): F = None try: F = open(File + ".tmp", "w") # Fetch all the hosts - global HostAttrs - - for x in HostAttrs: + for x in host_attrs: if x[1].has_key("hostname") == 0: continue @@ -914,6 +800,29 @@ def GenZoneRecords(File): F.write(Line + "\n") + # this would write sshfp lines for services on machines + # but we can't yet, since some are cnames and we'll make + # an invalid zonefile + # + # for i in x[1].get("purpose", []): + # m = PurposeHostField.match(i) + # if m: + # m = m.group(1) + # # we ignore [[*..]] entries + # if m.startswith('*'): + # continue + # if m.startswith('-'): + # m = m[1:] + # if m: + # if not m.endswith(HostDomain): + # continue + # if not m.endswith('.'): + # m = m + "." + # for Line in DNSInfo: + # if isSSHFP.match(Line): + # Line = "%s\t%s" % (m, Line) + # F.write(Line + "\n") + # Oops, something unspeakable happened. except: Die(File, F, None) @@ -921,24 +830,18 @@ def GenZoneRecords(File): Done(File, F, None) # Generate the BSMTP file -def GenBSMTP(File, HomePrefix): +def GenBSMTP(accounts, File, HomePrefix): F = None try: F = open(File + ".tmp", "w") - # Fetch all the users - global PasswdAttrs - # 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: - continue + for a in accounts: + if not 'dnsZoneEntry' in a: continue + if not a.is_active_user(): continue + try: - for z in x[1]["dnsZoneEntry"]: + for z in a["dnsZoneEntry"]: Split = z.lower().split() if Split[1].lower() == 'in': for y in range(0, len(Split)): @@ -949,7 +852,7 @@ def GenBSMTP(File, HomePrefix): Host = Split[0] + DNSZone if BSMTPCheck.match(Line) != None: F.write("%s: user=%s group=Debian file=%s%s/bsmtp/%s\n"%(Host, - GetAttr(x, "uid"), HomePrefix, GetAttr(x, "uid"), Host)) + a['uid'], HomePrefix, a['uid'], Host)) except: F.write("; Errors\n") @@ -974,16 +877,14 @@ def HostToIP(Host, mapped=True): return IPAdresses # Generate the ssh known hosts file -def GenSSHKnown(File, mode=None): +def GenSSHKnown(host_attrs, File, mode=None): F = None try: OldMask = os.umask(0022) F = open(File + ".tmp", "w", 0644) os.umask(OldMask) - global HostAttrs - - for x in HostAttrs: + for x in host_attrs: if x[1].has_key("hostname") == 0 or \ x[1].has_key("sshRSAHostKey") == 0: continue @@ -1017,7 +918,6 @@ def GenSSHKnown(File, mode=None): if 'sshdistAuthKeysHost' in x[1]: hosts += x[1]['sshdistAuthKeysHost'] 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(hosts), 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(x, False)), I) Line = Sanitize(Line) + "\n" @@ -1029,7 +929,7 @@ def GenSSHKnown(File, mode=None): Done(File, F, None) # Generate the debianhosts file (list of all IP addresses) -def GenHosts(File): +def GenHosts(host_attrs, File): F = None try: OldMask = os.umask(0022) @@ -1038,9 +938,7 @@ def GenHosts(File): seen = set() - global HostAttrs - - for x in HostAttrs: + for x in host_attrs: if IsDebianHost.match(GetAttr(x, "hostname")) is None: continue @@ -1065,95 +963,108 @@ 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") -Pass = F.readline().strip().split(" ") -F.close() -l.simple_bind_s("uid=" + Pass[0] + "," + BaseDn, Pass[1]) -# Fetch all the groups -GroupIDMap = {} -Attrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "gid=*",\ - ["gid", "gidNumber", "subGroup"]) +def get_accounts(ldap_conn): + # Fetch all the users + passwd_attrs = ldap_conn.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "(&(uid=*)(!(uidNumber=0)))",\ + ["uid", "uidNumber", "gidNumber", "supplementaryGid",\ + "gecos", "loginShell", "userPassword", "shadowLastChange",\ + "shadowMin", "shadowMax", "shadowWarning", "shadowInactive", + "shadowExpire", "emailForward", "latitude", "longitude",\ + "allowedHost", "sshRSAAuthKey", "dnsZoneEntry", "cn", "sn",\ + "keyFingerPrint", "privateSub", "mailDisableMessage",\ + "mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\ + "mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\ + "mailContentInspectionAction"]) + + if passwd_attrs is None: + raise UDEmptyList, "No Users" + accounts = map(lambda x: UDLdap.Account(x[0], x[1]), passwd_attrs) + accounts.sort(lambda x,y: cmp(x['uid'].lower(), y['uid'].lower())) + + return accounts + +def get_hosts(ldap_conn): + # Fetch all the hosts + HostAttrs = ldap_conn.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "objectClass=debianServer",\ + ["hostname", "sshRSAHostKey", "purpose", "allowedGroups", "exportOptions",\ + "mXRecord", "ipHostNumber", "dnsTTL", "machine", "architecture"]) + + if HostAttrs == None: + raise UDEmptyList, "No Hosts" + + HostAttrs.sort(lambda x, y: cmp((GetAttr(x, "hostname")).lower(), (GetAttr(y, "hostname")).lower())) + + return HostAttrs + + +def make_ldap_conn(): + # Connect to the ldap server + l = connectLDAP() + # for testing purposes it's sometimes useful to pass username/password + # via the environment + if 'UD_CREDENTIALS' in os.environ: + Pass = os.environ['UD_CREDENTIALS'].split() + else: + F = open(PassDir + "/pass-" + pwd.getpwuid(os.getuid())[0], "r") + Pass = F.readline().strip().split(" ") + F.close() + l.simple_bind_s("uid=" + Pass[0] + "," + BaseDn, Pass[1]) -# Generate the SubGroupMap and GroupIDMap -for x in Attrs: - if x[1].has_key("accountStatus") and x[1]['accountStatus'] == "disabled": - continue - if x[1].has_key("gidNumber") == 0: - continue - GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidNumber"][0]) - if x[1].has_key("subGroup") != 0: - SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"]) + return l -# Fetch all the users -PasswdAttrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "uid=*",\ - ["uid", "uidNumber", "gidNumber", "supplementaryGid",\ - "gecos", "loginShell", "userPassword", "shadowLastChange",\ - "shadowMin", "shadowMax", "shadowWarning", "shadowInactive", - "shadowExpire", "emailForward", "latitude", "longitude",\ - "allowedHost", "sshRSAAuthKey", "dnsZoneEntry", "cn", "sn",\ - "keyFingerPrint", "privateSub", "mailDisableMessage",\ - "mailGreylisting", "mailCallout", "mailRBL", "mailRHSBL",\ - "mailWhitelist", "sudoPassword", "objectClass", "accountStatus",\ - "mailContentInspectionAction"]) - -if PasswdAttrs is None: - raise UDEmptyList, "No Users" - -PasswdAttrs.sort(lambda x, y: cmp((GetAttr(x, "uid")).lower(), (GetAttr(y, "uid")).lower())) - -# Fetch all the hosts -HostAttrs = l.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "objectClass=debianServer",\ - ["hostname", "sshRSAHostKey", "purpose", "allowedGroups", "exportOptions",\ - "mXRecord", "ipHostNumber", "dnsTTL", "machine", "architecture"]) - -if HostAttrs == None: - raise UDEmptyList, "No Hosts" - -HostAttrs.sort(lambda x, y: cmp((GetAttr(x, "hostname")).lower(), (GetAttr(y, "hostname")).lower())) - -# Generate global things -GlobalDir = GenerateDir + "/" -GenDisabledAccounts(GlobalDir + "disabled-accounts") - -PasswdAttrs = filter(lambda x: not IsRetired(x), PasswdAttrs) -DebianDDUsers = filter(lambda x: IsGidDebian(x), PasswdAttrs) - -CheckForward() - -GenMailDisable(GlobalDir + "mail-disable") -GenCDB(GlobalDir + "mail-forward.cdb", PasswdAttrs, 'emailForward') -GenCDB(GlobalDir + "mail-contentinspectionaction.cdb", PasswdAttrs, 'mailContentInspectionAction') -GenPrivate(GlobalDir + "debian-private") -GenSSHKnown(GlobalDir+"authorized_keys", 'authorized_keys') -GenMailBool(GlobalDir + "mail-greylist", "mailGreylisting") -GenMailBool(GlobalDir + "mail-callout", "mailCallout") -GenMailList(GlobalDir + "mail-rbl", "mailRBL") -GenMailList(GlobalDir + "mail-rhsbl", "mailRHSBL") -GenMailList(GlobalDir + "mail-whitelist", "mailWhitelist") -GenKeyrings(GlobalDir) - -# Compatibility. -GenForward(GlobalDir + "forward-alias") - -PasswdAttrs = filter(lambda x: not x in DisabledUsers, PasswdAttrs) - -SSHFiles = GenSSHShadow() -GenMarkers(GlobalDir + "markers") -GenSSHKnown(GlobalDir + "ssh_known_hosts") -GenHosts(GlobalDir + "debianhosts") - -for host in HostAttrs: - if not "hostname" in host[1]: - continue +def generate_all(global_dir, ldap_conn): + accounts = get_accounts(ldap_conn) + host_attrs = get_hosts(ldap_conn) + + global_dir += '/' + # Generate global things + accounts_disabled = GenDisabledAccounts(accounts, global_dir + "disabled-accounts") + + accounts = filter(lambda x: not IsRetired(x), accounts) + #accounts_DDs = filter(lambda x: IsGidDebian(x), accounts) + + CheckForward(accounts) + + GenMailDisable(accounts, global_dir + "mail-disable") + GenCDB(accounts, global_dir + "mail-forward.cdb", 'emailForward') + GenCDB(accounts, global_dir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction') + GenPrivate(accounts, global_dir + "debian-private") + GenSSHKnown(host_attrs, global_dir+"authorized_keys", 'authorized_keys') + GenMailBool(accounts, global_dir + "mail-greylist", "mailGreylisting") + GenMailBool(accounts, global_dir + "mail-callout", "mailCallout") + GenMailList(accounts, global_dir + "mail-rbl", "mailRBL") + GenMailList(accounts, global_dir + "mail-rhsbl", "mailRHSBL") + GenMailList(accounts, global_dir + "mail-whitelist", "mailWhitelist") + GenKeyrings(global_dir) + + # Compatibility. + GenForward(accounts, global_dir + "forward-alias") + + GenAllUsers(accounts, global_dir + 'all-accounts.json') + accounts = filter(lambda a: not a in accounts_disabled, accounts) + + ssh_files = GenSSHShadow(global_dir, accounts) + GenMarkers(accounts, global_dir + "markers") + GenSSHKnown(host_attrs, global_dir + "ssh_known_hosts") + GenHosts(host_attrs, global_dir + "debianhosts") + + GenDNS(accounts, global_dir + "dns-zone") + GenZoneRecords(host_attrs, global_dir + "dns-sshfp") + + for host in host_attrs: + if not "hostname" in host[1]: + continue + generate_host(host, global_dir, accounts, ssh_files) + +def generate_host(host, global_dir, accounts, ssh_files): + global CurrentHost CurrentHost = host[1]['hostname'][0] - OutDir = GenerateDir + '/' + CurrentHost + '/' + OutDir = global_dir + CurrentHost + '/' try: os.mkdir(OutDir) - except: + except: pass # Get the group list and convert any named groups to numerics @@ -1172,71 +1083,96 @@ for host in HostAttrs: for extra in host[1]['exportOptions']: ExtraList[extra.upper()] = True + global Allowed Allowed = GroupList if Allowed == {}: Allowed = None - DoLink(GlobalDir, OutDir, "debianhosts") - DoLink(GlobalDir, OutDir, "ssh_known_hosts") - DoLink(GlobalDir, OutDir, "disabled-accounts") + DoLink(global_dir, OutDir, "debianhosts") + DoLink(global_dir, OutDir, "ssh_known_hosts") + DoLink(global_dir, OutDir, "disabled-accounts") sys.stdout.flush() if 'NOPASSWD' in ExtraList: - userlist = GenPasswd(OutDir + "passwd", HomePrefix, "*") + userlist = GenPasswd(accounts, OutDir + "passwd", HomePrefix, "*") else: - userlist = GenPasswd(OutDir + "passwd", HomePrefix, "x") + userlist = GenPasswd(accounts, OutDir + "passwd", HomePrefix, "x") sys.stdout.flush() - grouprevmap = GenGroup(OutDir + "group") - GenShadowSudo(OutDir + "sudo-passwd", ('UNTRUSTED' in ExtraList) or ('NOPASSWD' in ExtraList)) + grouprevmap = GenGroup(accounts, OutDir + "group") + GenShadowSudo(accounts, 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')) + GenSSHtarballs(global_dir, userlist, ssh_files, grouprevmap, os.path.join(OutDir, 'ssh-keys.tar.gz')) if not 'NOPASSWD' in ExtraList: - GenShadow(OutDir + "shadow") + GenShadow(accounts, OutDir + "shadow") # Link in global things 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") - DoLink(GlobalDir, OutDir, "mail-rbl") - DoLink(GlobalDir, OutDir, "mail-rhsbl") - DoLink(GlobalDir, OutDir, "mail-whitelist") - GenCDB(OutDir + "user-forward.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'emailForward') - GenCDB(OutDir + "batv-tokens.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'bATVToken') - GenCDB(OutDir + "default-mail-options.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'mailDefaultOptions') + DoLink(global_dir, OutDir, "markers") + DoLink(global_dir, OutDir, "mail-forward.cdb") + DoLink(global_dir, OutDir, "mail-contentinspectionaction.cdb") + DoLink(global_dir, OutDir, "mail-disable") + DoLink(global_dir, OutDir, "mail-greylist") + DoLink(global_dir, OutDir, "mail-callout") + DoLink(global_dir, OutDir, "mail-rbl") + DoLink(global_dir, OutDir, "mail-rhsbl") + DoLink(global_dir, OutDir, "mail-whitelist") + DoLink(global_dir, OutDir, "all-accounts.json") + GenCDB(filter(lambda x: IsInGroup(x), accounts), OutDir + "user-forward.cdb", 'emailForward') + GenCDB(filter(lambda x: IsInGroup(x), accounts), OutDir + "batv-tokens.cdb", 'bATVToken') + GenCDB(filter(lambda x: IsInGroup(x), accounts), OutDir + "default-mail-options.cdb", 'mailDefaultOptions') # Compatibility. - DoLink(GlobalDir, OutDir, "forward-alias") + DoLink(global_dir, OutDir, "forward-alias") if 'DNS' in ExtraList: - GenDNS(OutDir + "dns-zone") - GenZoneRecords(OutDir + "dns-sshfp") + DoLink(global_dir, OutDir, "dns-zone") + DoLink(global_dir, OutDir, "dns-sshfp") if 'AUTHKEYS' in ExtraList: - DoLink(GlobalDir, OutDir, "authorized_keys") + DoLink(global_dir, OutDir, "authorized_keys") if 'BSMTP' in ExtraList: - GenBSMTP(OutDir + "bsmtp", HomePrefix) + GenBSMTP(accounts, OutDir + "bsmtp", HomePrefix) if 'PRIVATE' in ExtraList: - DoLink(GlobalDir, OutDir, "debian-private") + DoLink(global_dir, OutDir, "debian-private") if 'KEYRING' in ExtraList: for k in Keyrings: - DoLink(GlobalDir, OutDir, os.path.basename(k)) + DoLink(global_dir, OutDir, os.path.basename(k)) else: for k in Keyrings: - try: + try: posix.remove(OutDir + os.path.basename(k)) except: pass +l = make_ldap_conn() + +# Fetch all the groups +GroupIDMap = {} +attrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "gid=*",\ + ["gid", "gidNumber", "subGroup"]) + +# Generate the SubGroupMap and GroupIDMap +for x in attrs: + if x[1].has_key("accountStatus") and x[1]['accountStatus'] == "disabled": + continue + if x[1].has_key("gidNumber") == 0: + continue + GroupIDMap[x[1]["gid"][0]] = int(x[1]["gidNumber"][0]) + if x[1].has_key("subGroup") != 0: + SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"]) + +# override globaldir for testing +if 'UD_GENERATEDIR' in os.environ: + GenerateDir = os.environ['UD_GENERATEDIR'] + +generate_all(GenerateDir, l) + # vim:set et: # vim:set ts=3: # vim:set shiftwidth=3: