X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=07943ef32f99088639bedb0399f89e9e6ba298f7;hb=43a4dfd5c95080af83cc2ccf2c7d75218e985e57;hp=b399ca2911e2fafc5608e8f4ba56d93a8ce1cbee;hpb=30fb08d8e61409fd0d7e88a59057134a59f8e7c8;p=myslice.git diff --git a/portal/actions.py b/portal/actions.py index b399ca29..07943ef3 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -10,6 +10,9 @@ from django.core.mail import EmailMultiAlternatives, send_mail from myslice.theme import ThemeView +# LS Client - By Bruno Soares (UFG) +from lsapiclient import LaboraSchedulerClient + theme = ThemeView() # Thierry: moving this right into the code so @@ -49,6 +52,44 @@ def authority_get_pi_emails(request, authority_hrn): results = execute_admin_query(request, query) return [result['user_email'] for result in results] +#clear user credentials +def clear_user_creds(request, user_email): + try: + user_query = Query().get('local:user').filter_by('email', '==', user_email).select('user_id','email','password','config') + user_details = execute_admin_query(request, user_query) + + # getting the user_id from the session + for user_detail in user_details: + user_id = user_detail['user_id'] + user_email = user_detail['email'] + + account_query = Query().get('local:account').filter_by('user_id', '==', user_id).select('user_id','platform_id','auth_type','config') + account_details = execute_admin_query(request, account_query) + + platform_query = Query().get('local:platform').select('platform_id','platform') + platform_details = execute_admin_query(request, platform_query) + + for account_detail in account_details: + for platform_detail in platform_details: + if platform_detail['platform_id'] == account_detail['platform_id']: + if 'myslice' in platform_detail['platform']: + account_config = json.loads(account_detail['config']) + user_cred = account_config.get('delegated_user_credential','N/A') + if 'N/A' not in user_cred: + user_hrn = account_config.get('user_hrn','N/A') + user_pub_key = json.dumps(account_config.get('user_public_key','N/A')) + user_priv_key = json.dumps(account_config.get('user_private_key','N/A')) + updated_config = '{"user_public_key":'+ user_pub_key + ', "user_private_key":'+ user_priv_key + ', "user_hrn":"'+ user_hrn + '"}' + user_params = { 'config': updated_config} + manifold_update_account(request, user_id,user_params) + return user_email + else: + return None + + except Exception,e: + print "Exception in actions.py in clear_user_creds %s" % e + return None + def is_pi(wsgi_request, user_hrn, authority_hrn): # XXX could be done in a single query ! @@ -115,15 +156,21 @@ def manifold_add_user(wsgi_request, request): ? """ + + authority_hrn = request['authority_hrn'] + request['authority_hrn'] = authority_hrn.split(".")[0] + USER_CONFIG = '{"firstname": "%(first_name)s", "lastname": "%(last_name)s", "authority": "%(authority_hrn)s"}' user_params = { 'email' : request['username'], 'password' : request['password'], 'config' : USER_CONFIG % request, - 'status' : 1, + 'status' : 1 } + request['authority_hrn'] = authority_hrn + query = Query.create('local:user').set(user_params).select('email') results = execute_admin_query(request, query) if not results: @@ -186,6 +233,7 @@ def make_request_user(user): request['user_hrn'] = user.user_hrn request['public_key'] = user.public_key request['private_key'] = user.private_key + request['username'] = user.login return request def make_request_slice(slice): @@ -283,10 +331,6 @@ def portal_validate_request(wsgi_request, request_ids): if request['type'] == 'user': try: - split_email = request['email'].split("@")[0] - split_email = split_email.replace(".", "_") - split_authority = request['authority_hrn'].split(".")[1] - request['username'] = split_email + '@' + split_authority create_user(wsgi_request, request) request_status['SFA user'] = {'status': True } PendingUser.objects.get(id=request['id']).delete() @@ -435,7 +479,11 @@ def create_pending_slice(wsgi_request, request, email): subject = render_to_string(theme.template, request) subject = subject.replace('\n', '') - sender = email + theme.template_name = 'email_default_sender.txt' + sender = render_to_string(theme.template, request) + sender = sender.replace('\n', '') + + #sender = email msg = EmailMultiAlternatives(subject, text_content, sender, recipients) msg.attach_alternative(html_content, "text/html") msg.send() @@ -517,145 +565,68 @@ def sfa_create_user(wsgi_request, request): query = Query.create('user').set(sfa_user_params).select('user_hrn') results = execute_query(wsgi_request, query) + if not results: raise Exception, "Could not create %s. Already exists ?" % sfa_user_params['user_hrn'] else: subject = 'User validated' msg = 'A manager of your institution has validated your account. You have now full user access to the portal.' - send_mail(subject, msg, 'support@onelab.eu',[request['email']], fail_silently=False) + send_mail(subject, msg, 'support@fibre.org.br',[request['email']], fail_silently=False) return results -def ldap_create_user(wsgi_request, request, user_detail): - """ - Populating LDAP withuser data - Edelberto 10/03/2014 - """ - # import needed modules - import ldap - import ldap.modlist as modlist - - # Open a connection - # XXX We need to create this in settings - # ldap.open is deprecated! - #l = ldap.open("127.0.0.1") - l = ldap.initialize('ldap://127.0.0.1:389') - - # you should set this to ldap.VERSION2 if you're using a v2 directory - l.protocol_version = ldap.VERSION3 - - # Bind/authenticate with a user with apropriate rights to add objects - # XXX Now we set the force rootd but after we need to set this in settings file for could change the dn and password of root - l.simple_bind_s("cn=Manager,dc=br","fibre") - - # The dn of our new entry/object - #dn="uid=addtest@uff.br,ou=people,o=uff,dc=br" - - # we need to create the dn entry - # Receiving an email address, how can we split and mount it in DN format? - #mail = "debora@uff.br" - mail = request['email'] - login = mail.split('@')[0] - org = mail.split('@')[1] - o = org.split('.')[-2] - dc = org.split('.')[-1] - - # DN format to authenticate - IMPORTANT! - #FIBRE-BR format - dn = "uid="+mail+",ou=people,o="+o+",dc="+dc - - # DEBUG - print "dn:"+dn - print request['password'] - - # Creating a unique uidNumber - Necessary for experiments - # Was defined to began in 100000 - unique = int(user_detail['user_id']) + 100000 - #unique = int(unique) - print unique - - # A dict to help build the "body" of the object - attrs = {} - attrs['objectclass'] = ['person','inetOrgPerson','posixAccount','eduPerson','brPerson','schacPersonalCharacteristics','fibre', 'ldapPublicKey'] - # XXX Converting all unicodes to string - attrs['uid'] = mail.encode('utf-8') - attrs['cn'] = request['first_name'].encode('latin1') - attrs['sn'] = request['last_name'].encode('latin1') - # XXX we need to set a unique uidNumber. How? - attrs['uidNumber'] = str(unique) - attrs['gidNumber'] = '500' - attrs['homeDirectory'] = "/home/"+org+"/"+mail - attrs['homeDirectory'] = attrs['homeDirectory'].encode('utf-8') - attrs['mail'] = mail.encode('utf-8') - attrs['eppn'] = mail.encode('utf8') - attrs['userPassword'] = request['password'].encode('utf-8') - attrs['sshPublicKey'] = request['public_key'].encode('utf-8') - # XXX We really set TRUE for those attributes? - #attrs['userEnable'] = 'TRUE' - # set FALSE and change after when the user is validated - attrs['userEnable'] = 'FALSE' - attrs['omfAdmin'] = 'TRUE' - - # Convert our dict to nice syntax for the add-function using modlist-module - ldif = modlist.addModlist(attrs) - - # DEBUG - print attrs['userPassword'] - print attrs['cn'] - print attrs['sn'] - print attrs['homeDirectory'] - #print ldif - - # Do the actual synchronous add-operation to the ldapserver - l.add_s(dn,ldif) - - # Its nice to the server to disconnect and free resources when done - l.unbind_s() - - return ldif - -def ldap_modify_user(wsgi_request, request): - #Modify entries in an LDAP Directory - - #Synchrounous modify - # import needed modules - import ldap - import ldap.modlist as modlist - - # Open a connection - l = ldap.initialize("ldap://localhost:389/") - - # Bind/authenticate with a user with apropriate rights to add objects - l.simple_bind_s("cn=Manager,dc=br","fibre") - - # we need to create the dn entry - # Receiving an email address, how can we split and mount it in DN format? - #mail = "debora@uff.br" - mail = request['email'] - login = mail.split('@')[0] - org = mail.split('@')[1] - o = org.split('.')[-2] - dc = org.split('.')[-1] - - # DN format to authenticate - IMPORTANT! - #FIBRE-BR format - dn = "uid="+mail+",ou=people,o="+o+",dc="+dc - - # The dn of our existing entry/object - #dn="uid=mario@uff.br,ou=people,o=uff,dc=br" - - # Some place-holders for old and new values - old = {'userEnable':'FALSE'} - new = {'userEnable':'TRUE'} - - # Convert place-holders for modify-operation using modlist-module - ldif = modlist.modifyModlist(old,new) - - # Do the actual modification - l.modify_s(dn,ldif) - - # Its nice to the server to disconnect and free resources when done - l.unbind_s() - - return ldif +def ls_create_user(wsgi_request, request, user_detail): + organization = request['username'].split('@')[1] + lsClient = LaboraSchedulerClient( organization ) + + orgGIDNumber = lsClient.get_testbed_info()['gidnumber'] + userHomeDirectory = "/home/" + organization + "/" + request['username'].split('@')[0] + userHomeDirectory = userHomeDirectory.encode('utf-8') + + userData = { + 'username' : request['username'], + 'email' : request['email'].encode('utf-8'), + 'password' : request['password'].encode('utf-8'), + 'name' : str( request['first_name'].encode('latin1') ) + ' ' + str( request['last_name'].encode('latin1') ), + 'gidnumber' : orgGIDNumber, + 'homedirectory' : userHomeDirectory, + 'created_by' : "myslice" + } + + # Add user in the island. + addUser = lsClient.add_user( userData ) + + # User successfully created, upload user public key. + if addUser: + ls_update_public_key( wsgi_request, request, lsClient, addUser ) + + return addUser + +def ls_validate_user(wsgi_request, request): + organization = request['username'].split('@')[1] + lsClient = LaboraSchedulerClient( organization ) + + userId = lsClient.get_user_id_by_username( { 'username': str( request['username'] ) } ) + + validate = False + if userId: + userData = { + 'user_id' : userId, + 'new_user_data' : { 'enable': 'TRUE' } + } + + validate = lsClient.update_user( userData ) + + return validate and addUserPublicKey + +def ls_update_public_key( wsgi_request, request, lsClient, userId ): + userPbKey = { + 'user_id' : userId, + 'public_key' : request['public_key'] + } + + addUserPublicKey = lsClient.add_user_public_key( userPbKey ) + + return addUserPublicKey def create_user(wsgi_request, request): @@ -675,23 +646,107 @@ def create_user(wsgi_request, request): # Add reference accounts for platforms manifold_add_reference_user_accounts(wsgi_request, request) -# Add the user to the SFA registry + # Add the user to the SFA registry sfa_create_user(wsgi_request, request) + + # Validate the user using the LS API ( By Bruno - UFG ): + try: + ls_validate_user( wsgi_request, request ) + except Exception, e: + "Error to validate the user in Labora Scheduler." + +def create_user_in_ldap(wsgi_request, request, user_detail): + """ + """ + + # saves the user to django auth_user table [needed for password reset] + user = User.objects.create_user(request['username'], request['email'], request['password']) + + # Creating a manifold user + user_id = manifold_add_user(wsgi_request, request) - ''' - # LDAP update user userEnabled = True + # Creating a Manifold account on the MySlice platform + # Note the JSON representation of public and private keys already includes quotes + account_config = { + 'user_hrn' : request['user_hrn'], + 'user_public_key' : request['public_key'], + } + if request['private_key']: + account_config['user_private_key'] = request['private_key'] + + user_id = user_detail['user_id'] + 1 # the user_id for the newly created user in local:user + + # XXX TODO: Require a myslice platform + # ALERT: this will disapear with ROUTERV2 of Manifold + # We have to consider the case where several registries can be used + # Removed hardcoded platform = 5 + # This platform == 'myslice' is a TMP FIX !! try: - mail = request['email'] - login = mail.split('@')[0] - org = mail.split('@')[1] - o = org.split('.')[-2] - dc = org.split('.')[-1] - # To know if user is a LDAP user - Need to has a 'dc' identifier - if dc == 'br' or 'eu': - ldap_modify_user(wsgi_request, request) + reg_platform_query = Query().get('local:platform') \ + .filter_by('platform', '==', 'myslice') \ + .select('platform_id') + reg_platform = execute_admin_query(wsgi_request, reg_platform_query) + reg_platform_id = reg_platform[0]['platform_id'] + account_params = { + 'platform_id' : reg_platform_id, # XXX ALERT !! + 'user_id' : user_id, + 'auth_type' : request['auth_type'], + 'config' : json.dumps(account_config), + } + manifold_add_account(wsgi_request, account_params) except Exception, e: - "LDAP create user failed" - ''' + print "Failed creating manifold account on platform %s for user: %s" % ('myslice', request['email']) + + # XXX This has to be stored centrally + USER_STATUS_ENABLED = 2 + + # Update Manifold user status + manifold_update_user(wsgi_request, request['username'], {'status': USER_STATUS_ENABLED}) + + # Add reference accounts for platforms + manifold_add_reference_user_accounts(wsgi_request, request) + + from sfa.util.xrn import Xrn + + auth_pi = request.get('pi', None) + auth_pi = list([auth_pi]) if auth_pi else list() + + # We create a user request with Manifold terminology + sfa_user_params = { + 'user_hrn' : request['user_hrn'], + 'user_email' : request['email'], + 'user_urn' : Xrn(request['user_hrn'], request['type']).get_urn(), + 'user_type' : request['type'], + 'keys' : request['public_key'], + 'user_first_name' : request['first_name'], + 'user_last_name' : request['last_name'], + 'pi_authorities' : auth_pi, + 'user_enabled' : True + } + + print request['user_hrn'] + print request['email'] + print request['first_name'] + print request['last_name'] + print request['type'] + print request['public_key'] + + query = Query.create('user').set(sfa_user_params).select('user_hrn') + + print query + + results = execute_admin_query(wsgi_request, query) + + print results + + if not results: + raise Exception, "Could not create %s. Already exists ?" % sfa_user_params['user_hrn'] + else: + subject = 'User validated' + msg = 'A manager of your institution has validated your account. You have now full user access to the portal.' + send_mail(subject, msg, 'support@fibre.org.br',[request['email']], fail_silently=False) + return results + def create_pending_user(wsgi_request, request, user_detail): """ """ @@ -702,21 +757,18 @@ def create_pending_user(wsgi_request, request, user_detail): last_name = request['last_name'], authority_hrn = request['authority_hrn'], email = request['email'], + login = request['username'], password = request['password'], public_key = request['public_key'], private_key = request['private_key'], user_hrn = request['user_hrn'], pi = request['pi'], email_hash = request['email_hash'], + reasons = request['reasons'], status = 'False', ) b.save() - split_email = request['email'].split("@")[0] - split_email = split_email.replace(".", "_") - split_authority = request['authority_hrn'].split(".")[1] - request['username'] = split_email + '@' + split_authority - # sends email to user to activate the email theme.template_name = 'activate_user.html' html_content = render_to_string(theme.template, request) @@ -774,15 +826,30 @@ def create_pending_user(wsgi_request, request, user_detail): except Exception, e: print "Failed creating manifold account on platform %s for user: %s" % ('myslice', request['email']) - # Add user to LDAP userEnabled = False - # Not more here. Create before directly to the registrationview.py - # After we change userEnable = TRUE when validate the user + # Add user to island using LS API ( By Bruno - UFG ) + ls_user_create = ls_create_user( wsgi_request, request, user_detail ) try: # Send an email: the recipients are the PI of the authority # If No PI is defined for this Authority, send to a default email (different for each theme) - recipients = authority_get_pi_emails(wsgi_request, request['authority_hrn']) - + + split_authority_hrn = request['authority_hrn'].split(".")[0] + + recipients = authority_get_pi_emails(wsgi_request, split_authority_hrn) + + pis = authority_get_pis(request, split_authority_hrn) + pi_emails = [] + for x in pis: + for e in x['pi_users']: + try: + u = e.split(".")[1] + y = User.objects.get(username = u) + if y.username.count("@") != 0: + if y.username.split("@")[1] == request['username'].split("@")[1]: + pi_emails += [y.email] + except: + print "fail" + theme.template_name = 'user_request_email.html' html_content = render_to_string(theme.template, request) @@ -797,9 +864,11 @@ def create_pending_user(wsgi_request, request, user_detail): sender = render_to_string(theme.template, request) sender = sender.replace('\n', '') - msg = EmailMultiAlternatives(subject, text_content, sender, recipients) + msg = EmailMultiAlternatives(subject, text_content, sender, pi_emails) + msg.attach_alternative(html_content, "text/html") msg.send() + print pi_emails except Exception, e: print "Failed to send email, please check the mail templates and the SMTP configuration of your server" import traceback