From: Thierry Parmentelat Date: Wed, 25 Sep 2013 16:15:39 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice X-Git-Tag: myslice-0.2-4~2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=981adc8a53dced015a8106b6c577cb8f4e636465;hp=babdf591fac29274ced05ba21337d0f5112e6acb;p=myslice.git Merge branch 'master' of ssh://git.onelab.eu/git/myslice --- diff --git a/portal/registrationview.py b/portal/registrationview.py index f18726ef..c7317468 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -6,6 +6,7 @@ from django.views.generic import View 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 manifold.manifoldapi import execute_query @@ -24,75 +25,75 @@ from portal.actions import authority_get_pi_emails class RegistrationView (View): - def dispatch (self, request): - - 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) - - if request.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() - - #POST value validation - if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None): - errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') - #return HttpResponse("Only Letters, Numbers, - and _ allowd in First Name") - #return render(request, 'registration_view.html') - if (re.search(r'^[\w+\s.@+-]+$', reg_lname) == None): - errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') - #return HttpResponse("Only Letters, Numbers, - and _ is allowed in Last name") - #return render(request, 'registration_view.html') -# if (re.search(r'^[\w+\s.@+-]+$', reg_aff) == None): -# errors.append('Affiliation may contain only letters, numbers, spaces and @/./+/-/_ characters.') - #return HttpResponse("Only Letters, Numbers and _ is allowed in Affiliation") - #return render(request, 'registration_view.html') - # XXX validate authority hrn !! - if PendingUser.objects.filter(email__iexact=reg_email): - errors.append('Email already registered.Please provide a new email address.') - #return HttpResponse("Email Already exists") - #return render(request, 'registration_view.html') - 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 - # Saving to DB - 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') -# keypair = ''.join(keypair.split()) - else: - up_file = request.FILES['user_public_key'] - file_content = up_file.read() - file_name = up_file.name - 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 = re.sub("\r", "", keypair) - keypair = re.sub("\n", "\\n",keypair) - keypair = ''.join(keypair.split()) - 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() - if not errors: - b = PendingUser( + def dispatch (self, request): + + 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) + # xxx tocheck - if authorities is empty, it's no use anyway + # (users won't be able to validate the form anyway) + + page = Page(request) + 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 + + if request.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() + + #POST value validation + if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None): + errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') + if (re.search(r'^[\w+\s.@+-]+$', reg_lname) == None): + errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') + # XXX validate authority hrn !! + if PendingUser.objects.filter(email__iexact=reg_email): + errors.append('Email already registered.Please provide a new email address.') + 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 + # Saving to DB + 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') + #keypair = ''.join(keypair.split()) + else: + up_file = request.FILES['user_public_key'] + file_content = up_file.read() + file_name = up_file.name + 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 = re.sub("\r", "", keypair) + keypair = re.sub("\n", "\\n",keypair) + keypair = ''.join(keypair.split()) + 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() + if not errors: + b = PendingUser( first_name=reg_fname, last_name=reg_lname, #affiliation=reg_aff, @@ -100,36 +101,38 @@ class RegistrationView (View): email=reg_email, password=request.POST['password'], keypair=keypair - ) - b.save() + ) + b.save() - # Send email - ctx = { + # 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']) + 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') - return render(request, 'registration_view.html',{ - 'topmenu_items': topmenu_items('Register', request), - 'errors': errors, - 'firstname': request.POST.get('firstname', ''), - 'lastname': request.POST.get('lastname', ''), - #'affiliation': request.POST.get('affiliation', ''), - 'authority_hrn': request.POST.get('authority_hrn', ''), - 'email': request.POST.get('email', ''), - 'password': request.POST.get('password', ''), - 'authorities': authorities, - }) + template_env = { + 'topmenu_items': topmenu_items('Register', request), + 'errors': errors, + 'firstname': request.POST.get('firstname', ''), + 'lastname': request.POST.get('lastname', ''), + #'affiliation': request.POST.get('affiliation', ''), + 'authority_hrn': request.POST.get('authority_hrn', ''), + 'email': request.POST.get('email', ''), + 'password': request.POST.get('password', ''), + 'authorities': authorities, + } + template_env.update(page.prelude_env ()) + return render(request, 'registration_view.html',template_env) diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html index 18759f4e..ef524bb1 100644 --- a/portal/templates/registration_view.html +++ b/portal/templates/registration_view.html @@ -1,13 +1,5 @@ {% extends "layout-unfold1.html" %} -{% block head %} - - - - - -{% endblock %} - {% block unfold1_main %}
@@ -92,7 +84,7 @@