X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=8f91de79cbbc5bf0a3c4eb1d2944635bd025da2b;hb=7ad1e085bc705fddbf06357582afd42d03f4e5da;hp=e27dfb4d8ca6bd065cbd59bcf188c2d5457494cb;hpb=9d9c9d79c1bb1b54d1c402a7f4c0b895e294e5ef;p=myslice.git diff --git a/portal/registrationview.py b/portal/registrationview.py index e27dfb4d..8f91de79 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -15,7 +15,7 @@ from manifold.manifoldapi import execute_admin_query from manifold.core.query import Query from portal.models import PendingUser -from portal.actions import authority_get_pi_emails +from portal.actions import authority_get_pi_emails, manifold_add_user,manifold_add_account # since we inherit from FreeAccessView we cannot redefine 'dispatch' # so let's override 'get' and 'post' instead @@ -31,15 +31,16 @@ class RegistrationView (FreeAccessView): def get_or_post (self, request, method): errors = [] - #authorities_query = Query.get('authority').\ - # select('name', 'authority_hrn') + # Using cache manifold-tables to get the list of authorities faster + authorities_query = Query.get('authority').select('name', 'authority_hrn') #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False') #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) #if onelab_enabled: if True: print "ONELAB ENABLED" - authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos']) + #authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos']) + # Now using Cache else: print "FIREXP ENABLED" @@ -53,6 +54,9 @@ class RegistrationView (FreeAccessView): print 'registration view, method',method + user_query = Query().get('local:user').select('user_id','email') + user_details = execute_admin_query(self.request, user_query) + if method == 'POST': # We shall use a form here @@ -63,7 +67,11 @@ class RegistrationView (FreeAccessView): reg_auth = request.POST.get('authority_hrn', '') reg_login = request.POST.get('login', '') reg_email = request.POST.get('email','').lower() - + #prepare user_hrn + split_email = reg_email.split("@")[0] + split_email = split_email.replace(".", "_") + user_hrn = reg_auth + '.' + split_email + #POST value validation if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None): errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') @@ -71,7 +79,10 @@ class RegistrationView (FreeAccessView): errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') # XXX validate authority hrn !! if PendingUser.objects.filter(email__iexact=reg_email): - errors.append('Email already registered.Please provide a new email address.') + errors.append('Email is pending for validation. Please provide a new email address.') + for user_detail in user_details: + if user_detail['email']==reg_email: + errors.append('Email already exists in Manifold. Please provide a new email address.') # XXX TODO: Factorize with portal/accountview.py if 'generate' in request.POST['question']: @@ -89,7 +100,8 @@ class RegistrationView (FreeAccessView): # private_key = ''.join(private_key.split()) # public_key = "ssh-rsa " + public_key # Saving to DB - keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + '}' + keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}' + auth_type = 'managed' #keypair = re.sub("\r", "", keypair) #keypair = re.sub("\n", "\\n", keypair) #keypair = keypair.rstrip('\r\n') @@ -101,10 +113,11 @@ class RegistrationView (FreeAccessView): file_extension = os.path.splitext(file_name)[1] allowed_extension = ['.pub','.txt'] if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content): - keypair = '{"user_public_key":"'+ file_content +'"}' + keypair = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}' keypair = re.sub("\r", "", keypair) keypair = re.sub("\n", "\\n",keypair) keypair = ''.join(keypair.split()) + auth_type = 'user' # for sending email public_key = file_content else: @@ -113,6 +126,7 @@ class RegistrationView (FreeAccessView): #b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff, # email=reg_email, password=request.POST['password'], keypair=keypair) #b.save() + #saving to django db 'portal_pendinguser' table if not errors: b = PendingUser( first_name = reg_fname, @@ -125,17 +139,25 @@ class RegistrationView (FreeAccessView): keypair = keypair, ) b.save() - + #creating user to manifold local:user + config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}' + user_params = {'email': reg_email, 'password': request.POST['password'], 'config': config} + manifold_add_user(request,user_params) + #creating local:account in manifold + user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user + user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair} + manifold_add_account(request,user_params) + # Send email ctx = { 'first_name' : reg_fname, 'last_name' : reg_lname, 'authority_hrn' : reg_auth, - 'email' : reg_email, + 'email' : reg_email, + 'user_hrn' : user_hrn, 'keypair' : 'Public Key :' + public_key, 'cc_myself' : True # form.cleaned_data['cc_myself'] } - recipients = authority_get_pi_emails(request,reg_auth) if ctx['cc_myself']: @@ -143,8 +165,7 @@ class RegistrationView (FreeAccessView): msg = render_to_string('user_request_email.txt', ctx) send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients) - - return render(request, 'user_register_complete.html') + return render(request, 'user_register_complete.html') template_env = { 'topmenu_items': topmenu_items('Register', request),