X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=userdir_ldap.py;h=00f9d4b6448fcd367e07cc8002fa8f1d9853feb7;hp=d3a5628f69c2ede685769cf1e90605476ae942db;hb=871ab5f2e8bda25130c70834052fa8fb020a5373;hpb=6cbc7fa975621561fa281bdc552843192b142d59 diff --git a/userdir_ldap.py b/userdir_ldap.py index d3a5628..00f9d4b 100644 --- a/userdir_ldap.py +++ b/userdir_ldap.py @@ -1,6 +1,8 @@ # Copyright (c) 1999-2000 Jason Gunthorpe # Copyright (c) 2001-2003 Ryan Murray -# Copyright (c) 2004 Joey Schulze +# Copyright (c) 2004-2005 Joey Schulze +# Copyright (c) 2008 Peter Palfrader +# Copyright (c) 2008 Thomas Viehmann # # 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 @@ -17,8 +19,10 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Some routines and configuration that are used by the ldap progams -import termios, re, string, imp, ldap, sys, whrandom, crypt, rfc822; +import termios, re, imp, ldap, sys, crypt, rfc822, pwd, os, getpass import userdir_gpg +import hmac +import hashlib try: File = open("/etc/userdir-ldap/userdir-ldap.conf"); @@ -34,26 +38,52 @@ LDAPServer = ConfModule.ldaphost; EmailAppend = ConfModule.emailappend; AdminUser = ConfModule.adminuser; GenerateDir = ConfModule.generatedir; -GenerateConf = ConfModule.generateconf; -DefaultGID = ConfModule.defaultgid; +AllowedGroupsPreload = ConfModule.allowedgroupspreload; +HomePrefix = ConfModule.homeprefix; TemplatesDir = ConfModule.templatesdir; PassDir = ConfModule.passdir; Ech_ErrorLog = ConfModule.ech_errorlog; Ech_MainLog = ConfModule.ech_mainlog; +HostDomain = getattr(ConfModule, "hostdomain", EmailAppend) + +try: + UseSSL = ConfModule.usessl; +except AttributeError: + UseSSL = False; + +try: + BaseBaseDn = ConfModule.basebasedn; +except AttributeError: + BaseBaseDn = BaseDn + +try: + IgnoreUsersForUIDNumberGen = ConfModule.ignoreusersforuidnumbergen +except AttributeError: + IgnoreUsersForUIDNumberGen = ['nobody'] + # Break up the keyring list -userdir_gpg.SetKeyrings(string.split(ConfModule.keyrings,":")); +userdir_gpg.SetKeyrings(ConfModule.keyrings.split(":")) # This is a list of common last-name prefixes LastNamesPre = {"van": None, "von": None, "le": None, "de": None, "di": None}; # This is a list of common groups on Debian hosts -DebianGroups = {"Debian": 800, "guest": 60000} +DebianGroups = { + "Debian": 800, + "guest": 60000, + "nogroup": 65534 + } + +# ObjectClasses for different object types +UserObjectClasses = ("top", "inetOrgPerson", "debianAccount", "shadowAccount", "debianDeveloper") +RoleObjectClasses = ("top", "debianAccount", "shadowAccount", "debianRoleAccount") +GroupObjectClasses = ("top", "debianGroup") # SSH Key splitting. The result is: # (options,size,modulous,exponent,comment) SSHAuthSplit = re.compile('^(.* )?(\d+) (\d+) (\d+) ?(.+)$'); -SSH2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa) ([a-zA-Z0-9=/+]+) ?(.+)$'); +SSH2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa|ecdsa-sha2-nistp(?:256|384|521)|ed25519) ([a-zA-Z0-9=/+]+) ?(.+)$'); #'^([^\d](?:[^ "]+(?:".*")?)*)? ?(\d+) (\d+) (\d+) (.+)$'); AddressSplit = re.compile("(.*).*<([^@]*)@([^>]*)>"); @@ -89,25 +119,49 @@ def PrettyShow(DnRecord): Result = Result + "%s: %s\n" % (x,i); return Result[:-1]; -# Function to prompt for a password -def getpass(prompt = "Password: "): - import termios, sys; - fd = sys.stdin.fileno(); - old = termios.tcgetattr(fd); - new = termios.tcgetattr(fd); - new[3] = new[3] & ~termios.ECHO; # lflags - try: - termios.tcsetattr(fd, termios.TCSADRAIN, new); - passwd = raw_input(prompt); - finally: - termios.tcsetattr(fd, termios.TCSADRAIN, old); - print; - return passwd; +def connectLDAP(server = None): + if server == None: + global LDAPServer + server = LDAPServer + l = ldap.open(server); + global UseSSL + if UseSSL: + l.start_tls_s(); + return l; + +def passwdAccessLDAP(BaseDn, AdminUser): + """ + Ask for the AdminUser's password and connect to the LDAP server. + Returns the connection handle. + """ + print "Accessing LDAP directory as '" + AdminUser + "'"; + while (1): + if 'LDAP_PASSWORD' in os.environ: + Password = os.environ['LDAP_PASSWORD'] + else: + Password = getpass.getpass(AdminUser + "'s password: ") + + if len(Password) == 0: + sys.exit(0) + + l = connectLDAP() + UserDn = "uid=" + AdminUser + "," + BaseDn; + + # Connect to the ldap server + try: + l.simple_bind_s(UserDn,Password); + except ldap.INVALID_CREDENTIALS: + if 'LDAP_PASSWORD' in os.environ: + print "password in environment does not work" + del os.environ['LDAP_PASSWORD'] + continue + break + return l # Split up a name into multiple components. This tries to best guess how # to split up a name def NameSplit(Name): - Words = re.split(" ",string.strip(Name)); + Words = re.split(" ", Name.strip()) # Insert an empty middle name if (len(Words) == 2): @@ -137,7 +191,7 @@ def NameSplit(Name): Words.append(''); # Merge any of the last name prefixes into one big last name - while LastNamesPre.has_key(string.lower(Words[-2])): + while LastNamesPre.has_key(Words[-2].lower()): Words[-1] = Words[-2] + " " + Words[-1]; del Words[-2]; @@ -148,10 +202,10 @@ def NameSplit(Name): # If the name is multi-word then we glob them all into the last name and # do not worry about a middle name if (len(Words) > 3): - Words[2] = string.join(Words[1:]); + Words[2] = " ".join(Words[1:]) Words[1] = ""; - return (string.strip(Words[0]),string.strip(Words[1]),string.strip(Words[2])); + return (Words[0].strip(), Words[1].strip(), Words[2].strip()); # Compute a random password using /dev/urandom def GenPass(): @@ -208,7 +262,7 @@ def FlushOutstanding(l,Outstanding,Fast=0): # Convert a lat/long attribute into Decimal degrees def DecDegree(Posn,Anon=0): Parts = re.match('[-+]?(\d*)\\.?(\d*)',Posn).groups(); - Val = string.atof(Posn); + Val = float(Posn); if (abs(Val) >= 1806060.0): raise ValueError,"Too Big"; @@ -263,7 +317,7 @@ def FormatPGPKey(Str): if (len(Str) == 32): I = 0; while (I < len(Str)): - if I+2 == 32/2: + if I == 32/2: Res = "%s %s%s "%(Res,Str[I],Str[I+1]); else: Res = "%s%s%s "%(Res,Str[I],Str[I+1]); @@ -272,19 +326,19 @@ def FormatPGPKey(Str): # OpenPGP Print I = 0; while (I < len(Str)): - if I+4 == 40/2: + if I == 40/2: Res = "%s %s%s%s%s "%(Res,Str[I],Str[I+1],Str[I+2],Str[I+3]); else: Res = "%s%s%s%s%s "%(Res,Str[I],Str[I+1],Str[I+2],Str[I+3]); I = I + 4; else: Res = Str; - return string.strip(Res); + return Res.strip() # Take an email address and split it into 3 parts, (Name,UID,Domain) def SplitEmail(Addr): # Is not an email address at all - if string.find(Addr,'@') == -1: + if Addr.find('@') == -1: return (Addr,"",""); Res1 = rfc822.AddrlistClass(Addr).getaddress(); @@ -296,7 +350,7 @@ def SplitEmail(Addr): # If there is no @ then the address was not parsed well. Try the alternate # Parsing scheme. This is particularly important when scanning PGP keys. - Res2 = string.split(Res1[1],"@"); + Res2 = Res1[1].split("@"); if len(Res2) != 2: Match = AddressSplit.match(Addr); if Match == None: @@ -357,8 +411,8 @@ def GetUID(l,Name,UnknownMap = {}): # deals with special purpose keys like 'James Troup (Alternate Debian key)' # Some people put their names backwards on their key too.. check that as well if len(Attrs) == 1 and \ - (string.find(string.lower(sn),string.lower(Attrs[0][1]["sn"][0])) != -1 or \ - string.find(string.lower(cn),string.lower(Attrs[0][1]["sn"][0])) != -1): + ( sn.lower().find(Attrs[0][1]["sn"][0].lower()) != -1 or \ + cn.lower().find(Attrs[0][1]["sn"][0].lower()) != -1 ): Stat = EmailAppend+" hit for "+str(Name); return (Name[1],[Stat]); @@ -377,9 +431,30 @@ def GetUID(l,Name,UnknownMap = {}): return (None,None); -def Group2GID(name): - """Returns the numerical id of a common group""" +def Group2GID(l, name): + """ + Returns the numerical id of a common group + on error returns -1 + """ for g in DebianGroups.keys(): if name == g: return DebianGroups[g] - return name + + filter = "(gid=%s)" % name + res = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,filter,["gidNumber"]); + if res: + return int(GetAttr(res[0], "gidNumber")) + + return -1 + +def make_hmac(str): + if 'UD_HMAC_KEY' in os.environ: + HmacKey = os.environ['UD_HMAC_KEY'] + else: + File = open(PassDir+"/key-hmac-"+pwd.getpwuid(os.getuid())[0],"r"); + HmacKey = File.readline().strip() + File.close(); + return hmac.new(HmacKey, str, hashlib.sha1).hexdigest() + +def make_passwd_hmac(status, purpose, uid, uuid, hosts, cryptedpass): + return make_hmac(':'.join([status, purpose, uid, uuid, hosts, cryptedpass]))