X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=02b379418b2e6ef71039ca69dce0e9a5e438cf2d;hb=e9dc8e658380c666e2149d735c97a1116c71db08;hp=8001012c159f10c066400a5f1c3264437e16b57b;hpb=d91d0c5fd96a36bae43ecf2aa0460f663655c0fd;p=mirror%2Fuserdir-ldap.git diff --git a/ud-generate b/ud-generate index 8001012..02b3794 100755 --- a/ud-generate +++ b/ud-generate @@ -6,11 +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 @@ -27,67 +29,84 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha, shutil, errno, tarfile, grp -from userdir_ldap import *; +from userdir_ldap import * from userdir_exceptions import * - -global Allowed; -global CurrentHost; - -PasswdAttrs = None; -DisabledUsers = [] -RetiredUsers = [] -GroupIDMap = {}; -SubGroupMap = {}; -Allowed = None; -CurrentHost = ""; +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) + +DebianUsers = None +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("^([^ <>@]+@[^ ,<>@]+)?$"); -BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL); -PurposeHostField = re.compile(r"\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]") +EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$") +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(":") def safe_makedirs(dir): - try: - os.makedirs(dir) - except OSError, e: - if e.errno == errno.EEXIST: - pass - else: - raise e + try: + os.makedirs(dir) + except OSError, e: + if e.errno == errno.EEXIST: + pass + else: + raise e def safe_rmtree(dir): - try: - shutil.rmtree(dir) - except OSError, e: - if e.errno == errno.ENOENT: - pass - else: - raise e + try: + shutil.rmtree(dir) + except OSError, e: + if e.errno == errno.ENOENT: + pass + else: + raise e def Sanitize(Str): - return Str.translate(string.maketrans("\n\r\t","$$$")) + return Str.translate(string.maketrans("\n\r\t", "$$$")) -def DoLink(From,To,File): - try: posix.remove(To+File); - except: pass; - posix.link(From+File,To+File); +def DoLink(From, To, File): + try: + posix.remove(To + File) + except: + 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 @@ -98,244 +117,243 @@ 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): +def Die(File, F, Fdb): + if F != None: + F.close() + if Fdb != None: + Fdb.close() + try: + os.remove(File + ".tmp") + except: + pass + try: + os.remove(File + ".tdb.tmp") + except: + pass + +def Done(File, F, Fdb): if F != None: - F.close(); + F.close() + os.rename(File + ".tmp", File) if Fdb != None: - Fdb.close(); - try: os.remove(File + ".tmp"); - except: pass; - try: os.remove(File + ".tdb.tmp"); - except: pass; - -def Done(File,F,Fdb): - if F != None: - F.close(); - os.rename(File + ".tmp",File); - if Fdb != None: - Fdb.close(); - os.rename(File + ".tdb.tmp",File+".tdb"); + Fdb.close() + os.rename(File + ".tdb.tmp", File + ".tdb") # Generate the password list -def GenPasswd(l,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; - - # 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; - - # Oops, something unspeakable happened. - except: - Die(File,None,F); - raise; - Done(File,None,F); - - # Return the list of users so we know which keys to export - return userlist +def GenPasswd(accounts, File, HomePrefix, PwdMarker): + F = None + try: + F = open(File + ".tdb.tmp", "w") + + userlist = {} + 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(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) + raise + Done(File, None, F) + + # 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): - 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:]; - - # 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; - - # Oops, something unspeakable happened. - except: - Die(File,None,F); - raise; - Done(File,None,F); +def GenShadow(accounts, File): + F = None + try: + OldMask = os.umask(0077) + F = open(File + ".tdb.tmp", "w", 0600) + os.umask(OldMask) + + 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 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) + raise + Done(File, None, F) # Generate the sudo passwd file -def GenShadowSudo(l,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: - Pass = '*' - if x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0: - continue; - - if x[1].has_key('sudoPassword'): - for entry in x[1]['sudoPassword']: - Match = re.compile('^('+UUID_FORMAT+') (confirmed:[0-9a-f]{40}|unconfirmed) ([a-z0-9.,*]+) ([^ ]+)$').match(entry) - if Match == None: - continue - uuid = Match.group(1) - status = Match.group(2) - 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): - continue - for_all = hosts == "*" - for_this_host = CurrentHost in hosts.split(',') - if not (for_all or for_this_host): - continue - # ignore * passwords for untrusted hosts, but copy host specific passwords - if for_all and untrusted: - continue - Pass = cryptedpass - if for_this_host: # this makes sure we take a per-host entry over the for-all entry - break - if len(Pass) > 50: - Pass = '*' - - Line = "%s:%s" % (GetAttr(x,"uid"), Pass) - Line = Sanitize(Line) + "\n"; - F.write("%s" % (Line)); - - # Oops, something unspeakable happened. - except: - Die(File,F,None); - raise; - Done(File,F,None); +def GenShadowSudo(accounts, File, untrusted): + F = None + try: + OldMask = os.umask(0077) + F = open(File + ".tmp", "w", 0600) + os.umask(OldMask) + + for a in accounts: + Pass = '*' + if not IsInGroup(a): continue + + 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 + uuid = Match.group(1) + status = Match.group(2) + hosts = Match.group(3) + cryptedpass = Match.group(4) + + 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 not (for_all or for_this_host): + continue + # ignore * passwords for untrusted hosts, but copy host specific passwords + if for_all and untrusted: + continue + Pass = cryptedpass + if for_this_host: # this makes sure we take a per-host entry over the for-all entry + break + if len(Pass) > 50: + Pass = '*' + + Line = "%s:%s" % (a['uid'], Pass) + Line = Sanitize(Line) + "\n" + F.write("%s" % (Line)) + + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) # Generate the shadow list -def GenSSHShadow(l): +def GenSSHShadow(accounts): # Fetch all the users - singlefile = None userfiles = [] - global PasswdAttrs; - safe_rmtree(os.path.join(GlobalDir, 'userkeys')) safe_makedirs(os.path.join(GlobalDir, 'userkeys')) - for x in PasswdAttrs: - - if x in DisabledUsers: - continue - - if x[1].has_key("uidNumber") == 0 or \ - x[1].has_key("sshRSAAuthKey") == 0: - continue; - - User = GetAttr(x,"uid"); - F = None; + for a in accounts: + if not 'sshRSAAuthKey' in a: continue + F = None try: - OldMask = os.umask(0077); - File = os.path.join(GlobalDir, 'userkeys', User) - F = open(File + ".tmp","w",0600); - os.umask(OldMask); + OldMask = os.umask(0077) + 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) - Done(File,F,None); + Done(File, F, None) userfiles.append(os.path.basename(File)) # 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 def GenSSHtarballs(userlist, SSHFiles, grouprevmap, target): - OldMask = os.umask(0077); + OldMask = os.umask(0077) tf = tarfile.open(name=os.path.join(GlobalDir, 'ssh-keys-%s.tar.gz' % CurrentHost), mode='w:gz') - os.umask(OldMask); + os.umask(OldMask) for f in userlist.keys(): if f not in SSHFiles: continue @@ -374,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) @@ -388,12 +419,12 @@ def addGroups(existingGroups, newGroups, uid): # if it's a @host, split it and verify it's on the current host. s = group.split('@', 1) if len(s) == 2 and s[1] != CurrentHost: - continue; + continue group = s[0] # 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" @@ -405,419 +436,319 @@ def addGroups(existingGroups, newGroups, uid): addGroups(existingGroups, SubGroupMap[group], uid) # Generate the group list -def GenGroup(l,File): - grouprevmap = {} - F = None; - try: - F = open(File + ".tdb.tmp","w"); - - # Generate the GroupMap - GroupMap = {}; - for x in GroupIDMap.keys(): - GroupMap[x] = []; - - # 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 x[1].has_key("uidNumber") == 0 or IsInGroup(x) == 0: - continue; - if x[1].has_key("supplementaryGid") == 0: - continue; - - supgroups=[] - addGroups(supgroups, x[1]["supplementaryGid"], uid) - for g in supgroups: - GroupMap[g].append(uid); - - # Output the group file. - J = 0; - for x in GroupMap.keys(): - grouprevmap[GroupIDMap[x]] = x - if GroupIDMap.has_key(x) == 0: - continue; - Line = "%s:x:%u:" % (x,GroupIDMap[x]); - Comma = ''; - for I in GroupMap[x]: - Line = Line + ("%s%s" % (Comma,I)); - Comma = ','; - Line = Sanitize(Line) + "\n"; - F.write("0%u %s" % (J,Line)); - F.write(".%s %s" % (x,Line)); - F.write("=%u %s" % (GroupIDMap[x],Line)); - J = J + 1; - - # Oops, something unspeakable happened. - except: - Die(File,None,F); - raise; - Done(File,None,F); - - return grouprevmap - -# Generate the email forwarding list -def GenForward(l,File): - F = None; - try: - OldMask = os.umask(0022); - F = open(File + ".tmp","w",0644); - os.umask(OldMask); +def GenGroup(accounts, File): + grouprevmap = {} + F = None + try: + F = open(File + ".tdb.tmp", "w") + + # Generate the GroupMap + GroupMap = {} + for x in GroupIDMap.keys(): + GroupMap[x] = [] + GroupHasPrimaryMembers = {} + + # Sort them into a list of groups having a set of users + for a in accounts: + GroupHasPrimaryMembers[ a['gidNumber'] ] = True + if not IsInGroup(a): continue + if not 'supplementaryGid' in a: continue + + supgroups=[] + addGroups(supgroups, a['supplementaryGid'], a['uid']) + for g in supgroups: + GroupMap[g].append(a['uid']) + + # Output the group file. + J = 0 + for x in GroupMap.keys(): + if GroupIDMap.has_key(x) == 0: + continue - # Fetch all the users - global PasswdAttrs; + if len(GroupMap[x]) == 0 and GroupIDMap[x] not in GroupHasPrimaryMembers: + continue - # Write out the email address for each user - for x in PasswdAttrs: - if x[1].has_key("emailForward") == 0 or IsInGroup(x) == 0: - 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 = Sanitize(Line) + "\n" + F.write("0%u %s" % (J, Line)) + F.write(".%s %s" % (x, Line)) + F.write("=%u %s" % (GroupIDMap[x], Line)) + J = J + 1 + + # Oops, something unspeakable happened. + except: + Die(File, None, F) + raise + Done(File, None, F) + + return grouprevmap + +def CheckForward(accounts): + for a in accounts: + if not 'emailForward' in a: continue + + + delete = False + + if not IsInGroup(a): delete = True # Do not allow people to try to buffer overflow busted parsers - if len(GetAttr(x,"emailForward")) > 200: - continue; - + elif len(a['emailForward']) > 200: delete = True # Check the forwarding address - if EmailCheck.match(GetAttr(x,"emailForward")) == None: - continue; - Line = "%s: %s" % (GetAttr(x,"uid"),GetAttr(x,"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): - Fdb = None; - try: - OldMask = os.umask(0022); - Fdb = os.popen("cdbmake %s %s.tmp"%(File,File),"w"); - os.umask(OldMask); + elif EmailCheck.match(a['emailForward']) is None: delete = True - # Fetch all the users - global PasswdAttrs; + if delete: + a.delete_mailforward() + +# Generate the email forwarding list +def GenForward(accounts, File): + F = None + try: + OldMask = os.umask(0022) + F = open(File + ".tmp", "w", 0644) + os.umask(OldMask) - # Write out the email address for each user - for x in PasswdAttrs: - if x[1].has_key("emailForward") == 0: - continue; + for a in accounts: + if not 'emailForward' in a: continue + Line = "%s: %s" % (a['uid'], a['emailForward']) + Line = Sanitize(Line) + "\n" + F.write(Line) - # Do not allow people to try to buffer overflow busted parsers - Forward = GetAttr(x,"emailForward"); - if len(Forward) > 200: - continue; + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) - # Check the forwarding address - if EmailCheck.match(Forward) == None: - continue; - - User = GetAttr(x,"uid"); - Fdb.write("+%d,%d:%s->%s\n"%(len(User),len(Forward),User,Forward)); - Fdb.write("\n"); - # Oops, something unspeakable happened. - except: - Fdb.close(); - raise; - if Fdb.close() != None: - raise "cdbmake gave an error"; +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) + + # Write out the email address for each user + 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: + Fdb.close() + raise + if Fdb.close() != None: + raise "cdbmake gave an error" # Generate the anon XEarth marker file -def GenMarkers(l,File): - F = None; - try: - F = open(File + ".tmp","w"); - - # Fetch all the users - global PasswdAttrs; +def GenMarkers(accounts, File): + F = None + try: + F = open(File + ".tmp", "w") - # 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; - try: - Line = "%8s %8s \"\""%(DecDegree(GetAttr(x,"latitude"),1),DecDegree(GetAttr(x,"longitude"),1)); - Line = Sanitize(Line) + "\n"; - F.write(Line); - except: - pass; - - # Oops, something unspeakable happened. - except: - Die(File,F,None); - raise; - Done(File,F,None); + # Write out the position for each user + for a in accounts: + 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" + F.write(Line) + except: + pass + + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) # Generate the debian-private subscription list -def GenPrivate(l,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; +def GenPrivate(accounts, File): + F = None + try: + F = open(File + ".tmp", "w") - try: - Line = "%s"%(GetAttr(x,"privateSub")); - Line = Sanitize(Line) + "\n"; - F.write(Line); - except: - pass; - - # Oops, something unspeakable happened. - except: - Die(File,F,None); - raise; - Done(File,F,None); + # Write out the position for each user + for a in accounts: + if not a.is_active_user(): continue + if not 'privateSub' in a: continue + try: + Line = "%s"%(a['privateSub']) + Line = Sanitize(Line) + "\n" + F.write(Line) + except: + pass + + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) # Generate a list of locked accounts -def GenDisabledAccounts(l,File): - F = None; - try: - F = open(File + ".tmp","w"); - - # 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 != "": +def GenDisabledAccounts(accounts, File): + F = None + try: + F = open(File + ".tmp", "w") + disabled_accounts = [] + + # Fetch all the users + 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") - DisabledUsers.append(x) - - # Oops, something unspeakable happened. - except: - Die(File,F,None); - raise; - Done(File,F,None); + # 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): - 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 +def GenMailDisable(accounts, File): + F = None + try: + F = open(File + ".tmp", "w") - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x,"gidNumber") != "800": - continue; + for a in accounts: + if not 'mailDisableMessage' in a: continue + Line = "%s: %s"%(a['uid'], a['mailDisableMessage']) + Line = Sanitize(Line) + "\n" + F.write(Line) - try: - Line = "%s: %s"%(GetAttr(x,"uid"),Reason); - Line = Sanitize(Line) + "\n"; - F.write(Line); - except: - pass; - - # Oops, something unspeakable happened. - except: - Die(File,F,None); - raise; - Done(File,F,None); + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) # Generate a list of uids that should have boolean affects applied -def GenMailBool(l,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 +def GenMailBool(accounts, File, key): + F = None + try: + F = open(File + ".tmp", "w") - if GetAttr(x,Key) != "TRUE": - continue + 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) - try: - Line = "%s"%(GetAttr(x,"uid")); - Line = Sanitize(Line) + "\n"; - F.write(Line); - except: - pass; - - # Oops, something unspeakable happened. - except: - Die(File,F,None); - raise; - Done(File,F,None); + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) # Generate a list of hosts for RBL or whitelist purposes. -def GenMailList(l,File,Key): - F = None; - try: - F = open(File + ".tmp","w"); +def GenMailList(accounts, 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 + for a in accounts: + if not key in a: continue - if x[1].has_key(Key) == 0: - 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) - # Must be in the Debian group (yuk, hard coded for now) - if GetAttr(x,"gidNumber") != "800": - continue + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) - 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; - - # 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): - F = None; - try: - F = open(File + ".tmp","w"); +def GenDNS(accounts, File): + F = None + try: + F = open(File + ".tmp", "w") - # Fetch all the users - global PasswdAttrs; + # Fetch all the users + RRs = {} - # Write out the zone file entry for each user - for x in PasswdAttrs: - if x[1].has_key("dnsZoneEntry") == 0: - continue; + # Write out the zone file entry for each user + for a in accounts: + if not 'dnsZoneEntry' in a: continue + if not a.is_active_user() and not isRoleAccount(a): 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; - try: - F.write("; %s\n"%(EmailAddress(x))); - for z in x[1]["dnsZoneEntry"]: - Split = z.lower().split() - if Split[1].lower() == 'in': - for y in range(0,len(Split)): - if Split[y] == "$": - Split[y] = "\n\t"; - Line = " ".join(Split) + "\n"; - F.write(Line); - - Host = Split[0] + DNSZone; - if BSMTPCheck.match(Line) != None: - 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); - else: - Line = "; Err %s"%(str(Split)); - F.write(Line); - - F.write("\n"); - except: - F.write("; Errors\n"); - pass; - - # Oops, something unspeakable happened. - except: - Die(File,F,None); - raise; - Done(File,F,None); - -# Generate the DNS SSHFP records -def GenSSHFP(l,File,HomePrefix): - 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: - continue - Host = GetAttr(x,"hostname"); - Algorithm = None + try: + 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)): + if Split[y] == "$": + Split[y] = "\n\t" + Line = " ".join(Split) + "\n" + F.write(Line) + + Host = Split[0] + DNSZone + if BSMTPCheck.match(Line) != None: + F.write("; Has BSMTP\n") + + # 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], 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 Exception, e: + F.write("; Errors:\n") + for line in str(e).split("\n"): + F.write("; %s\n"%(line)) + pass + + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) + +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': @@ -827,334 +758,397 @@ def GenSSHFP(l,File,HomePrefix): 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) - # Oops, something unspeakable happened. - except: - Die(File,F,None) - raise; - Done(File,F,None) + 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 + + for x in HostAttrs: + if x[1].has_key("hostname") == 0: + continue + + 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) + raise + Done(File, F, None) # Generate the BSMTP file -def GenBSMTP(l,File,HomePrefix): - F = None; - try: - F = open(File + ".tmp","w"); +def GenBSMTP(accounts, File, HomePrefix): + F = None + try: + F = open(File + ".tmp", "w") + + # Write out the zone file entry for each user + for a in accounts: + if not 'dnsZoneEntry' in a: continue + if not a.is_active_user(): continue - # Fetch all the users - global PasswdAttrs; + try: + for z in a["dnsZoneEntry"]: + Split = z.lower().split() + if Split[1].lower() == 'in': + for y in range(0, len(Split)): + if Split[y] == "$": + Split[y] = "\n\t" + Line = " ".join(Split) + "\n" + + Host = Split[0] + DNSZone + if BSMTPCheck.match(Line) != None: + F.write("%s: user=%s group=Debian file=%s%s/bsmtp/%s\n"%(Host, + a['uid'], HomePrefix, a['uid'], Host)) + + except: + F.write("; Errors\n") + pass + + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) + +def HostToIP(Host, mapped=True): - # Write out the zone file entry for each user - for x in PasswdAttrs: - if x[1].has_key("dnsZoneEntry") == 0: - continue; + IPAdresses = [] - # If the account has no PGP key, do not write it - if x[1].has_key("keyFingerPrint") == 0: - continue; - try: - for z in x[1]["dnsZoneEntry"]: - Split = z.lower().split() - if Split[1].lower() == 'in': - for y in range(0,len(Split)): - if Split[y] == "$": - Split[y] = "\n\t"; - Line = " ".join(Split) + "\n"; - - 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)); - - except: - F.write("; Errors\n"); - pass; - - # Oops, something unspeakable happened. - except: - Die(File,F,None); - 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] + 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): - F = None; - try: - OldMask = os.umask(0022); - F = open(File + ".tmp","w",0644); - os.umask(OldMask); - - 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: - continue; - Host = GetAttr(x,"hostname"); - HostNames = [ Host ] - if Host.endswith(HostDomain): - HostNames.append(Host[:-(len(HostDomain)+1)]) - - # 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 - # and say [[*... to ignore it. In order to be able to add stuff to ssh without - # http linking it we also support [[-hostname]] entries. - 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:] +def GenSSHKnown(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: + if x[1].has_key("hostname") == 0 or \ + x[1].has_key("sshRSAHostKey") == 0: + continue + Host = GetAttr(x, "hostname") + HostNames = [ Host ] + if Host.endswith(HostDomain): + HostNames.append(Host[:-(len(HostDomain) + 1)]) + + # 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 + # and say [[*... to ignore it. In order to be able to add stuff to ssh without + # http linking it we also support [[-hostname]] entries. + for i in x[1].get("purpose", []): + m = PurposeHostField.match(i) if m: - HostNames.append(m) - if m.endswith(HostDomain): - HostNames.append(m[:-(len(HostDomain)+1)]) - - 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) - else: - Line = "%s %s" %(",".join(HostNames + HostToIP(Host)), I); - Line = Sanitize(Line) + "\n"; - F.write(Line); - # Oops, something unspeakable happened. - except: - Die(File,F,None); - raise; - Done(File,F,None); + m = m.group(1) + # we ignore [[*..]] entries + if m.startswith('*'): + continue + if m.startswith('-'): + m = m[1:] + if m: + HostNames.append(m) + if m.endswith(HostDomain): + HostNames.append(m[:-(len(HostDomain) + 1)]) + + for I in x[1]["sshRSAHostKey"]: + if mode and mode == 'authorized_keys': + 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(x, False)), I) + Line = Sanitize(Line) + "\n" + F.write(Line) + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) # Generate the debianhosts file (list of all IP addresses) -def GenHosts(l,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] +def GenHosts(File): + F = None + try: + OldMask = os.umask(0022) + F = open(File + ".tmp", "w", 0644) + os.umask(OldMask) + + seen = set() + + 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: - print >> F, addrinfo[4][0] - seen.add(addr) - # Oops, something unspeakable happened. - except: - Die(File,F,None) - raise - Done(File,F,None) + seen.add(addr) + addr = Sanitize(addr) + "\n" + F.write(addr) -def GenKeyrings(l,OutDir): - for k in Keyrings: - shutil.copy(k, OutDir) + # Oops, something unspeakable happened. + except: + Die(File, F, None) + raise + Done(File, F, None) +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]); +# 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 -GroupIDMap = {}; -Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"gid=*",\ - ["gid","gidNumber","subGroup"]); +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]); + 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"]); + SubGroupMap.setdefault(x[1]["gid"][0], []).extend(x[1]["subGroup"]) # 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"]) - -if PasswdAttrs is None: +passwd_attrs = l.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())) # 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+"/"; -GenMailDisable(l,GlobalDir+"mail-disable") - -for x in PasswdAttrs: - if IsRetired(x): - RetiredUsers.append(x) - -PasswdAttrs = filter(lambda x: not x in RetiredUsers, PasswdAttrs) - -SSHFiles = GenSSHShadow(l); -GenAllForward(l,GlobalDir+"mail-forward.cdb"); -GenMarkers(l,GlobalDir+"markers"); -GenPrivate(l,GlobalDir+"debian-private"); -GenDisabledAccounts(l,GlobalDir+"disabled-accounts"); -GenSSHKnown(l,GlobalDir+"ssh_known_hosts"); -#GenSSHKnown(l,GlobalDir+"authorized_keys", 'authorized_keys'); -GenHosts(l,GlobalDir+"debianhosts"); -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); +GlobalDir = GenerateDir + "/" +accounts_disabled = GenDisabledAccounts(accounts, GlobalDir + "disabled-accounts") + +accounts = filter(lambda x: not IsRetired(x), accounts) +#accounts_DDs = filter(lambda x: IsGidDebian(x), accounts) + +CheckForward(accounts) + +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) -while(1): - Line = F.readline(); - if Line == "": - break; - Line = Line.strip() - if Line == "": - continue; - if Line[0] == '#': - continue; +SSHFiles = GenSSHShadow(accounts) +GenMarkers(accounts, GlobalDir + "markers") +GenSSHKnown(GlobalDir + "ssh_known_hosts") +GenHosts(GlobalDir + "debianhosts") - Split = Line.split(" ") - OutDir = GenerateDir + '/' + Split[0] + '/'; - try: os.mkdir(OutDir); - except: pass; +for host in HostAttrs: + if not "hostname" in host[1]: + continue + + CurrentHost = host[1]['hostname'][0] + OutDir = GenerateDir + '/' + CurrentHost + '/' + try: + os.mkdir(OutDir) + except: + pass # Get the group list and convert any named groups to numerics - GroupList = {}; - 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; - - Allowed = GroupList; + 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 = {} + 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") + 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], "*"); + sys.stdout.flush() + if 'NOPASSWD' in ExtraList: + userlist = GenPasswd(accounts, OutDir + "passwd", HomePrefix, "*") else: - userlist = GenPasswd(l,OutDir+"passwd",Split[1], "x"); - sys.stdout.flush(); - grouprevmap = GenGroup(l,OutDir+"group"); - GenShadowSudo(l, OutDir+"sudo-passwd", ExtraList.has_key("[UNTRUSTED]") or ExtraList.has_key("[NOPASSWD]")) + userlist = GenPasswd(accounts, OutDir + "passwd", HomePrefix, "x") + sys.stdout.flush() + 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]"): - DoLink(GlobalDir,OutDir,"markers"); - DoLink(GlobalDir,OutDir,"mail-forward.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"); + 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"); + DoLink(GlobalDir, OutDir, "forward-alias") + + if 'DNS' in ExtraList: + GenDNS(accounts, OutDir + "dns-zone") + GenZoneRecords(OutDir + "dns-sshfp") - if ExtraList.has_key("[DNS]"): - GenDNS(l,OutDir+"dns-zone",Split[1]); - GenSSHFP(l,OutDir+"dns-sshfp",Split[1]) + 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]"): - DoLink(GlobalDir,OutDir,"debian-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)) + DoLink(GlobalDir, OutDir, os.path.basename(k)) else: - for k in Keyrings: - try: posix.remove(OutDir+os.path.basename(k)); - except: pass; + for k in Keyrings: + try: + posix.remove(OutDir + os.path.basename(k)) + except: + pass # vim:set et: # vim:set ts=3: