X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=d3049dda417cc75a9dbaabd65dc1a4df85bf9c04;hb=88561aa60d0e40dc2696825d5f6e4103b7e2a134;hp=c73174685c2c676f5f5d5795f2c3c9ea514ac5ef;hpb=aa5e85a81529245b22ad6afed170abe6879a1d7c;p=myslice.git diff --git a/portal/registrationview.py b/portal/registrationview.py index c7317468..d3049dda 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -1,4 +1,5 @@ import os.path, re +import json from django.core.mail import send_mail @@ -7,33 +8,42 @@ from django.template.loader import render_to_string from django.shortcuts import render from unfold.page import Page -from myslice.viewutils import topmenu_items +from unfold.loginrequired import FreeAccessView +from ui.topmenu import topmenu_items -from manifold.manifoldapi import execute_query +from manifold.manifoldapi import execute_admin_query from manifold.core.query import Query from portal.models import PendingUser -from portal.actions import authority_get_pi_emails +from portal.actions import authority_get_pi_emails, manifold_add_user,manifold_add_account -# This is a rough porting from views.py -# the former function-based view is now made a class -# we redefine dispatch as it is simple -# and coincidentally works since we do not need LoginRequiredAutoLogoutView -# a second stab should redefine post and get instead -# also this was not thoroughly tested either, might miss some imports -# to be continued... +# since we inherit from FreeAccessView we cannot redefine 'dispatch' +# so let's override 'get' and 'post' instead +# +class RegistrationView (FreeAccessView): -class RegistrationView (View): + def post (self, request): + return self.get_or_post (request, 'POST') - def dispatch (self, request): + def get (self, request): + return self.get_or_post (request, 'GET') + def get_or_post (self, request, method): errors = [] - authorities_query = Query.get('authority').\ - filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc']).\ - select('name', 'authority_hrn') - #authorities_query = Query.get('authority').select('authority_hrn') - authorities = execute_query(request, authorities_query) + #authorities_query = Query.get('authority').\ + # select('name', 'authority_hrn') + + #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False') + #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) + #if onelab_enabled: + if True: + print "ONELAB ENABLED" + authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos']) + else: + print "FIREXP ENABLED" + + authorities = execute_admin_query(request, authorities_query) # xxx tocheck - if authorities is empty, it's no use anyway # (users won't be able to validate the form anyway) @@ -41,18 +51,23 @@ class RegistrationView (View): page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js" ] ) page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] ) - print 'registration view, method',request.method + print 'registration view, method',method - if request.method == 'POST': + if method == 'POST': # We shall use a form here #get_email = PendingUser.objects.get(email) - reg_fname = request.POST.get('firstname', '') - reg_lname = request.POST.get('lastname', '') - #reg_aff = request.POST.get('affiliation','') - reg_auth = request.POST.get('authority_hrn', '') - reg_email = request.POST.get('email','').lower() - + reg_fname = request.POST.get('firstname', '') + reg_lname = request.POST.get('lastname', '') + #reg_aff = request.POST.get('affiliation','') + reg_auth = request.POST.get('authority_hrn', '') + reg_login = request.POST.get('login', '') + reg_email = request.POST.get('email','').lower() + #prepare user_hrn + split_email = reg_email.split("@")[0] + split_email = split_email.replace(".", "_") + user_hrn = reg_auth + '.' + split_email + #POST value validation if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None): errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') @@ -61,16 +76,24 @@ class RegistrationView (View): # XXX validate authority hrn !! if PendingUser.objects.filter(email__iexact=reg_email): errors.append('Email already registered.Please provide a new email address.') + +# XXX TODO: Factorize with portal/accountview.py if 'generate' in request.POST['question']: - # Generate public and private keys using SFA Library - from sfa.trust.certificate import Keypair - k = Keypair(create=True) - public_key = k.get_pubkey_string() - private_key = k.as_pem() - private_key = ''.join(private_key.split()) - public_key = "ssh-rsa " + public_key + from Crypto.PublicKey import RSA + private = RSA.generate(1024) + private_key = json.dumps(private.exportKey()) + public = private.publickey() + public_key = json.dumps(public.exportKey(format='OpenSSH')) + +# # Generate public and private keys using SFA Library +# from sfa.trust.certificate import Keypair +# k = Keypair(create=True) +# public_key = k.get_pubkey_string() +# private_key = k.as_pem() +# private_key = ''.join(private_key.split()) +# public_key = "ssh-rsa " + public_key # Saving to DB - keypair = '{"user_public_key":"'+ public_key + '", "user_private_key":"'+ private_key + '"}' + keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}' #keypair = re.sub("\r", "", keypair) #keypair = re.sub("\n", "\\n", keypair) #keypair = keypair.rstrip('\r\n') @@ -82,46 +105,54 @@ class RegistrationView (View): file_extension = os.path.splitext(file_name)[1] allowed_extension = ['.pub','.txt'] if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content): - keypair = '{"user_public_key":"'+ file_content +'"}' + keypair = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}' keypair = re.sub("\r", "", keypair) keypair = re.sub("\n", "\\n",keypair) keypair = ''.join(keypair.split()) + # for sending email + public_key = file_content else: errors.append('Please upload a valid RSA public key [.txt or .pub].') #b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff, # email=reg_email, password=request.POST['password'], keypair=keypair) #b.save() + #saving to django db 'portal_pendinguser' table if not errors: - b = PendingUser( - first_name=reg_fname, - last_name=reg_lname, - #affiliation=reg_aff, - authority_hrn=reg_auth, - email=reg_email, - password=request.POST['password'], - keypair=keypair + b = PendingUser( + first_name = reg_fname, + last_name = reg_lname, + #affiliation = reg_aff, + authority_hrn = reg_auth, + login = reg_login, + email = reg_email, + password = request.POST['password'], + keypair = keypair, ) - b.save() - - # Send email - ctx = { - 'first_name' : reg_fname, - 'last_name' : reg_lname, - 'authority_hrn': reg_auth, - 'email' : reg_email, - 'keypair' : keypair, - 'cc_myself' : True # form.cleaned_data['cc_myself'] - } - - recipients = authority_get_pi_emails(request,reg_auth) - if ctx['cc_myself']: - recipients.append(ctx['email']) - - msg = render_to_string('user_request_email.txt', ctx) - send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients) - - return render(request, 'user_register_complete.html') + b.save() + #saving to manifold + config = '{"firstname":'+ reg_fname + ', "lastname":'+ reg_lname + ', "authority":"'+ reg_auth + '"}' + user_params = {'email': reg_email, 'password': request.POST['password'], 'config': config} + manifold_add_user(request,user_params) + # Send email + ctx = { + 'first_name' : reg_fname, + 'last_name' : reg_lname, + 'authority_hrn' : reg_auth, + 'email' : reg_email, + 'user_hrn' : user_hrn, + 'keypair' : 'Public Key :' + public_key, + 'cc_myself' : True # form.cleaned_data['cc_myself'] + } + recipients = authority_get_pi_emails(request,reg_auth) + + if ctx['cc_myself']: + recipients.append(ctx['email']) + + msg = render_to_string('user_request_email.txt', ctx) + send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients) + + return render(request, 'user_register_complete.html') template_env = { 'topmenu_items': topmenu_items('Register', request),