X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=199c1730d12b3bd417ef99df7cfdb39497c2accc;hb=d0e00619b8fe042a1b225fc78a57098ae78b2f4d;hp=c133a57698f5ed89834206439afe64d99a37ab50;hpb=ce50fd212455344e184297c3eb448268608559fe;p=myslice.git diff --git a/portal/registrationview.py b/portal/registrationview.py index c133a576..199c1730 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -1,13 +1,13 @@ import os.path, re import json -from random import randint +from random import randint +from hashlib import md5 -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 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 @@ -17,9 +17,11 @@ 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 +# Edelberto - LDAP +from portal.actions import create_pending_user, ldap_create_user -from theme import ThemeView +from myslice.theme import ThemeView # since we inherit from FreeAccessView we cannot redefine 'dispatch' # so let's override 'get' and 'post' instead @@ -38,56 +40,90 @@ class RegistrationView (FreeAccessView, ThemeView): """ errors = [] - authorities_query = Query.get('authority').select('name', 'authority_hrn') + 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) - - # 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" ] ) + 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" ] ) 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 + #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 not authority_hrn: + 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', ''), - '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 } # Construct user_hrn from email (XXX Should use common code) - split_email = reg_email.split("@")[0] + split_email = user_request['email'].split("@")[0] split_email = split_email.replace(".", "_") user_request['user_hrn'] = user_request['authority_hrn'] \ - + '.' + split_email + str(randint(1,1000000)) + + '.' + 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.') + 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.') + # 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.') - + # 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)) + # XXX TODO: Factorize with portal/accountview.py if 'generate' in wsgi_request.POST['question']: user_request['auth_type'] = 'managed' @@ -99,7 +135,7 @@ class RegistrationView (FreeAccessView, ThemeView): # 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.public_key().exportKey(format='OpenSSH') + user_request['public_key'] = private.publickey().exportKey(format='OpenSSH') else: user_request['auth_type'] = 'user' @@ -113,18 +149,40 @@ 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: + ''' + 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}) - - # Backlashed \n => \\n but no surrounding " " - public_key_formatted = request['public_key'].replace('"', ''); + else: + 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', ''), + } template_env = { 'topmenu_items': topmenu_items_live('Register', page), @@ -133,5 +191,6 @@ class RegistrationView (FreeAccessView, ThemeView): 'theme': self.theme } template_env.update(user_request) + template_env.update(reg_form) template_env.update(page.prelude_env ()) return render(wsgi_request, self.template,template_env)