X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=a2afbfc2bbe18963daf352aad6e1fc6d1624ba9c;hb=2c1bd9325dc325f82d99807fcdb9d14ae148f167;hp=d62f9941e4a2fb2fb84bf9548f2152036d0b7385;hpb=64769354aff47027420cbca4052cb39740fd7186;p=unfold.git diff --git a/portal/actions.py b/portal/actions.py index d62f9941..a2afbfc2 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -49,6 +49,45 @@ 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') + user_cred = account_config.get('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 ! @@ -378,13 +417,19 @@ def create_slice(wsgi_request, request): user_hrn = request.get('user_hrn', None) user_hrns = list([user_hrn]) if user_hrn else list() - user_email = request.get + user_query = Query().get('user').select('user_hrn','user_email').filter_by('user_hrn','==',user_hrn) + user_details_sfa = execute_admin_query(wsgi_request, user_query) + if not user_details_sfa: + raise Exception, "User %s doesn't exist, validate user before validating slice" % user_hrn + for user in user_details_sfa: + user_email = user['user_email'] # XXX We should create a slice with Manifold terminology slice_params = { 'slice_hrn' : hrn, 'slice_urn' : urn, 'slice_type' : request['type'], + 'url' : request['number_of_nodes'], 'users' : user_hrns, 'slice_enabled' : True } @@ -394,12 +439,11 @@ def create_slice(wsgi_request, request): results = execute_query(wsgi_request, query) if not results: raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn'] - ## We do not store the email in pendingslice table. As a result receiver's email is unknown ## - ## Need modification in pendingslice table ### - #else: - # subject = 'Slice created' - # msg = 'A manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting.' - # send_mail(subject, msg, 'support@onelab.eu',['yasin.upmc@gmail.com'], fail_silently=False) + else: + clear_user_creds(wsgi_request,user_email) + subject = 'Slice created' + msg = 'A manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting.' + send_mail(subject, msg, 'support@onelab.eu',[user_email], fail_silently=False) return results @@ -412,7 +456,7 @@ def create_pending_slice(wsgi_request, request, email): slice_name = request['slice_name'], user_hrn = request['user_hrn'], authority_hrn = request['authority_hrn'], - number_of_nodes = request['exp_url'], + number_of_nodes = request['url'], purpose = request['purpose'], ) s.save() @@ -484,7 +528,7 @@ def manifold_add_reference_user_accounts(wsgi_request, request): } manifold_add_account(wsgi_request, manifold_account_params) -def sfa_create_user(wsgi_request, request): +def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False): """ Arguments: wsgi_request (~ WSGIRequest) : @@ -511,8 +555,16 @@ def sfa_create_user(wsgi_request, request): 'user_enabled' : True } - query = Query.create('user').set(sfa_user_params).select('user_hrn') - results = execute_query(wsgi_request, query) + if namespace is not None: + query = Query.create('%s:user' % namespace).set(sfa_user_params).select('user_hrn') + else: + query = Query.create('user').set(sfa_user_params).select('user_hrn') + + if as_admin: + results = execute_admin_query(wsgi_request, query) + else: + results = execute_query(wsgi_request, query) + if not results: raise Exception, "Could not create %s. Already exists ?" % sfa_user_params['user_hrn'] else: @@ -521,8 +573,7 @@ def sfa_create_user(wsgi_request, request): send_mail(subject, msg, 'support@onelab.eu',[request['email']], fail_silently=False) return results -def create_user(wsgi_request, request): - +def create_user(wsgi_request, request, namespace = None, as_admin = False): # XXX This has to be stored centrally USER_STATUS_ENABLED = 2 @@ -530,7 +581,7 @@ def create_user(wsgi_request, request): # we would have to perform the steps in create_pending_user too # Add the user to the SFA registry - sfa_create_user(wsgi_request, request) + sfa_create_user(wsgi_request, request, namespace, as_admin) # Update Manifold user status manifold_update_user(wsgi_request, request['email'], {'status': USER_STATUS_ENABLED})