X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=76d712da2441f64e8104d08a25a095b9f75ff55a;hb=refs%2Fheads%2Fonelab;hp=e55e30fd25b3d033845ee9e602bfdef6ff910515;hpb=3b39e97b04f9333fd58978120f00c1b4ffffbc41;p=myslice.git
diff --git a/portal/registrationview.py b/portal/registrationview.py
index e55e30fd..76d712da 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -1,4 +1,5 @@
-import os.path, re
+import os.path
+import re
import json
from random import randint
from hashlib import md5
@@ -8,7 +9,6 @@ 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
@@ -18,9 +18,10 @@ 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
+from portal.actions import create_pending_user, getAuthorities
from myslice.theme import ThemeView
+from myslice.settings import logger
import activity.user
@@ -40,39 +41,41 @@ 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)
+
+ authorities = getAuthorities(wsgi_request, admin = True)
+
+ #authority_hrn = None
+ ## REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ #authorities_query = Query.get('authority').select('name', 'authority_hrn')
+ #authorities = execute_admin_query(wsgi_request, authorities_query)
+ #if authorities is not None:
+ # # Remove the root authority from the list
+ # matching = [s for s in authorities if "." in s['authority_hrn']]
+ # authorities = sorted(matching, key=lambda k: k['authority_hrn'])
+ # authorities = sorted(matching, key=lambda k: k['name'])
- print "############ BREAKPOINT 1 #################"
+ logger.debug("############ 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 #################"
+
+ page.add_css_files ( [ "https://code.jquery.com/ui/1.11.2/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","js/jquery-ui-combobox.js" ] )
+
+ page.add_css_files ( [ "css/onelab.css", "css/registration.css", "css/jquery.qtip.min.css", "css/jquery.ui.combobox.css" ] )
+ page.expose_js_metadata()
+ logger.debug("############ 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']
+ if wsgi_request.is_secure():
+ current_site = 'https://'
+ else:
+ current_site = 'http://'
+ current_site += wsgi_request.META['HTTP_HOST']
- # 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 #################"
-
+ logger.debug("############ BREAKPOINT 3 #################")
post_email = wsgi_request.POST.get('email','').lower()
salt = randint(1,100000)
email_hash = md5(str(salt)+post_email).hexdigest()
@@ -80,105 +83,112 @@ class RegistrationView (FreeAccessView, ThemeView):
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,
+ 'authority_hrn' : wsgi_request.POST.get('org_name', ''),
'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
+ 'validation_link': 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.')
- if (re.search(r'^[\w+\s.@+-]+$', user_request['last_name']) == None):
- 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. 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 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'
-
- # XXX Common code, dependency ?
- from Crypto.PublicKey import RSA
- private = RSA.generate(1024)
-
- # 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:
- 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_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'] can't be Null because all db fields are set as NOT NULL
- user_request['private_key'] = ""
- user_request['public_key'] = file_content
+
+ logger.debug("############ BREAKPOINT 4 #################")
+ auth = wsgi_request.POST.get('org_name', None)
+ if auth is None or auth == "":
+ errors.append('Organization required: please select one or request its addition')
+ else:
+
+ logger.debug("############ 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
- 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})
+ # 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.')
+ # 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. 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
+
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ user_query = Query().get('myslice: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 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 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'
+
+ # XXX Common code, dependency ?
+ from Crypto.PublicKey import RSA
+ private = RSA.generate(1024)
+
+ # 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:
+ 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_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'] 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 #################"
+ logger.debug("############ BREAKPOINT A #################")
user_request = {}
## this is coming from onelab website onelab.eu
reg_form = {
@@ -188,10 +198,10 @@ class RegistrationView (FreeAccessView, ThemeView):
}
# log user activity
activity.user.signup(self.request)
- print "############ BREAKPOINT B #################"
+ logger.debug("############ BREAKPOINT B #################")
template_env = {
- 'topmenu_items': topmenu_items_live('Register', page),
+ #'topmenu_items': topmenu_items_live('Register', page),
'errors': errors,
'authorities': authorities,
'theme': self.theme
@@ -199,5 +209,5 @@ class RegistrationView (FreeAccessView, ThemeView):
template_env.update(user_request)
template_env.update(reg_form)
template_env.update(page.prelude_env ())
- print "############ BREAKPOINT C #################"
+ logger.debug("############ BREAKPOINT C #################")
return render(wsgi_request, self.template,template_env)