From 230df6f125a407eda815e13941b23a2d0a617380 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 25 Sep 2013 17:38:33 +0200 Subject: [PATCH 1/1] indented properly - please use margin=4 --- portal/registrationview.py | 168 ++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 88 deletions(-) diff --git a/portal/registrationview.py b/portal/registrationview.py index f18726ef..9d6c569f 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -24,75 +24,67 @@ 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) + + 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 +92,36 @@ 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, - }) + 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, + }) -- 2.45.2