X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=e55e30fd25b3d033845ee9e602bfdef6ff910515;hb=bff32abff469690c249af3b4f1cbb6905bd70e0d;hp=396d357b90ea58b9ac2d02db9b9205135b0e0283;hpb=5a40dbe074a307538769ae873e446323d6a75f39;p=myslice.git diff --git a/portal/registrationview.py b/portal/registrationview.py index 396d357b..e55e30fd 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -1,11 +1,14 @@ import os.path, re import json -from random import randint +from random import randint +from hashlib import md5 from django.views.generic import View from django.template.loader import render_to_string + from django.shortcuts import render from django.contrib.auth import get_user_model +from django.contrib.sites.models import Site from unfold.page import Page from unfold.loginrequired import FreeAccessView @@ -19,6 +22,8 @@ from portal.actions import create_pending_user from myslice.theme import ThemeView +import activity.user + # since we inherit from FreeAccessView we cannot redefine 'dispatch' # so let's override 'get' and 'post' instead # @@ -35,64 +40,108 @@ class RegistrationView (FreeAccessView, ThemeView): """ """ errors = [] - + authority_hrn = None 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) + print "############ BREAKPOINT 1 #################" # 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" ] ) - + page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/jquery.qtip.min.js","js/jquery-ui.js" ] ) + page.add_css_files ( [ "css/onelab.css", "css/registration.css", "css/jquery.qtip.min.css" ] ) + page.add_css_files ( [ "https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] ) + print "############ BREAKPOINT 2 #################" if method == 'POST': + reg_form = {} # The form has been submitted + + # get the domain url + current_site = Site.objects.get_current() + current_site = current_site.domain + + print "############ BREAKPOINT 3 #################" + + for authority in authorities: + if authority['name'] == wsgi_request.POST.get('org_name', ''): + authority_hrn = authority['authority_hrn'] + # Handle the case when the template uses only hrn and not name + if authority_hrn is None: + authority_hrn = wsgi_request.POST.get('org_name', '') + + print "############ BREAKPOINT 4 #################" + + post_email = wsgi_request.POST.get('email','').lower() + salt = randint(1,100000) + email_hash = md5(str(salt)+post_email).hexdigest() + #email_hash = md5(post_email).digest().encode('base64')[:-1] 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(), + 'organization' : wsgi_request.POST.get('org_name', ''), + 'authority_hrn' : authority_hrn, + 'email' : post_email, 'password' : wsgi_request.POST.get('password', ''), + 'current_site' : current_site, + 'email_hash' : email_hash, + 'pi' : '', + 'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash } - + + print "############ BREAKPOINT 5 #################" + # Construct user_hrn from email (XXX Should use common code) split_email = user_request['email'].split("@")[0] split_email = split_email.replace(".", "_") + # Replace + by _ => more convenient for testing and validate with a real email + split_email = split_email.replace("+", "_") user_request['user_hrn'] = user_request['authority_hrn'] \ + '.' + split_email # Validate input UserModel = get_user_model() if (re.search(r'^[\w+\s.@+-]+$', user_request['first_name']) == None): - errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') + errors.append('First name may contain only letters, numbers, spaces and @/./+/-/_ characters.') 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 = user_request['email']): - errors.append('Email is pending for validation. Please provide a new email address.') - 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.') + errors.append('Last name may contain only letters, numbers, spaces and @/./+/-/_ characters.') # Does the user exist in Manifold? user_query = Query().get('local:user').select('user_id','email') user_details = execute_admin_query(wsgi_request, user_query) for user_detail in user_details: if user_detail['email'] == user_request['email']: - errors.append('Email already registered in Manifold. Please provide a new email address.') + errors.append('Email already registered. Login with your existing account. Forgot your password?') + # Does the user exist in sfa? [query is very slow!!] - user_query = Query().get('user').select('user_hrn','user_email') + #user_query = Query().get('user').select('user_hrn','user_email') + # XXX Test based on the user_hrn is quick + user_query = Query().get('user').select('user_hrn','user_email').filter_by('user_hrn','==',user_request['user_hrn']) user_details_sfa = execute_admin_query(wsgi_request, user_query) + for user in user_details_sfa: if user['user_email'] == user_request['email']: - errors.append('Email already registered in SFA registry. Please use another email.') + errors.append('Email already registered in OneLab registry. Contact OneLab support or use another email.') if user['user_hrn'] == user_request['user_hrn']: # add random number if user_hrn already exists in the registry user_request['user_hrn'] = user_request['authority_hrn'] \ + '.' + split_email + str(randint(1,1000000)) - + + # checking in django unfold db portal application pending users + # sqlite3 /var/unfold/unfold.sqlite3 + # select email from portal_pendinguser; + if PendingUser.objects.filter(email__iexact = user_request['email']): + errors.append('Account pending for validation. Please wait till your account is validated or contact OneLab support.') + + # checking in django_db !! + # sqlite3 /var/unfold/unfold.sqlite3 + # select email from auth_user; + if UserModel._default_manager.filter(email__iexact = user_request['email']): + errors.append('Contact OneLab support or try with another email.') + # XXX TODO: Factorize with portal/accountview.py + # XXX TODO: Factorize with portal/registrationview.py + # XXX TODO: Factorize with portal/joinview.py if 'generate' in wsgi_request.POST['question']: user_request['auth_type'] = 'managed' @@ -117,17 +166,29 @@ class RegistrationView (FreeAccessView, ThemeView): 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.') - - user_request['private_key'] = None + # user_request['private_key'] can't be Null because all db fields are set as NOT NULL + user_request['private_key'] = "" user_request['public_key'] = file_content if not errors: create_pending_user(wsgi_request, user_request, user_detail) self.template_name = 'user_register_complete.html' + # log user activity + activity.user.registered(self.request) return render(wsgi_request, self.template, {'theme': self.theme}) else: + print "############ BREAKPOINT A #################" user_request = {} + ## this is coming from onelab website onelab.eu + reg_form = { + 'first_name': wsgi_request.GET.get('first_name', ''), + 'last_name': wsgi_request.GET.get('last_name', ''), + 'email': wsgi_request.GET.get('email', ''), + } + # log user activity + activity.user.signup(self.request) + print "############ BREAKPOINT B #################" template_env = { 'topmenu_items': topmenu_items_live('Register', page), @@ -136,5 +197,7 @@ class RegistrationView (FreeAccessView, ThemeView): 'theme': self.theme } template_env.update(user_request) + template_env.update(reg_form) template_env.update(page.prelude_env ()) + print "############ BREAKPOINT C #################" return render(wsgi_request, self.template,template_env)