X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=c52689f6f52564dadf5ea2293f1864d7958749fd;hb=refs%2Fheads%2Ffibre;hp=df3f2dc742317cd26a296d0962873c6844089eed;hpb=af430c2c54abf6d947c5f9812d56f56b9baaa0cf;p=unfold.git diff --git a/portal/registrationview.py b/portal/registrationview.py index df3f2dc7..c52689f6 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -5,6 +5,7 @@ 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 @@ -17,12 +18,14 @@ from manifoldapi.manifoldapi import execute_admin_query from manifold.core.query import Query from portal.models import PendingUser -#from portal.actions import create_pending_user -# Edelberto - LDAP -from portal.actions import create_pending_user, ldap_create_user +from django.contrib.auth.models import User #Pedro + +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 # @@ -45,12 +48,13 @@ class RegistrationView (FreeAccessView, ThemeView): 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", "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 @@ -59,9 +63,8 @@ class RegistrationView (FreeAccessView, ThemeView): current_site = Site.objects.get_current() current_site = current_site.domain - #authorities_query = Query.get('authority').select('name', 'authority_hrn') - #authorities = execute_admin_query(wsgi_request, authorities_query) - + print "############ BREAKPOINT 3 #################" + for authority in authorities: if authority['name'] == wsgi_request.POST.get('org_name', ''): authority_hrn = authority['authority_hrn'] @@ -69,7 +72,9 @@ class RegistrationView (FreeAccessView, ThemeView): # 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() @@ -80,28 +85,34 @@ class RegistrationView (FreeAccessView, ThemeView): 'organization' : wsgi_request.POST.get('org_name', ''), 'authority_hrn' : authority_hrn, 'email' : post_email, + 'username' : wsgi_request.POST.get('username','').lower(), 'password' : wsgi_request.POST.get('password', ''), + 'reasons' : wsgi_request.POST.get('reasons', ''), 'current_site' : current_site, 'email_hash' : email_hash, 'pi' : '', 'validation_link': 'https://' + 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(".", "_") # user_request['user_hrn'] = user_request['authority_hrn'] \ # + '.' + split_email - 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("+", "_") + username = user_request['username'] + + if user_request['authority_hrn'] == "fibre" : + user_request['username'] = user_request['username'] + "@" + "rnp" # catch-all island + split_authority = user_request['authority_hrn'] + else : + split_authority = user_request['authority_hrn'].split(".")[1] + user_request['username'] = user_request['username'] + '@' + split_authority + split_authority = user_request['authority_hrn'].split(".")[0] - split_authority = user_request['authority_hrn'].split(".")[1] - username = split_email + '@' + split_authority - split_authority = user_request['authority_hrn'].split(".")[0] - user_request['user_hrn'] = split_authority + '.' + username + user_request['user_hrn'] = split_authority + '.' + user_request['username'] # Validate input UserModel = get_user_model() @@ -109,31 +120,48 @@ class RegistrationView (FreeAccessView, ThemeView): 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.') + if (re.search(r'^[\w,]+$' , username) == None): + errors.append('Username may contain only letters,numbers 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.') + # 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.') + if User.objects.filter(username__iexact = user_request['username']): + errors.append('This username is already in use, try another one') # 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') # 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.') - 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)) + # 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.') + # 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('Please 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 @@ -166,28 +194,15 @@ class RegistrationView (FreeAccessView, ThemeView): user_request['public_key'] = file_content if not errors: - ''' - try: - # verify if is a LDAP - mail = user_detail['email'] - login = mail.split('@')[0] - org = mail.split('@')[1] - o = org.split('.')[-2] - dc = org.split('.')[-1] - # To know if user is a LDAP user - Need to has a 'dc' identifier - if dc == 'br' or 'eu': - # LDAP insert directly - but with userEnable = FALSE - ldap_create_user(wsgi_request, user_request, user_detail) - - except Exception, e: - print "LDAP: problem em access the LDAP with this credentail" - ''' create_pending_user(wsgi_request, user_request, user_detail) self.template_name = 'user_register_complete.html' - - return render(wsgi_request, self.template, {'theme': self.theme}) + # log user activity + #activity.user.registered(self.request) + + return render(wsgi_request, self.template, {'theme': self.theme, 'REQINST':wsgi_request.POST.get('org_name', '').split(".")[1].upper()}) else: + print "############ BREAKPOINT A #################" user_request = {} ## this is coming from onelab website onelab.eu reg_form = { @@ -195,14 +210,19 @@ class RegistrationView (FreeAccessView, ThemeView): '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), 'errors': errors, 'authorities': authorities, - 'theme': self.theme + 'theme': self.theme, + 'section':'Registration' } 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)