X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir_ldap.py;h=447723254b83a52ee2c7ccab2f4329b5c9162a02;hb=refs%2Ftags%2Fuserdir-ldap-0.3.49;hp=6cfe65a5d7b93f3ca52bbb5147eec5cdacf759d6;hpb=2d93a69d23bac9c78eadd87a6c9622fb2adc342b;p=mirror%2Fuserdir-ldap.git diff --git a/userdir_ldap.py b/userdir_ldap.py index 6cfe65a..4477232 100644 --- a/userdir_ldap.py +++ b/userdir_ldap.py @@ -1,6 +1,7 @@ # Copyright (c) 1999-2000 Jason Gunthorpe # Copyright (c) 2001-2003 Ryan Murray # Copyright (c) 2004-2005 Joey Schulze +# Copyright (c) 2008 Peter Palfrader # # 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 @@ -19,6 +20,8 @@ # Some routines and configuration that are used by the ldap progams import termios, re, imp, ldap, sys, crypt, rfc822, pwd, os; import userdir_gpg +import hmac +import sha as sha1_module try: File = open("/etc/userdir-ldap/userdir-ldap.conf"); @@ -41,14 +44,6 @@ PassDir = ConfModule.passdir; Ech_ErrorLog = ConfModule.ech_errorlog; Ech_MainLog = ConfModule.ech_mainlog; -File = open(PassDir+"/key-hmac-"+pwd.getpwuid(os.getuid())[0],"r"); -HmacKey = F.readline().strip() -File.close(); - -# For backwards compatibility, we default to the old behaviour -MultipleSSHFiles = getattr(ConfModule, 'multiplesshfiles', False) -SingleSSHFile = getattr(ConfModule, 'singlesshfile', True) - try: UseSSL = ConfModule.usessl; except AttributeError: @@ -456,7 +451,10 @@ def Group2GID(l, name): return -1 def make_hmac(str): + File = open(PassDir+"/key-hmac-"+pwd.getpwuid(os.getuid())[0],"r"); + HmacKey = File.readline().strip() + File.close(); return hmac.new(HmacKey, str, sha1_module).hexdigest() -def make_sudopasswd_hmac(purpose, uuid, hosts, cryptedpass): - return make_hmac(':'.join([purpose, uuid, hosts, cryptedpass])) +def make_passwd_hmac(status, purpose, uid, uuid, hosts, cryptedpass): + return make_hmac(':'.join([status, purpose, uid, uuid, hosts, cryptedpass]))