X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=648ae57b7a9843fc6edd84acfc0e2272b622bb99;hb=3a175fa637df17a44202deffd207707487a080d8;hp=084ee884d495f129f3eeb37f965607e33fd59636;hpb=ce50fd212455344e184297c3eb448268608559fe;p=unfold.git diff --git a/portal/actions.py b/portal/actions.py index 084ee884..648ae57b 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -1,12 +1,16 @@ -from django.http import HttpResponse -from manifold.core.query import Query -from manifoldapi.manifoldapi import execute_query,execute_admin_query -from portal.models import PendingUser, PendingSlice, PendingAuthority +from django.http import HttpResponse +from manifold.core.query import Query +from manifoldapi.manifoldapi import execute_query,execute_admin_query +from portal.models import PendingUser, PendingSlice, PendingAuthority import json -from portal.models import PendingSlice -from django.template.loader import render_to_string -from django.core.mail import send_mail +from django.contrib.auth.models import User +from django.template.loader import render_to_string +from django.core.mail import EmailMultiAlternatives, send_mail + +from myslice.theme import ThemeView + +theme = ThemeView() # Thierry: moving this right into the code so # most people can use myslice without having to install sfa @@ -19,6 +23,7 @@ from django.core.mail import send_mail def authority_get_pis(request, authority_hrn): query = Query.get('authority').filter_by('authority_hrn', '==', authority_hrn).select('pi_users') results = execute_admin_query(request, query) + print "authority_get_pis = %s" % results # NOTE: temporarily commented. Because results is giving empty list. # Needs more debugging #if not results: @@ -29,14 +34,20 @@ def authority_get_pis(request, authority_hrn): def authority_get_pi_emails(request, authority_hrn): pi_users = authority_get_pis(request,authority_hrn) + print "pi_users = %s" % pi_users + if any(d['pi_users'] == None for d in pi_users): + #theme.template_name = 'email_default_recipients.txt' + #default_email = render_to_string(theme.template, request) + #default_email = default_email.replace('\n', '') + #return default_email + # the above doesn't work return ['support@myslice.info'] else: pi_user_hrns = [ hrn for x in pi_users for hrn in x['pi_users'] ] - query = Query.get('user').filter_by('user_hrn', 'included', pi_user_hrns).select('email') + query = Query.get('user').filter_by('user_hrn', 'included', pi_user_hrns).select('user_email') results = execute_admin_query(request, query) - print "mails", [result['email'] for result in results] - return [result['email'] for result in results] + return [result['user_email'] for result in results] def is_pi(wsgi_request, user_hrn, authority_hrn): # XXX could be done in a single query ! @@ -157,7 +168,7 @@ def manifold_add_platform(request, platform_params): query = Query.create('local:platform').set(platform_params).select(['user', 'platform']) results = execute_admin_query(request,query) if not results: - raise Exception, "Failed creating manifold platform %s for user: %s" % (platform_params['platform'], platform_params['user']) + raise Exception, "Failed creating manifold platform %s for user: %s" % (platform_params['platform'], platform_params['user']) result, = results return result['platform_id'] @@ -172,7 +183,9 @@ def make_request_user(user): request['last_name'] = user.last_name request['email'] = user.email request['login'] = user.login - request['keypair'] = user.keypair + request['user_hrn'] = user.user_hrn + request['public_key'] = user.public_key + request['private_key'] = user.private_key return request def make_request_slice(slice): @@ -239,7 +252,8 @@ def get_request_by_id(ids): def get_requests(authority_hrns=None): print "get_request_by_authority auth_hrns = ", authority_hrns if not authority_hrns: - pending_users = PendingUser.objects.all() + ## get those pending users who have validated their emails + pending_users = PendingUser.objects.filter(status__iexact = 'True') pending_slices = PendingSlice.objects.all() pending_authorities = PendingAuthority.objects.all() else: @@ -271,7 +285,7 @@ def portal_validate_request(wsgi_request, request_ids): try: create_user(wsgi_request, request) request_status['SFA user'] = {'status': True } - + PendingUser.objects.get(id=request['id']).delete() except Exception, e: request_status['SFA user'] = {'status': False, 'description': str(e)} @@ -295,6 +309,7 @@ def portal_validate_request(wsgi_request, request_ids): try: create_slice(wsgi_request, request) request_status['SFA slice'] = {'status': True } + PendingSlice.objects.get(id=request['id']).delete() except Exception, e: request_status['SFA slice'] = {'status': False, 'description': str(e)} @@ -317,6 +332,7 @@ def portal_validate_request(wsgi_request, request_ids): print "ADD Authority" sfa_add_authority(wsgi_request, sfa_authority_params) request_status['SFA authority'] = {'status': True } + PendingAuthority.objects.get(id=request['id']).delete() except Exception, e: request_status['SFA authority'] = {'status': False, 'description': str(e)} @@ -377,7 +393,7 @@ def create_slice(wsgi_request, request): raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn'] return results -def create_pending_slice(wgsi_request, request): +def create_pending_slice(wsgi_request, request, email): """ """ @@ -391,10 +407,26 @@ def create_pending_slice(wgsi_request, request): ) s.save() - # Send an email: the recipients are the PI of the authority - recipients = authority_get_pi_emails(wsgi_request, authority_hrn) - msg = render_to_string('slice-request-email.txt', request) - send_mail("Onelab user %(email)s requested a slice" % request, msg, email, recipients) + try: + # Send an email: the recipients are the PI of the authority + recipients = authority_get_pi_emails(wsgi_request, request['authority_hrn']) + + theme.template_name = 'slice_request_email.txt' + text_content = render_to_string(theme.template, request) + + theme.template_name = 'slice_request_email.html' + html_content = render_to_string(theme.template, request) + + theme.template_name = 'slice_request_email_subject.txt' + subject = render_to_string(theme.template, request) + subject = subject.replace('\n', '') + + sender = email + msg = EmailMultiAlternatives(subject, text_content, sender, recipients) + msg.attach_alternative(html_content, "text/html") + msg.send() + except Exception, e: + print "Failed to send email, please check the mail templates and the SMTP configuration of your server" #------------------------------------------------------------------------------- # REQUESTS - Users @@ -456,25 +488,23 @@ def sfa_create_user(wsgi_request, request): auth_pi = request.get('pi', None) auth_pi = list([auth_pi]) if auth_pi else list() - # We create a slice request with Manifold terminology + # We create a user request with Manifold terminology sfa_user_params = { - 'user_hrn' : request['user_hrn'], - 'user_email' : request['email'], - 'urn' : Xrn(request['user_hrn'], request['type']).get_urn(), - 'type' : request['type'], - 'keys' : request['public_key'], - 'first_name' : request['first_name'], - 'last_name' : request['last_name'], - #'slices' : None, - #'researcher': None, - 'pi' : auth_pi, - 'enabled' : True + '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 } - query = Query.create('user').set(user_params).select('user_hrn') + 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 ?" % user_params['user_hrn'] + raise Exception, "Could not create %s. Already exists ?" % sfa_user_params['user_hrn'] return results def create_user(wsgi_request, request): @@ -486,7 +516,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_add_user(wsgi_request, request) + sfa_create_user(wsgi_request, request) # Update Manifold user status manifold_update_user(wsgi_request, request['email'], {'status': USER_STATUS_ENABLED}) @@ -494,7 +524,7 @@ def create_user(wsgi_request, request): # Add reference accounts for platforms manifold_add_reference_user_accounts(wsgi_request, request) -def create_pending_user(wgsi_request, request, user_detail): +def create_pending_user(wsgi_request, request, user_detail): """ """ @@ -505,14 +535,30 @@ def create_pending_user(wgsi_request, request, user_detail): authority_hrn = request['authority_hrn'], email = request['email'], password = request['password'], - keypair = request['account_config'], # XXX REMOVE - public_key = request['public_key'], # TODO NEW - private_key = request['private_key'], # TODO NEW - user_hrn = request['user_hrn'], # TODO NEW + public_key = request['public_key'], + private_key = request['private_key'], + user_hrn = request['user_hrn'], pi = '', # XXX Why not None ? + email_hash = request['email_hash'], + status = 'False', ) b.save() - + # sends email to user to activate the email + theme.template_name = 'activate_user.html' + html_content = render_to_string(theme.template, request) + theme.template_name = 'activate_user.txt' + text_content = render_to_string(theme.template, request) + theme.template_name = 'activate_user_email_subject.txt' + subject = render_to_string(theme.template, request) + subject = subject.replace('\n', '') + sender = 'support@myslice.info' + recipient = [request['email']] + #recipient = recipient.append(request['email']) + + msg = EmailMultiAlternatives(subject, text_content, sender, recipient) + msg.attach_alternative(html_content, "text/html") + msg.send() + # saves the user to django auth_user table [needed for password reset] user = User.objects.create_user(request['email'], request['email'], request['password']) @@ -529,15 +575,52 @@ def create_pending_user(wgsi_request, request, user_detail): 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 - account_params = { - 'platform_id' : 5, # XXX ALERT !! - 'user_id' : user_id, - 'auth_type' : request['auth_type'], - 'config' : json.dumps(account_config), - } - manifold_add_account(wsgi_request, account_params) - # Send an email: the recipients are the PI of the authority - recipients = authority_get_pi_emails(wsgi_request, authority_hrn) - msg = render_to_string('user_request_email.txt', request) - send_mail("Onelab New User request for %(email)s submitted" % request, msg, 'support@myslice.info', recipients) + # 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: + 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: + print "Failed creating manifold account on platform %s for user: %s" % ('myslice', request['email']) + + 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']) + + theme.template_name = 'user_request_email.html' + html_content = render_to_string(theme.template, request) + + theme.template_name = 'user_request_email.txt' + text_content = render_to_string(theme.template, request) + + theme.template_name = 'user_request_email_subject.txt' + subject = render_to_string(theme.template, request) + subject = subject.replace('\n', '') + + theme.template_name = 'email_default_sender.txt' + sender = render_to_string(theme.template, request) + sender = sender.replace('\n', '') + + msg = EmailMultiAlternatives(subject, text_content, sender, recipients) + msg.attach_alternative(html_content, "text/html") + msg.send() + except Exception, e: + print "Failed to send email, please check the mail templates and the SMTP configuration of your server" + import traceback + traceback.print_exc()