Record contains first name and last name.
"""
- #Remove all special characters from first_name/last name
- lower_first_name = record['first_name'].replace('-','')\
- .replace('_','').replace('[','')\
- .replace(']','').replace(' ','')\
- .lower()
- lower_last_name = record['last_name'].replace('-','')\
- .replace('_','').replace('[','')\
- .replace(']','').replace(' ','')\
- .lower()
- length_last_name = len(lower_last_name)
+ if 'first_name' in record and 'last_name' in record:
+ #Remove all special characters from first_name/last name
+ lower_first_name = record['first_name'].replace('-','')\
+ .replace('_','').replace('[','')\
+ .replace(']','').replace(' ','')\
+ .lower()
+ lower_last_name = record['last_name'].replace('-','')\
+ .replace('_','').replace('[','')\
+ .replace(']','').replace(' ','')\
+ .lower()
+
+
+ #No first name and last name
+ #check email
+ else:
+ #For compatibility with other ldap func
+ if 'mail' in record and 'email' not in record:
+ record['email'] = record['mail']
+ email = record['email']
+ email = email.split('@')[0].lower()
+ lower_first_name = None
+ lower_last_name = None
+ #Assume there is first name and last name in email
+ #if there is a separator
+ separator_list = ['.','_','-']
+ for sep in separator_list:
+ if sep in email:
+ mail = email.split(sep)
+ lower_first_name = mail[0]
+ lower_last_name = mail[1]
+ break
+ #Otherwise just take the part before the @ as the
+ #lower_first_name and lower_last_name
+ if lower_first_name is None:
+ lower_first_name = email
+ lower_last_name = email
+
+ length_last_name = len(lower_last_name)
login_max_length = 8
#Try generating a unique login based on first name and last name
#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" \
"organizationalPerson", "posixAccount", \
"shadowAccount", "systemQuotas", \
"ldapPublicKey"]
-
- 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)
-
+ try:
+ 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']
+
+ except:
+ attrs['givenName'] = attrs['uid']
+ attrs['sn'] = attrs['uid']
+ attrs['cn'] = attrs['uid']
+ attrs['gecos'] = attrs['uid']
+
+
attrs['quota'] = self.ldapUserQuotaNFS
attrs['homeDirectory'] = self.ldapUserHomePath + attrs['uid']
attrs['loginShell'] = self.ldapShell
def LdapAddUser(self, record) :
"""Add SFA user to LDAP if it is not in LDAP yet. """
-
+ logger.debug(" \r\n \t LDAP LdapAddUser \r\n\r\n =====================================================\r\n ")
user_ldap_attrs = self.make_ldap_attributes_from_record(record)
return {'bool' : False, 'message' : error }
self.conn.close()
- return {'bool': True}
+ return {'bool': True, 'uid':user_ldap_attrs['uid']}
else:
return result
if ldapentry['mail'][0] == "unknown":
tmpemail = None
- #except IndexError:
- #logger.error("LDAP ldapFindHRn : no entry for record %s found"\
- #%(record))
- #return None
-
- try:
+ parent_hrn = None
+ peer_authority = None
+ if 'hrn' in record:
hrn = record['hrn']
parent_hrn = get_authority(hrn)
- peer_authority = None
- if parent_hrn is not self.authname:
+ if parent_hrn != self.authname:
peer_authority = parent_hrn
-
- results = {
- 'type': 'user',
- 'pkey': ldapentry['sshPublicKey'][0],
- #'uid': ldapentry[1]['uid'][0],
- 'uid': tmpname ,
- 'email':tmpemail,
- #'email': ldapentry[1]['mail'][0],
- 'first_name': ldapentry['givenName'][0],
- 'last_name': ldapentry['sn'][0],
- #'phone': 'none',
- 'serial': 'none',
- 'authority': parent_hrn,
- 'peer_authority': peer_authority,
- 'pointer' : -1,
- 'hrn': hrn,
- }
- except KeyError,error:
- logger.log_exc("LDAPapi \t LdaFindUser KEyError %s" \
- %error )
- return
+ #In case the user was not imported from Senslab LDAP
+ #but from another federated site, has an account in
+ #senslab but currently using his hrn from federated site
+ #then the login is different from the one found in its hrn
+ if tmpname != hrn.split('.')[1]:
+ hrn = None
+ else:
+ hrn = None
+
+
+
+ results = {
+ 'type': 'user',
+ 'pkey': ldapentry['sshPublicKey'][0],
+ #'uid': ldapentry[1]['uid'][0],
+ 'uid': tmpname ,
+ 'email':tmpemail,
+ #'email': ldapentry[1]['mail'][0],
+ 'first_name': ldapentry['givenName'][0],
+ 'last_name': ldapentry['sn'][0],
+ #'phone': 'none',
+ 'serial': 'none',
+ 'authority': parent_hrn,
+ 'peer_authority': peer_authority,
+ 'pointer' : -1,
+ 'hrn': hrn,
+ }
+ #except KeyError,error:
+ #logger.log_exc("LDAPapi \t LdaFindUser KEyError %s" \
+ #%error )
+ #return
else:
#Asked for all users in ldap
results = []