X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=e27dfb4d8ca6bd065cbd59bcf188c2d5457494cb;hb=9d9c9d79c1bb1b54d1c402a7f4c0b895e294e5ef;hp=59f0802784a5b11d8b48254838fb6eda8f4f9574;hpb=3dcb52389db54ea18854885a7107ec4058ea4dda;p=myslice.git diff --git a/portal/registrationview.py b/portal/registrationview.py index 59f08027..e27dfb4d 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 -# 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,17 +51,18 @@ 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() #POST value validation if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None): @@ -61,16 +72,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 + '}' #keypair = re.sub("\r", "", keypair) #keypair = re.sub("\n", "\\n", keypair) #keypair = keypair.rstrip('\r\n') @@ -86,6 +105,8 @@ class RegistrationView (View): 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].') @@ -94,29 +115,31 @@ class RegistrationView (View): #b.save() 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 - ) + 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'] + 'first_name' : reg_fname, + 'last_name' : reg_lname, + 'authority_hrn' : reg_auth, + 'email' : reg_email, + 'keypair' : 'Public Key :' + public_key, + 'cc_myself' : True # form.cleaned_data['cc_myself'] } - #not working - #recipients = authority_get_pi_emails(request,reg_auth) - recipients = 'devel@myslice.info' - recipients.append(ctx['email']) + + 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)