X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fregistrationview.py;h=8fd5917b14dd681298e82e5183ff02ec99b99cd2;hp=58567dd80260ea10e0b2517b308565fb3c0a4d61;hb=d251934bd71c678f552dc9a1d49c3f8efe102e1e;hpb=325f6fccac2c4834031e09f92d67cef59256a335 diff --git a/portal/registrationview.py b/portal/registrationview.py index 58567dd8..8fd5917b 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -3,7 +3,6 @@ import json from random import randint from django.core.mail import send_mail -from django.contrib.auth.models import User from django.views.generic import View from django.template.loader import render_to_string from django.shortcuts import render @@ -17,7 +16,7 @@ from manifoldapi.manifoldapi import execute_admin_query from manifold.core.query import Query from portal.models import PendingUser -from portal.actions import authority_get_pi_emails, manifold_add_user,manifold_add_account +from portal.actions import create_pending_user from theme import ThemeView @@ -33,168 +32,104 @@ class RegistrationView (FreeAccessView, ThemeView): def get (self, request): return self.get_or_post (request, 'GET') - def get_or_post (self, request, method): + def get_or_post(self, wsgi_request, method): + """ + """ errors = [] - # Using cache manifold-tables to get the list of authorities faster - authorities_query = Query.get('authority').select('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']) - # Now using Cache - else: - print "FIREXP ENABLED" - - authorities = execute_admin_query(request, authorities_query) + authorities_query = Query.get('authority').select('name', 'authority_hrn') + authorities = execute_admin_query(wsgi_request, authorities_query) if authorities is not None: authorities = sorted(authorities) + # xxx tocheck - if authorities is empty, it's no use anyway # (users won't be able to validate the form anyway) - page = Page(request) + # Who am I ? + user_query = Query().get('local:user').select('user_id','email') + user_details = execute_admin_query(wsgi_request, user_query) + + # Page rendering + page = Page(wsgi_request) page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js" ] ) page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] ) page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] ) - print 'registration view, method',method - - user_query = Query().get('local:user').select('user_id','email') - user_details = execute_admin_query(self.request, user_query) - 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_login = request.POST.get('login', '') - reg_email = request.POST.get('email','').lower() - #prepare user_hrn - split_email = reg_email.split("@")[0] + # The form has been submitted + + user_request = { + 'first_name' : wsgi_request.POST.get('firstname', ''), + 'last_name' : wsgi_request.POST.get('lastname', ''), + 'authority_hrn' : wsgi_request.POST.get('authority_hrn', ''), + 'email' : wsgi_request.POST.get('email', '').lower(), + 'password' : wsgi_request.POST.get('password', ''), + } + + # Construct user_hrn from email (XXX Should use common code) + split_email = user_request['email'].split("@")[0] split_email = split_email.replace(".", "_") - user_hrn = reg_auth + '.' + split_email+ str(randint(1,1000000)) + user_request['user_hrn'] = user_request['authority_hrn'] \ + + '.' + split_email + str(randint(1,1000000)) + # Validate input UserModel = get_user_model() - - #POST value validation - if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None): + if (re.search(r'^[\w+\s.@+-]+$', user_request['first_name']) == None): errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') - if (re.search(r'^[\w+\s.@+-]+$', reg_lname) == None): + if (re.search(r'^[\w+\s.@+-]+$', user_request['last_name']) == None): errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') # checking in django_db !! - if PendingUser.objects.filter(email__iexact=reg_email): + if PendingUser.objects.filter(email__iexact = user_request['email']): errors.append('Email is pending for validation. Please provide a new email address.') - if UserModel._default_manager.filter(email__iexact=reg_email): + if UserModel._default_manager.filter(email__iexact = user_request['email']): errors.append('This email is not usable. Please contact the administrator or try with another email.') for user_detail in user_details: - if user_detail['email']==reg_email: + if user_detail['email'] == user_request['email']: errors.append('Email already registered in Manifold. Please provide a new email address.') -# XXX TODO: Factorize with portal/accountview.py - if 'generate' in request.POST['question']: + # XXX TODO: Factorize with portal/accountview.py + if 'generate' in wsgi_request.POST['question']: + user_request['auth_type'] = 'managed' + + # XXX Common code, dependency ? 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 - account_config = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}' - auth_type = 'managed' - #keypair = re.sub("\r", "", keypair) - #keypair = re.sub("\n", "\\n", keypair) - #keypair = keypair.rstrip('\r\n') - #keypair = ''.join(keypair.split()) - #for sending email: removing existing double qoute - public_key = public_key.replace('"', ''); + + # Example: private_key = '-----BEGIN RSA PRIVATE KEY-----\nMIIC...' + # Example: public_key = 'ssh-rsa AAAAB3...' + user_request['private_key'] = private.exportKey() + user_request['public_key'] = private.publickey().exportKey(format='OpenSSH') + else: - up_file = request.FILES['user_public_key'] - file_content = up_file.read() - file_name = up_file.name + user_request['auth_type'] = 'user' + + up_file = wsgi_request.FILES['user_public_key'] + + file_content = up_file.read().strip() + 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): - account_config = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}' - account_config = re.sub("\r", "", account_config) - account_config = re.sub("\n", "\\n",account_config) - account_config = ''.join(account_config.split()) - auth_type = 'user' - # for sending email - public_key = file_content - public_key = ''.join(public_key.split()) - else: + + ALLOWED_EXTENSIONS = ['.pub','.txt'] + if file_extension not in ALLOWED_EXTENSIONS or not re.search(r'ssh-rsa',file_content): errors.append('Please upload a valid RSA public key.') - #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, - #login = reg_login, - email = reg_email, - password = request.POST['password'], - keypair = account_config, - pi = '', - ) - b.save() - # saves the user to django auth_user table [needed for password reset] - user = User.objects.create_user(reg_email, reg_email, request.POST['password']) - #creating user to manifold local:user - user_config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}' - user_params = {'email': reg_email, 'password': request.POST['password'], 'config': user_config, 'status': 1} - manifold_add_user(request,user_params) - #creating local:account in manifold - user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user - account_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': account_config} - manifold_add_account(request,account_params) - - # Send email - ctx = { - 'first_name' : reg_fname, - 'last_name' : reg_lname, - 'authority_hrn' : reg_auth, - 'email' : reg_email, - 'user_hrn' : user_hrn, - 'public_key' : public_key, - } + user_request['private_key'] = None + user_request['public_key'] = file_content - recipients = authority_get_pi_emails(request,reg_auth) - - - msg = render_to_string('user_request_email.txt', ctx) - send_mail("Onelab New User request for %s submitted"%reg_email, msg, 'support@myslice.info', recipients) + if not errors: + create_pending_user(wsgi_request, user_request, user_detail) self.template_name = 'user_register_complete.html' - return render(request, self.template, {'theme': self.theme}) + return render(wsgi_request, self.template, {'theme': self.theme}) + + else: + user_request = {} template_env = { 'topmenu_items': topmenu_items_live('Register', page), '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, 'theme': self.theme } + template_env.update(user_request) template_env.update(page.prelude_env ()) - return render(request, self.template,template_env) + return render(wsgi_request, self.template,template_env)