X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=02b379418b2e6ef71039ca69dce0e9a5e438cf2d;hb=e9dc8e658380c666e2149d735c97a1116c71db08;hp=693e5639660b0756f3c31b004ecec8f533a63ff9;hpb=2fea3b6ff06f1cc758e97fd9340fa7303e92ff1b;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 693e563..02b3794 100755 --- a/ud-generate +++ b/ud-generate @@ -6,12 +6,13 @@ # Copyright (c) 2003-2004 James Troup # Copyright (c) 2004-2005,7 Joey Schulze # Copyright (c) 2001-2007 Ryan Murray -# Copyright (c) 2008 Peter Palfrader +# Copyright (c) 2008,2009,2010 Peter Palfrader # Copyright (c) 2008 Andreas Barth # Copyright (c) 2008 Mark Hymers # Copyright (c) 2008 Luk Claes # Copyright (c) 2008 Thomas Viehmann # Copyright (c) 2009 Stephen Gran +# Copyright (c) 2010 Helmut Grohne # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,13 +31,27 @@ 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 -PasswdAttrs = None -DisabledUsers = [] -RetiredUsers = [] +if os.getuid() == 0: + sys.stderr.write("You should probably not run ud-generate as root.\n") + sys.exit(1) + +DebianUsers = None GroupIDMap = {} SubGroupMap = {} Allowed = None @@ -45,8 +60,11 @@ 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:]+$") +IsDebianHost = re.compile(ConfModule.dns_hostmatch) +isSSHFP = re.compile("^\s*IN\s+SSHFP") DNSZone = ".debian.net" Keyrings = ConfModule.sync_keyrings.split(":") @@ -78,19 +96,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 @@ -101,38 +117,37 @@ 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 +#def IsGidDebian(account): +# return account['gidNumber'] == 800 + # See if this user is in the group list -def IsInGroup(DnRecord): - if Allowed == None: - return 1 +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 1 + if str(account['gidNumber']) in Allowed: 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 'allowedHost' in account and CurrentHost in account['allowedHost']: return True # See if there are supplementary groups - if DnRecord[1].has_key("supplementaryGid") == 0: - return 0 + 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 1 - return 0 + return True + return False def Die(File, F, Fdb): if F != None: @@ -157,37 +172,34 @@ def Done(File, F, Fdb): os.rename(File + ".tdb.tmp", File + ".tdb") # Generate the password list -def GenPasswd(l, 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 IsInGroup(x) == 0: - 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) @@ -197,46 +209,58 @@ def GenPasswd(l, 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(l, 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 IsInGroup(x) == 0: - 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) @@ -244,23 +268,19 @@ def GenShadow(l, File): Done(File, None, F) # Generate the sudo passwd file -def GenShadowSudo(l, 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 IsInGroup(x) == 0: - 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 @@ -269,7 +289,7 @@ def GenShadowSudo(l, 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(',') @@ -280,11 +300,11 @@ def GenShadowSudo(l, 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 = '*' - Line = "%s:%s" % (GetAttr(x, "uid"), Pass) + Line = "%s:%s" % (a['uid'], Pass) Line = Sanitize(Line) + "\n" F.write("%s" % (Line)) @@ -295,31 +315,24 @@ def GenShadowSudo(l, File, untrusted): Done(File, F, None) # Generate the shadow list -def GenSSHShadow(): +def GenSSHShadow(accounts): # Fetch all the users userfiles = [] - global PasswdAttrs - safe_rmtree(os.path.join(GlobalDir, 'userkeys')) safe_makedirs(os.path.join(GlobalDir, '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(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) @@ -329,9 +342,11 @@ def GenSSHShadow(): # Oops, something unspeakable happened. except IOError: - Die(File, F, None) - Die(masterFileName, masterFile, None) - raise + Die(File, F, None) + # As neither masterFileName nor masterFile are defined at any point + # this will raise a NameError. + Die(masterFileName, masterFile, None) + raise return userfiles @@ -377,7 +392,20 @@ def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target): to.uname = f to.gname = grname to.mode = 0400 - tf.addfile(to, file(os.path.join(GlobalDir, 'userkeys', f))) + + contents = file(os.path.join(GlobalDir, 'userkeys', f)).read() + lines = [] + for line in contents.splitlines(): + if line.startswith("allowed_hosts=") and ' ' in line: + machines, line = line.split('=', 1)[1].split(' ', 1) + if CurrentHost not in machines.split(','): + continue # skip this key + lines.append(line) + if not lines: + continue # no keys for this host + contents = "\n".join(lines) + "\n" + to.size = len(contents) + tf.addfile(to, StringIO(contents)) tf.close() os.rename(os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), target) @@ -396,7 +424,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" @@ -408,7 +436,7 @@ def addGroups(existingGroups, newGroups, uid): addGroups(existingGroups, SubGroupMap[group], uid) # Generate the group list -def GenGroup(l, File): +def GenGroup(accounts, File): grouprevmap = {} F = None try: @@ -418,34 +446,35 @@ def GenGroup(l, File): GroupMap = {} for x in GroupIDMap.keys(): GroupMap[x] = [] - - # Fetch all the users - global PasswdAttrs - + GroupHasPrimaryMembers = {} + # 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: - 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(): - grouprevmap[GroupIDMap[x]] = x if GroupIDMap.has_key(x) == 0: continue + + if len(GroupMap[x]) == 0 and GroupIDMap[x] not in GroupHasPrimaryMembers: + continue + + grouprevmap[GroupIDMap[x]] = x + 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)) @@ -460,72 +489,56 @@ def GenGroup(l, File): return grouprevmap -def CheckForward(): - global PasswdAttrs - for x in PasswdAttrs: - if x[1].has_key("emailForward") == 0: - continue - - if IsInGroup(x) == 0: - 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(l, 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 GenAllForward(l, File): +def GenCDB(accounts, 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 PasswdAttrs - + # Write out the email address for each user - for x in PasswdAttrs: - if x[1].has_key("emailForward") == 0: - continue - - # Do not allow people to try to buffer overflow busted parsers - Forward = GetAttr(x, "emailForward") - - User = GetAttr(x, "uid") - Fdb.write("+%d,%d:%s->%s\n" % (len(User), len(Forward), User, Forward)) - + 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. except: @@ -535,20 +548,16 @@ def GenAllForward(l, File): raise "cdbmake gave an error" # Generate the anon XEarth marker file -def GenMarkers(l, 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: @@ -561,29 +570,17 @@ def GenMarkers(l, File): Done(File, F, None) # Generate the debian-private subscription list -def GenPrivate(l, File): +def GenPrivate(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("privateSub") == 0: - continue - - # If the account has no PGP key, do not write it - if x[1].has_key("keyFingerPrint") == 0: - continue - - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x, "gidNumber") != "800": - 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: @@ -596,67 +593,38 @@ def GenPrivate(l, File): Done(File, F, None) # Generate a list of locked accounts -def GenDisabledAccounts(l, 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") - - if Line != "": - F.write(Sanitize(Line) + "\n") - - DisabledUsers.append(x) - + 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(l, 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 - - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x, "gidNumber") != "800": - 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) @@ -664,34 +632,18 @@ def GenMailDisable(l, File): Done(File, F, None) # Generate a list of uids that should have boolean affects applied -def GenMailBool(l, 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 - - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x, "gidNumber") != "800": - 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) @@ -699,85 +651,50 @@ def GenMailBool(l, File, Key): Done(File, F, None) # Generate a list of hosts for RBL or whitelist purposes. -def GenMailList(l, 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 - - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x, "gidNumber") != "800": - 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(l, File, HomePrefix): +def GenDNS(accounts, File): F = None try: F = open(File + ".tmp", "w") - + # 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)): @@ -788,21 +705,25 @@ def GenDNS(l, 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": - 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. @@ -811,35 +732,97 @@ def GenDNS(l, File, HomePrefix): raise Done(File, F, None) -# Generate the DNS SSHFP records -def GenSSHFP(l, File, HomePrefix): +def ExtractDNSInfo(x): + + TTLprefix="\t" + if 'dnsTTL' in x[1]: + TTLprefix="%s\t"%(x[1]["dnsTTL"][0]) + + DNSInfo = [] + if x[1].has_key("ipHostNumber"): + for I in x[1]["ipHostNumber"]: + if IsV6Addr.match(I) != None: + DNSInfo.append("%sIN\tAAAA\t%s" % (TTLprefix, I)) + else: + DNSInfo.append("%sIN\tA\t%s" % (TTLprefix, I)) + + Algorithm = None + + if 'sshRSAHostKey' in x[1]: + for I in x[1]["sshRSAHostKey"]: + Split = I.split() + if Split[0] == 'ssh-rsa': + Algorithm = 1 + if Split[0] == 'ssh-dss': + Algorithm = 2 + if Algorithm == None: + continue + Fingerprint = sha.new(base64.decodestring(Split[1])).hexdigest() + DNSInfo.append("%sIN\tSSHFP\t%u 1 %s" % (TTLprefix, Algorithm, Fingerprint)) + + if 'architecture' in x[1]: + Arch = GetAttr(x, "architecture") + Mach = "" + if x[1].has_key("machine"): + Mach = " " + GetAttr(x, "machine") + DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian GNU/Linux")) + + if x[1].has_key("mXRecord"): + for I in x[1]["mXRecord"]: + DNSInfo.append("%sIN\tMX\t%s" % (TTLprefix, I)) + + return DNSInfo + +# Generate the DNS records +def GenZoneRecords(File): F = None try: F = open(File + ".tmp", "w") - + # Fetch all the hosts global HostAttrs - if HostAttrs == None: - raise UDEmptyList, "No Hosts" - + for x in HostAttrs: - if x[1].has_key("hostname") == 0 or \ - x[1].has_key("sshRSAHostKey") == 0: + if x[1].has_key("hostname") == 0: continue - Host = GetAttr(x, "hostname") - Algorithm = None - for I in x[1]["sshRSAHostKey"]: - Split = I.split() - if Split[0] == 'ssh-rsa': - Algorithm = 1 - if Split[0] == 'ssh-dss': - Algorithm = 2 - if Algorithm == None: - continue - Fingerprint = sha.new(base64.decodestring(Split[1])).hexdigest() - Line = "%s. IN SSHFP %u 1 %s" % (Host, Algorithm, Fingerprint) - Line = Sanitize(Line) + "\n" - F.write(Line) + + if IsDebianHost.match(GetAttr(x, "hostname")) is 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") + + # 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) @@ -847,24 +830,18 @@ def GenSSHFP(l, File, HomePrefix): Done(File, F, None) # Generate the BSMTP file -def GenBSMTP(l, 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)): @@ -875,7 +852,7 @@ def GenBSMTP(l, 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") @@ -887,29 +864,20 @@ def GenBSMTP(l, File, HomePrefix): raise Done(File, F, None) -# cache IP adresses -HostToIPCache = {} -def HostToIP(Host): - global HostToIPCache - if not Host in HostToIPCache: - IPAdressesT = None - try: - IPAdressesT = list(set([ (a[0], a[4][0]) for a in socket.getaddrinfo(Host, None)])) - except socket.gaierror, (code): - if code[0] != -2: - raise - IPAdresses = [] - 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] +def HostToIP(Host, mapped=True): + + IPAdresses = [] + + if Host[1].has_key("ipHostNumber"): + for addr in Host[1]["ipHostNumber"]: + IPAdresses.append(addr) + if IsV6Addr.match(addr) is None and mapped == "True": + IPAdresses.append("::ffff:"+addr) + + return IPAdresses # Generate the ssh known hosts file -def GenSSHKnown(l, File, mode=None): +def GenSSHKnown(File, mode=None): F = None try: OldMask = os.umask(0022) @@ -917,8 +885,6 @@ def GenSSHKnown(l, File, mode=None): os.umask(OldMask) global HostAttrs - if HostAttrs == None: - raise UDEmptyList, "No Hosts" for x in HostAttrs: if x[1].has_key("hostname") == 0 or \ @@ -950,10 +916,12 @@ def GenSSHKnown(l, 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) + hosts = HostToIP(x) + 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) else: - Line = "%s %s" %(",".join(HostNames + HostToIP(Host)), I) + Line = "%s %s" %(",".join(HostNames + HostToIP(x, False)), I) Line = Sanitize(Line) + "\n" F.write(Line) # Oops, something unspeakable happened. @@ -963,56 +931,52 @@ def GenSSHKnown(l, File, mode=None): Done(File, F, None) # Generate the debianhosts file (list of all IP addresses) -def GenHosts(l, File): +def GenHosts(File): 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 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) + + global HostAttrs + + for x in HostAttrs: + + if IsDebianHost.match(GetAttr(x, "hostname")) is None: + continue + + if not 'ipHostNumber' in x[1]: + continue + + addrs = x[1]["ipHostNumber"] + for addr in addrs: + if addr not in seen: + seen.add(addr) + addr = Sanitize(addr) + "\n" + F.write(addr) + # Oops, something unspeakable happened. except: - Die(File, F, None) - raise + Die(File, F, None) + raise Done(File, F, None) -def GenKeyrings(l, OutDir): +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() +# 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]) # Fetch all the groups @@ -1022,6 +986,8 @@ Attrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "gid=*",\ # 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]) @@ -1029,7 +995,7 @@ for x in Attrs: SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"]) # Fetch all the users -PasswdAttrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "uid=*",\ +passwd_attrs = l.search_s(BaseDn, ldap.SCOPE_ONELEVEL, "(&(uid=*)(!(uidNumber=0)))",\ ["uid", "uidNumber", "gidNumber", "supplementaryGid",\ "gecos", "loginShell", "userPassword", "shadowLastChange",\ "shadowMin", "shadowMax", "shadowWarning", "shadowInactive", @@ -1037,66 +1003,66 @@ 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: +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())) # Fetch all the hosts -HostAttrs = l.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "sshRSAHostKey=*",\ - ["hostname", "sshRSAHostKey", "purpose"]) +HostAttrs = l.search_s(HostBaseDn, ldap.SCOPE_ONELEVEL, "objectClass=debianServer",\ + ["hostname", "sshRSAHostKey", "purpose", "allowedGroups", "exportOptions",\ + "mXRecord", "ipHostNumber", "dnsTTL", "machine", "architecture"]) -# Open the control file -if len(sys.argv) == 1: - F = open(GenerateConf, "r") -else: - F = open(sys.argv[1], "r") +if HostAttrs == None: + raise UDEmptyList, "No Hosts" + +HostAttrs.sort(lambda x, y: cmp((GetAttr(x, "hostname")).lower(), (GetAttr(y, "hostname")).lower())) + +# override globaldir for testing +if 'UD_GENERATEDIR' in os.environ: + GenerateDir = os.environ['UD_GENERATEDIR'] # Generate global things GlobalDir = GenerateDir + "/" -GenDisabledAccounts(l, GlobalDir + "disabled-accounts") - -for x in PasswdAttrs: - if IsRetired(x): - RetiredUsers.append(x) +accounts_disabled = GenDisabledAccounts(accounts, GlobalDir + "disabled-accounts") -PasswdAttrs = filter(lambda x: not x in RetiredUsers, PasswdAttrs) +accounts = filter(lambda x: not IsRetired(x), accounts) +#accounts_DDs = filter(lambda x: IsGidDebian(x), accounts) -CheckForward() +CheckForward(accounts) -GenMailDisable(l, GlobalDir + "mail-disable") -GenAllForward(l, GlobalDir + "mail-forward.cdb") -GenPrivate(l, GlobalDir + "debian-private") -#GenSSHKnown(l,GlobalDir+"authorized_keys", 'authorized_keys') -GenMailBool(l, GlobalDir + "mail-greylist", "mailGreylisting") -GenMailBool(l, GlobalDir + "mail-callout", "mailCallout") -GenMailList(l, GlobalDir + "mail-rbl", "mailRBL") -GenMailList(l, GlobalDir + "mail-rhsbl", "mailRHSBL") -GenMailList(l, GlobalDir + "mail-whitelist", "mailWhitelist") -GenKeyrings(l, GlobalDir) +GenMailDisable(accounts, GlobalDir + "mail-disable") +GenCDB(accounts, GlobalDir + "mail-forward.cdb", 'emailForward') +GenCDB(accounts, GlobalDir + "mail-contentinspectionaction.cdb", 'mailContentInspectionAction') +GenPrivate(accounts, GlobalDir + "debian-private") +GenSSHKnown(GlobalDir+"authorized_keys", 'authorized_keys') +GenMailBool(accounts, GlobalDir + "mail-greylist", "mailGreylisting") +GenMailBool(accounts, GlobalDir + "mail-callout", "mailCallout") +GenMailList(accounts, GlobalDir + "mail-rbl", "mailRBL") +GenMailList(accounts, GlobalDir + "mail-rhsbl", "mailRHSBL") +GenMailList(accounts, GlobalDir + "mail-whitelist", "mailWhitelist") +GenKeyrings(GlobalDir) # Compatibility. -GenForward(l, GlobalDir + "forward-alias") +GenForward(accounts, GlobalDir + "forward-alias") -PasswdAttrs = filter(lambda x: not x in DisabledUsers, PasswdAttrs) +GenAllUsers(accounts, 'all-accounts.json') +accounts = filter(lambda a: not a in accounts_disabled, accounts) -SSHFiles = GenSSHShadow() -GenMarkers(l, GlobalDir + "markers") -GenSSHKnown(l, GlobalDir + "ssh_known_hosts") -GenHosts(l, GlobalDir + "debianhosts") +SSHFiles = GenSSHShadow(accounts) +GenMarkers(accounts, GlobalDir + "markers") +GenSSHKnown(GlobalDir + "ssh_known_hosts") +GenHosts(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: @@ -1104,68 +1070,77 @@ 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(l, OutDir + "passwd", Split[1], "*") + if 'NOPASSWD' in ExtraList: + userlist = GenPasswd(accounts, OutDir + "passwd", HomePrefix, "*") else: - userlist = GenPasswd(l, OutDir + "passwd", Split[1], "x") + userlist = GenPasswd(accounts, OutDir + "passwd", HomePrefix, "x") sys.stdout.flush() - grouprevmap = GenGroup(l, OutDir + "group") - GenShadowSudo(l, OutDir + "sudo-passwd", ExtraList.has_key("[UNTRUSTED]") or ExtraList.has_key("[NOPASSWD]")) + 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')) - if ExtraList.has_key("[UNTRUSTED]"): - print "[UNTRUSTED] tag is obsolete and may be removed in the future." - continue - if not ExtraList.has_key("[NOPASSWD]"): - GenShadow(l, OutDir + "shadow") + if not 'NOPASSWD' in ExtraList: + GenShadow(accounts, 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") DoLink(GlobalDir, OutDir, "mail-rbl") DoLink(GlobalDir, OutDir, "mail-rhsbl") DoLink(GlobalDir, OutDir, "mail-whitelist") + DoLink(GlobalDir, 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") - if ExtraList.has_key("[DNS]"): - GenDNS(l, OutDir + "dns-zone", Split[1]) - GenSSHFP(l, OutDir + "dns-sshfp", Split[1]) + if 'DNS' in ExtraList: + GenDNS(accounts, OutDir + "dns-zone") + GenZoneRecords(OutDir + "dns-sshfp") + + if 'AUTHKEYS' in ExtraList: + DoLink(GlobalDir, OutDir, "authorized_keys") - if ExtraList.has_key("[BSMTP]"): - GenBSMTP(l, OutDir + "bsmtp", Split[1]) + if 'BSMTP' in ExtraList: + GenBSMTP(accounts, 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: