-
-import string
import random
from passlib.hash import ldap_salted_sha1 as lssha
-from sfa.util.xrn import Xrn,get_authority
+from sfa.util.xrn import get_authority
import ldap
from sfa.util.config import Config
-#from sfa.trust.gid import *
from sfa.trust.hierarchy import Hierarchy
-#from sfa.trust.auth import *
-from sfa.trust.certificate import *
+#from sfa.trust.certificate import *
import ldap.modlist as modlist
from sfa.util.sfalogging import logger
-
+import os.path
#API for OpenLDAP
+
+class ldap_config():
+ def __init__(self, config_file = '/etc/sfa/ldap_config.py'):
+ self.load(config_file)
+
+ def load(self, config_file):
+ try:
+ execfile(config_file, self.__dict__)
+ self.config_file = config_file
+ # path to configuration data
+ self.config_path = os.path.dirname(config_file)
+ except IOError, error:
+ raise IOError, "Could not find or load the configuration file: %s" % config_file
+
class ldap_co:
""" Set admin login and server configuration variables."""
+
def __init__(self):
-
- self.login = 'cn=admin,dc=senslab,dc=info'
- self.passwd = 'sfa'
- self.server_ip = "192.168.0.251"
+ #Senslab PROD LDAP parameters
+ LdapConfig = ldap_config()
+ self.config = LdapConfig
+ self.ldapHost = LdapConfig.LDAP_IP_ADDRESS
+ self.ldapPeopleDN = LdapConfig.LDAP_PEOPLE_DN
+ self.ldapGroupDN = LdapConfig.LDAP_GROUP_DN
+ self.ldapAdminDN = LdapConfig.LDAP_WEB_DN
+ self.ldapAdminPassword = LdapConfig.LDAP_WEB_PASSWORD
+
+
+ self.ldapPort = ldap.PORT
+ self.ldapVersion = ldap.VERSION3
+ self.ldapSearchScope = ldap.SCOPE_SUBTREE
+
-
def connect(self, bind = True):
"""Enables connection to the LDAP server.
Set the bind parameter to True if a bind is needed
"""
try:
- self.ldapserv = ldap.open(self.server_ip)
- except ldap.LDAPError, e:
- return {'bool' : False, 'message' : e }
+ self.ldapserv = ldap.open(self.ldapHost)
+ except ldap.LDAPError, error:
+ return {'bool' : False, 'message' : error }
# Bind with authentification
if(bind):
return self.bind()
else:
- return {'bool': True}
-
+ return {'bool': True}
def bind(self):
""" Binding method. """
try:
# Opens a connection after a call to ldap.open in connect:
- self.ldapserv = ldap.initialize("ldap://" + self.server_ip )
+ self.ldapserv = ldap.initialize("ldap://" + self.ldapHost)
# Bind/authenticate with a user with apropriate rights to add objects
- self.ldapserv.simple_bind_s(self.login, self.passwd)
+ self.ldapserv.simple_bind_s(self.ldapAdminDN, self.ldapAdminPassword)
- except ldap.LDAPError, e:
- return {'bool' : False, 'message' : e }
+ except ldap.LDAPError, error:
+ return {'bool' : False, 'message' : error }
return {'bool': True}
""" Close the LDAP connection """
try:
self.ldapserv.unbind_s()
- except ldap.LDAPError, e:
- return {'bool' : False, 'message' : e }
+ except ldap.LDAPError, error:
+ return {'bool' : False, 'message' : error }
class LDAPapi :
def __init__(self):
-
+ logger.setLevelDebug()
#SFA related config
- self.senslabauth=Hierarchy()
- config=Config()
- self.authname=config.SFA_REGISTRY_ROOT_AUTH
+ self.senslabauth = Hierarchy()
+ config = Config()
+
+ self.authname = config.SFA_REGISTRY_ROOT_AUTH
+
+ self.conn = ldap_co()
+ self.ldapUserQuotaNFS = self.conn.config.LDAP_USER_QUOTA_NFS
+ self.ldapUserUidNumberMin = self.conn.config.LDAP_USER_UID_NUMBER_MIN
+ self.ldapUserGidNumber = self.conn.config.LDAP_USER_GID_NUMBER
+ self.ldapUserHomePath = self.conn.config.LDAP_USER_HOME_PATH
+
+ self.lengthPassword = 8
+ self.baseDN = self.conn.ldapPeopleDN
#authinfo=self.senslabauth.get_auth_info(self.authname)
+
+
self.charsPassword = [ '!','$','(',')','*','+',',','-','.',\
'0','1','2','3','4','5','6','7','8','9',\
'A','B','C','D','E','F','G','H','I','J',\
'd','e','f','g','h','i','j','k','l','m',\
'n','o','p','q','r','s','t','u','v','w',\
'x','y','z','\'']
- self.lengthPassword = 8;
-
- #self.auth=Auth()
- #gid=authinfo.get_gid_object()
- #self.ldapdictlist = ['type',
- #'pkey',
- #'uid',
- #'serial',
- #'authority',
- #'peer_authority',
- #'pointer' ,
- #'hrn']
- self.baseDN = "ou=people,dc=senslab,dc=info"
- self.conn = ldap_co()
-
+
+ self.ldapShell = '/bin/bash'
+
def generate_login(self, record):
"""Generate login for adding a new user in LDAP Directory
getAttrs = ['uid']
if length_last_name >= login_max_length :
login = lower_last_name[0:login_max_length]
- index = 0;
- logger.debug("login : %s index : %s" %login %index);
+ index = 0
+ logger.debug("login : %s index : %s" %(login,index))
elif length_last_name >= 4 :
login = lower_last_name
index = 0
- logger.debug("login : %s index : %s" %login %index);
+ logger.debug("login : %s index : %s" %(login,index))
elif length_last_name == 3 :
login = lower_first_name[0:1] + lower_last_name
index = 1
- logger.debug("login : %s index : %s" %login %index);
+ logger.debug("login : %s index : %s" %(login,index))
elif length_last_name == 2:
if len ( lower_first_name) >=2:
login = lower_first_name[0:2] + lower_last_name
index = 2
- logger.debug("login : %s index : %s" %login %index);
+ logger.debug("login : %s index : %s" %(login,index))
else:
logger.error("LoginException : \
Generation login error with \
else :
logger.error("LDAP generate_login failed : \
impossible to generate unique login for %s %s" \
- %lower_first_name %lower_last_name)
+ %(lower_first_name,lower_last_name))
- filter = '(uid='+ login+ ')'
+ login_filter = '(uid=' + login + ')'
+
try :
#Check if login already in use
- while (self.ldapSearch(filter, getAttrs) is not [] ):
+ while (len(self.LdapSearch(login_filter, getAttrs)) is not 0 ):
index += 1
if index >= 9:
with minimum four characters")
else:
try:
- login = lower_first_name[0,index] + \
- lower_last_name[0,login_max_length-index]
- filter = '(uid='+ login+ ')'
+ login = lower_first_name[0:index] + \
+ lower_last_name[0:login_max_length-index]
+ login_filter = '(uid='+ login+ ')'
except KeyError:
print "lower_first_name - lower_last_name too short"
+
+ logger.debug("LDAP.API \t generate_login login %s" %(login))
return login
- except ldap.LDAPError,e :
- logger.log_exc("LDAP generate_login Error %s" %e)
- #print >>sys.stderr, "ERROR LDAP %s" %(e)
-
-
+ except ldap.LDAPError,error :
+ logger.log_exc("LDAP generate_login Error %s" %error)
+ return None
+
+
def generate_password(self):
"""Generate password for adding a new user in LDAP Directory
"""
password = str()
+ length = len(self.charsPassword)
for index in range(self.lengthPassword):
- password += self.charsPassword[random.randint(0, \
- len(self.charsPassword))]
+ char_index = random.randint(0,length-1)
+ password += self.charsPassword[char_index]
return password
def encrypt_password(self, password):
- """ Use passlib library to make a RFC2307 LDAP encrypted password
- salt size = 8, use sha-1 algorithm. Returns encrypted password.
-
- """
- #Keep consistency with Java Senslab's LDAP API
- #RFC2307SSHAPasswordEncryptor so set the salt size to 8 bytres
- return lssha.encrypt(password,salt_size = 8)
+ """ Use passlib library to make a RFC2307 LDAP encrypted password
+ salt size = 8, use sha-1 algorithm. Returns encrypted password.
+
+ """
+ #Keep consistency with Java Senslab's LDAP API
+ #RFC2307SSHAPasswordEncryptor so set the salt size to 8 bytres
+ return lssha.encrypt(password,salt_size = 8)
+
+
def find_max_uidNumber(self):
"""Find the LDAP max uidNumber (POSIX uid attribute) .
Used when adding a new user in LDAP Directory
- returns integer max uidNumber + 1
+ returns string max uidNumber + 1
"""
- #Get all the users in the LDAP
- ldapUserUidNumberMin = 2000
-
+ #First, get all the users in the LDAP
getAttrs = "(uidNumber=*)"
- filter = ['uidNumber']
+ login_filter = ['uidNumber']
- result_data = self.ldapSearch(getAttrs, filter)
- #First LDAP user
+ result_data = self.LdapSearch(getAttrs, login_filter)
+ #It there is no user in LDAP yet, First LDAP user
if result_data == []:
- max_uidnumber = ldapUserUidNumberMin
- #Get the highest uidNumber
+ max_uidnumber = self.ldapUserUidNumberMin
+ #Otherwise, get the highest uidNumber
else:
- uidNumberList = [r[1]['uidNumber'] for r in result_data ]
+
+ uidNumberList = [int(r[1]['uidNumber'][0])for r in result_data ]
+ logger.debug("LDAPapi.py \tfind_max_uidNumber \
+ uidNumberList %s " %(uidNumberList))
max_uidnumber = max(uidNumberList) + 1
- return max_uidnumber
-
+ return str(max_uidnumber)
+
+
+ def get_ssh_pkey(self, record):
+ """TODO ; Get ssh public key from sfa record
+ To be filled by N. Turro ? or using GID pl way?
+
+ """
+ return 'A REMPLIR '
+
+ def make_ldap_filters_from_record(self, record=None):
+ """TODO Handle OR filtering in the ldap query when
+ dealing with a list of records instead of doing a for loop in GetPersons
+ Helper function to make LDAP filter requests out of SFA records.
+ """
+ req_ldap = ''
+ req_ldapdict = {}
+ if record :
+ if 'first_name' in record and 'last_name' in record:
+ req_ldapdict['cn'] = str(record['first_name'])+" "\
+ + str(record['last_name'])
+ if 'email' in record :
+ req_ldapdict['mail'] = record['email']
+ if 'mail' in record:
+ req_ldapdict['mail'] = record['mail']
+ if 'enabled' in record:
+ if record['enabled'] == True :
+ req_ldapdict['shadowExpire'] = '-1'
+ else:
+ req_ldapdict['shadowExpire'] = '0'
+
+ #Hrn should not be part of the filter because the hrn
+ #presented by a certificate of a SFA user not imported in
+ #Senslab does not include the senslab login in it
+ #Plus, the SFA user may already have an account with senslab
+ #using another login.
+
+ #if 'hrn' in record :
+ #splited_hrn = record['hrn'].split(".")
+ #if splited_hrn[0] != self.authname :
+ #logger.warning(" \r\n LDAP.PY \
+ #make_ldap_filters_from_record I know nothing \
+ #about %s my authname is %s not %s" \
+ #%(record['hrn'], self.authname, splited_hrn[0]) )
+
+ #login=splited_hrn[1]
+ #req_ldapdict['uid'] = login
+
+
+ logger.debug("\r\n \t LDAP.PY make_ldap_filters_from_record \
+ record %s req_ldapdict %s" \
+ %(record, req_ldapdict))
+
+ for k in req_ldapdict:
+ req_ldap += '('+ str(k)+ '=' + str(req_ldapdict[k]) + ')'
+ if len(req_ldapdict.keys()) >1 :
+ req_ldap = req_ldap[:0]+"(&"+req_ldap[0:]
+ size = len(req_ldap)
+ req_ldap = req_ldap[:(size-1)] +')'+ req_ldap[(size-1):]
+ else:
+ req_ldap = "(cn=*)"
+
+ return req_ldap
def make_ldap_attributes_from_record(self, record):
"""When addind a new user to Senslab's LDAP, creates an attributes
"shadowAccount", "systemQuotas",\
"ldapPublicKey"]
- attrs['givenName'] = str(record['first_name']).lower(),capitalize()
+ attrs['givenName'] = str(record['first_name']).lower().capitalize()
attrs['sn'] = str(record['last_name']).lower().capitalize()
attrs['cn'] = attrs['givenName'] + ' ' + attrs['sn']
attrs['gecos'] = attrs['givenName'] + ' ' + attrs['sn']
attrs['uid'] = self.generate_login(record)
- attrs['quota'] = '/dev/vdb:2000000:2500000:0:0'
- attrs['homeDirectory'] = '/senslab/users/' + attrs['uid']
- attrs['loginShell'] = '/senslab/users/.ssh/welcome.sh'
- attrs['gidNumber'] = '2000'
- attrs['uidNumber'] = str(self.find_max_uidNumber())
+ attrs['quota'] = self.ldapUserQuotaNFS
+ attrs['homeDirectory'] = self.ldapUserHomePath + attrs['uid']
+ attrs['loginShell'] = self.ldapShell
+ attrs['gidNumber'] = self.ldapUserGidNumber
+ attrs['uidNumber'] = self.find_max_uidNumber()
attrs['mail'] = record['mail'].lower()
- attrs['sshPublicKey'] = record['sshpkey'] #To be filled by N. Turro
- attrs['description'] = 'SFA USER FROM OUTSIDE SENSLAB'
- #TODO TO BE FILLED
+
+ attrs['sshPublicKey'] = self.get_ssh_pkey(record)
+
+
+ #Password is automatically generated because SFA user don't go
+ #through the Senslab website used to register new users,
+ #There is no place in SFA where users can enter such information
+ #yet.
+ #If the user wants to set his own password , he must go to the Senslab
+ #website.
password = self.generate_password()
attrs['userPassword']= self.encrypt_password(password)
+ #Account automatically validated (no mail request to admins)
+ #Set to 0 to disable the account, -1 to enable it,
+ attrs['shadowExpire'] = '-1'
+
+ #Motivation field in Senslab
+ attrs['description'] = 'SFA USER FROM OUTSIDE SENSLAB'
+
+ attrs['ou'] = 'SFA' #Optional: organizational unit
+ #No info about those here:
+ attrs['l'] = 'To be defined'#Optional: Locality.
+ attrs['st'] = 'To be defined' #Optional: state or province (country).
+
return attrs
-
- def ldapAdd(self, record = None) :
+
+
+
+ def LdapAddUser(self, record = None) :
"""Add SFA user to LDAP if it is not in LDAP yet. """
user_ldap_attrs = self.make_ldap_attributes_from_record(record)
#Check if user already in LDAP wih email, first name and last name
filter_by = self.make_ldap_filters_from_record(user_ldap_attrs)
- user_exist = self.ldapSearch(filter_by)
+ user_exist = self.LdapSearch(filter_by)
if user_exist:
- logger.warning(" \r\n \t LDAP ldapAdd user %s %s already exists" \
- %(user_ldap_attrs['sn'],user_ldap_attrs['mail'] )
+ logger.warning(" \r\n \t LDAP LdapAddUser user %s %s already exists" \
+ %(user_ldap_attrs['sn'],user_ldap_attrs['mail']))
return {'bool': False}
#Bind to the server
# A dict to help build the "body" of the object
- logger.debug(" \r\n \t LDAP ldapAdd attrs %s " %user_ldap_attrs)
+ logger.debug(" \r\n \t LDAP LdapAddUser attrs %s " %user_ldap_attrs)
# The dn of our new entry/object
dn = 'uid=' + user_ldap_attrs['uid'] + "," + self.baseDN
try:
ldif = modlist.addModlist(user_ldap_attrs)
- logger.debug("\r\n \tLDAPapi.PY add attrs %s \r\n ldif %s"\
+ logger.debug("LDAPapi.py add attrs %s \r\n ldif %s"\
%(user_ldap_attrs,ldif) )
self.conn.ldapserv.add_s(dn,ldif)
logger.info("Adding user %s login %s in LDAP" \
- %user_ldap_attrs['cn'] %user_ldap_attrs['uid'])
+ %(user_ldap_attrs['cn'] ,user_ldap_attrs['uid']))
- except ldap.LDAPError, e:
- logger.log_exc("LDAP Add Error %s" %e)
- return {'bool' : False, 'message' : e }
+ except ldap.LDAPError, error:
+ logger.log_exc("LDAP Add Error %s" %error)
+ return {'bool' : False, 'message' : error }
self.conn.close()
return {'bool': True}
return result
- def ldapDelete(self, person_dn):
+ def LdapDelete(self, person_dn):
"""
Deletes a person in LDAP. Uses the dn of the user.
"""
self.conn.close()
return {'bool': True}
- except ldap.LDAPError, e:
- logger.log_exc("LDAP Delete Error %s" %e)
+ except ldap.LDAPError, error:
+ logger.log_exc("LDAP Delete Error %s" %error)
return {'bool': False}
- def ldapDeleteHrn(self, record_filter):
+ def LdapDeleteUser(self, record_filter):
"""
Deletes a SFA person in LDAP, based on the user's hrn.
"""
#Find uid of the person
- person = self.ldapFindHrn(record_filter)
-
+ person = self.LdapFindUser(record_filter,[])
+ logger.debug("LDAPapi.py \t LdapDeleteUser record %s person %s" \
+ %(record_filter, person))
+
if person:
dn = 'uid=' + person['uid'] + "," +self.baseDN
else:
return {'bool': False}
- result = self.ldapDelete(dn)
+ result = self.LdapDelete(dn)
return result
-
-
- def ldapModify(self, record_filter, new_attributes):
+
+ def LdapModify(self, dn, old_attributes_dict, new_attributes_dict):
+ """ Modifies a LDAP entry """
+
+ ldif = modlist.modifyModlist(old_attributes_dict,new_attributes_dict)
+ # Connect and bind/authenticate
+ result = self.conn.connect()
+ if (result['bool']):
+ try:
+ self.conn.ldapserv.modify_s(dn,ldif)
+ self.conn.close()
+ return {'bool' : True }
+ except ldap.LDAPError, error:
+ logger.log_exc("LDAP LdapModify Error %s" %error)
+ return {'bool' : False }
+
+
+ def LdapModifyUser(self, user_record, new_attributes_dict):
"""
- Gets the record from one user based on record_filter
+ Gets the record from one user_uid_login based on record_filter
and changes the attributes according to the specified new_attributes.
Does not use this if we need to modify the uid. Use a ModRDN
#operation instead ( modify relative DN )
"""
-
- person = self.ldapFindHrn(record_filter,[] )
- if person:
- # The dn of our existing entry/object
- dn = 'uid=' + person['uid'] + "," +self.baseDN
- else:
- return
-
- if new_attributes:
+ if user_record is None:
+ logger.error("LDAP \t LdapModifyUser Need user record ")
+ return {'bool': False}
+
+ #Get all the attributes of the user_uid_login
+ #person = self.LdapFindUser(record_filter,[])
+ req_ldap = self.make_ldap_filters_from_record(user_record)
+ person_list = self.LdapSearch(req_ldap,[])
+ logger.debug("LDAPapi.py \t LdapModifyUser person_list : %s" %(person_list))
+ if person_list and len(person_list) > 1 :
+ logger.error("LDAP \t LdapModifyUser Too many users returned")
+ return {'bool': False}
+ if person_list is None :
+ logger.error("LDAP \t LdapModifyUser User %s doesn't exist "\
+ %(user_record))
+ return {'bool': False}
+
+ # The dn of our existing entry/object
+ #One result only from ldapSearch
+ person = person_list[0][1]
+ dn = 'uid=' + person['uid'][0] + "," +self.baseDN
+
+ if new_attributes_dict:
old = {}
- for k in new_attributes:
- old[k] = person[k]
-
- ldif = modlist.modifyModlist(old,new_attributes)
+ for k in new_attributes_dict:
+ if k not in person:
+ old[k] = ''
+ else :
+ old[k] = person[k]
+ logger.debug(" LDAPapi.py \t LdapModifyUser new_attributes %s"\
+ %( new_attributes_dict))
+ result = self.LdapModify(dn, old,new_attributes_dict)
+ return result
+ else:
+ logger.error("LDAP \t LdapModifyUser No new attributes given. ")
+ return {'bool': False}
- # Connect and bind/authenticate
- result = self.conn.connect(bind)
- if (result['bool']):
- try:
- self.conn.ldapserver.modify_s(dn,ldif)
- self.conn.close()
- except ldap.LDAPError, e:
- logger.log_exc("LDAP ldapModify Error %s" %e)
- return {'bool' : False }
- return {'bool': True}
+ def LdapMarkUserAsDeleted(self, record):
+
+
+ new_attrs = {}
+ #Disable account
+ new_attrs['shadowExpire'] = '0'
+ logger.debug(" LDAPapi.py \t LdapMarkUserAsDeleted ")
+ ret = self.LdapModifyUser(record, new_attrs)
+ return ret
+
- #TODO Handle OR filtering in the ldap query when
- #dealing with a list of records instead of doing a for loop in GetPersons
- def make_ldap_filters_from_record(self, record=None):
+ def LdapResetPassword(self,record):
"""
- Helper function to make LDAP filter requests out of SFA records.
- """
- req_ldapdict = {}
- if record :
- if 'first_name' in record and 'last_name' in record:
- req_ldapdict['cn'] = str(record['first_name'])+" "\
- + str(record['last_name'])
- if 'email' in record or 'mail' in record:
- req_ldapdict['mail'] = record['email']
- if 'hrn' in record :
- splited_hrn = record['hrn'].split(".")
- if splited_hrn[0] != self.authname :
- logger.warning(" \r\n LDAP.PY \
- make_ldap_filters_from_record I know nothing \
- about %s my authname is %s not %s" \
- %(record['hrn'], self.authname, splited_hrn[0]) )
-
- login=splited_hrn[1]
- req_ldapdict['uid'] = login
-
- req_ldap=''
- logger.debug("\r\n \t LDAP.PY make_ldap_filters_from_record \
- record %s req_ldapdict %s" \
- %(record, req_ldapdict))
-
- for k in req_ldapdict:
- req_ldap += '('+str(k)+'='+str(req_ldapdict[k])+')'
- if len(req_ldapdict.keys()) >1 :
- req_ldap = req_ldap[:0]+"(&"+req_ldap[0:]
- size = len(req_ldap)
- req_ldap= req_ldap[:(size-1)] +')'+ req_ldap[(size-1):]
- else:
- req_ldap = "(cn=*)"
+ Resets password for the user whose record is the parameter and changes
+ the corresponding entry in the LDAP.
- return req_ldap
-
+ """
+ password = self.generate_password()
+ attrs = {}
+ attrs['userPassword'] = self.encrypt_password(password)
+ logger.debug("LDAP LdapResetPassword encrypt_password %s"\
+ %(attrs['userPassword']))
+ result = self.LdapModifyUser(record, attrs)
+ return result
-
- def ldapSearch (self, req_ldap = None, expected_fields = None ):
+ def LdapSearch (self, req_ldap = None, expected_fields = None ):
"""
Used to search directly in LDAP, by using ldap filters and
return fields.
When req_ldap is None, returns all the entries in the LDAP.
+
"""
result = self.conn.connect(bind = False)
if (result['bool']) :
- return_fields = []
+ return_fields_list = []
if expected_fields == None :
- return_fields = ['mail','givenName', 'sn', 'uid','sshPublicKey']
+ return_fields_list = ['mail','givenName', 'sn', 'uid', \
+ 'sshPublicKey', 'shadowExpire']
else :
- return_fields = expected_fields
-
- logger.debug("LDAP.PY \t ldapSearch req_ldap %s \
- return_fields %s" %(req_ldap,return_fields))
+ return_fields_list = expected_fields
+ #No specifc request specified, get the whole LDAP
+ if req_ldap == None:
+ req_ldap = '(cn=*)'
+
+ logger.debug("LDAP.PY \t LdapSearch req_ldap %s \
+ return_fields_list %s" \
+ %(req_ldap, return_fields_list))
try:
msg_id = self.conn.ldapserv.search(
self.baseDN,ldap.SCOPE_SUBTREE,\
- req_ldap,return_fields)
+ req_ldap, return_fields_list)
#Get all the results matching the search from ldap in one
#shot (1 value)
result_type, result_data = \
self.conn.close()
- logger.debug("LDAP.PY \t ldapSearch result_data %s"\
+ logger.debug("LDAP.PY \t LdapSearch result_data %s"\
%(result_data))
return result_data
- except ldap.LDAPError,e :
- logger.log_exc("LDAP ldapSearch Error %s" %e)
+ except ldap.LDAPError,error :
+ logger.log_exc("LDAP LdapSearch Error %s" %error)
return []
else:
logger.error("LDAP.PY \t Connection Failed" )
return
-
- def ldapFindHrn(self,record = None, expected_fields = None):
+ def LdapFindDisabledUsers(self):
+ return self.LdapSearch('(shadowExpire=-0)', [])
+
+ def LdapFindUser(self, record = None, is_user_enabled=None, \
+ expected_fields = None):
"""
Search a SFA user with a hrn. User should be already registered
in Senslab LDAP.
Returns one matching entry
- """
+ """
+ if is_user_enabled:
+ custom_record = {}
+ custom_record['enabled'] = is_user_enabled
+ if record:
+ custom_record.update(record)
- req_ldap = self.make_ldap_filters_from_record(record)
- return_fields = []
+
+ req_ldap = self.make_ldap_filters_from_record(custom_record)
+ return_fields_list = []
if expected_fields == None :
- return_fields = ['mail','givenName', 'sn', 'uid','sshPublicKey']
+ return_fields_list = ['mail','givenName', 'sn', 'uid', \
+ 'sshPublicKey']
else :
- return_fields = expected_fields
-
- result_data = self.ldapSearch(req_ldap, return_fields )
+ return_fields_list = expected_fields
- if result_data is None:
- return None
+ result_data = self.LdapSearch(req_ldap, return_fields_list )
+ logger.debug("LDAP.PY \t LdapFindUser result_data %s" %(result_data))
+
+ if len(result_data) is 0:
+ return None
#Asked for a specific user
if record :
+ #try:
ldapentry = result_data[0][1]
- logger.debug("LDAP.PY \t ldapFindHrn ldapentry %s" %(ldapentry))
+ logger.debug("LDAP.PY \t LdapFindUser ldapentry %s" %(ldapentry))
tmpname = ldapentry['uid'][0]
tmpemail = ldapentry['mail'][0]
if ldapentry['mail'][0] == "unknown":
tmpemail = None
+
+ #except IndexError:
+ #logger.error("LDAP ldapFindHRn : no entry for record %s found"\
+ #%(record))
+ #return None
try:
hrn = record['hrn']
peer_authority = None
if parent_hrn is not self.authname:
peer_authority = parent_hrn
-
-
- results= {
+ results = {
'type': 'user',
'pkey': ldapentry['sshPublicKey'][0],
#'uid': ldapentry[1]['uid'][0],
'pointer' : -1,
'hrn': hrn,
}
- except KeyError:
- lorrer.log_exc("LDAPapi \t ldapSearch KEyError results %s" \
- %(results) )
- pass
+ except KeyError,error:
+ logger.log_exc("LDAPapi \t LdaFindUser KEyError %s" \
+ %error )
+ return
else:
#Asked for all users in ldap
results = []
for ldapentry in result_data:
- logger.debug(" LDAP.py ldapFindHrn ldapentry name : %s " \
+ logger.debug(" LDAP.py LdapFindUser ldapentry name : %s " \
%(ldapentry[1]['uid'][0]))
tmpname = ldapentry[1]['uid'][0]
hrn=self.authname+"."+ tmpname
'pointer' : -1,
'hrn': hrn,
} )
- except KeyError:
- pass
+ except KeyError,error:
+ logger.log_exc("LDAPapi.PY \t LdapFindUser EXCEPTION %s" %(error))
+ return
return results
git://git.onelab.eu / sfa.git / blobdiff