X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=2316105dfd026709e2925888f1e44155f723729a;hb=bddaae13234f2d36f16098b756006e77a2e409f5;hp=7967a916c25bc93c7aca7461b96aa4a67f95c98b;hpb=4bec211b6b6a2f67c7dedc5351d65e5e5810ca7f;p=unfold.git diff --git a/portal/registrationview.py b/portal/registrationview.py index 7967a916..2316105d 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -17,6 +17,8 @@ from manifoldapi.manifoldapi import execute_admin_query from manifold.core.query import Query from portal.models import PendingUser +from django.contrib.auth.models import User #Pedro + from portal.actions import create_pending_user from myslice.theme import ThemeView @@ -37,8 +39,8 @@ class RegistrationView (FreeAccessView, ThemeView): """ """ errors = [] - - authorities_query = Query.get('authority').select('name', 'authority_hrn') + 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) @@ -57,46 +59,67 @@ 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) + #authorities_query = Query.get('authority').select('name', 'authority_hrn') + #authorities = execute_admin_query(wsgi_request, authorities_query) 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', '') + 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', ''), - '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, - 'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash + 'first_name' : wsgi_request.POST.get('firstname', ''), + 'last_name' : wsgi_request.POST.get('lastname', ''), + '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', ''), + 'current_site' : current_site, + 'email_hash' : email_hash, + 'pi' : '', + 'validation_link': 'https://' + current_site + '/portal/email_activation/'+ email_hash } # 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(".", "_") + # user_request['user_hrn'] = user_request['authority_hrn'] \ + # + '.' + split_email + username = user_request['username'] + + if user_request['authority_hrn'] == "fibre" : + user_request['username'] = user_request['username'] + "@" + "" # to be defined + 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] + + user_request['user_hrn'] = split_authority + '.' + user_request['username'] + # 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.') 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) @@ -109,15 +132,17 @@ class RegistrationView (FreeAccessView, ThemeView): 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)) # 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' @@ -142,13 +167,14 @@ 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' + return render(wsgi_request, self.template, {'theme': self.theme}) else: