Registration and Join Organization: Fixed private key of the user in Join and allowin...

diff --git a/portal/accountview.py b/portal/accountview.py
index c179a0e..fb9f642 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -348,6 +348,8 @@ def account_process(request):
         return HttpResponseRedirect("/portal/account/")
 
 # XXX TODO: Factorize with portal/registrationview.py
         return HttpResponseRedirect("/portal/account/")
 
 # XXX TODO: Factorize with portal/registrationview.py

+# XXX TODO: Factorize with portal/registrationview.py
+# XXX TODO: Factorize with portal/joinview.py

 
     elif 'generate' in request.POST:
         for account_detail in account_details:
 
     elif 'generate' in request.POST:
         for account_detail in account_details:

diff --git a/portal/joinview.py b/portal/joinview.py
index 8356dec..f9eed28 100644 (file)
--- a/portal/joinview.py
+++ b/portal/joinview.py
@@ -74,6 +74,8 @@ class JoinView (FreeAccessView, ThemeView):
             #prepare user_hrn 
             split_email = reg_email.split("@")[0] 
             split_email = split_email.replace(".", "_")
             #prepare user_hrn 
             split_email = reg_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_hrn = reg_auth + '.' + split_email
             
             UserModel = get_user_model()
             user_hrn = reg_auth + '.' + split_email
             
             UserModel = get_user_model()


@@ -108,18 +110,15 @@ class JoinView (FreeAccessView, ThemeView):
                     errors.append('Email already registered in Manifold. Please provide a new email address.')
 
 # XXX TODO: Factorize with portal/accountview.py
                     errors.append('Email already registered in Manifold. Please provide a new email address.')
 
 # XXX TODO: Factorize with portal/accountview.py

+# XXX TODO: Factorize with portal/registrationview.py
+# XXX TODO: Factorize with portal/joinview.py

 #            if 'generate' in request.POST['question']:
             from Crypto.PublicKey import RSA
             private = RSA.generate(1024)
 #            if 'generate' in request.POST['question']:
             from Crypto.PublicKey import RSA
             private = RSA.generate(1024)

-            private_key = json.dumps(private.exportKey())
-            public  = private.publickey()
-            public_key = json.dumps(public.exportKey(format='OpenSSH'))
-
+            private_key = private.exportKey()
+            public_key = private.publickey().exportKey(format='OpenSSH')

             # Saving to DB
             # Saving to DB

-            account_config = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}'

             auth_type = 'managed'
             auth_type = 'managed'

-            public_key = public_key.replace('"', '');
-            private_key = private_key.replace('"', '');

 
             if not errors:
                 reg_password = request.POST['pi_password']
 
             if not errors:
                 reg_password = request.POST['pi_password']

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 3e4a260..e0a1ddf 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -85,6 +85,7 @@ class RegistrationView (FreeAccessView, ThemeView):
             # Construct user_hrn from email (XXX Should use common code)
             split_email = user_request['email'].split("@")[0] 
             split_email = split_email.replace(".", "_")
             # 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
             split_email = split_email.replace("+", "_")
             user_request['user_hrn'] = user_request['authority_hrn'] \
                      + '.' + split_email


@@ -121,6 +122,8 @@ class RegistrationView (FreeAccessView, ThemeView):
                             + '.' + split_email + str(randint(1,1000000))
                 
             # XXX TODO: Factorize with portal/accountview.py
                             + '.' + 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'
 
             if 'generate' in wsgi_request.POST['question']:
                 user_request['auth_type'] = 'managed'
 

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 598aca3..95d2794 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -35,6 +35,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
         purpose=''
         exp_url=''
         authority_hrn = None
         purpose=''
         exp_url=''
         authority_hrn = None

+        authority_name = None

         # Retrieve the list of authorities
         authorities_query = Query.get('authority').select('name', 'authority_hrn')
         authorities = execute_admin_query(wsgi_request, authorities_query)
         # Retrieve the list of authorities
         authorities_query = Query.get('authority').select('name', 'authority_hrn')
         authorities = execute_admin_query(wsgi_request, authorities_query)


@@ -54,6 +55,9 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             if authority['authority_hrn'] == user_authority:
                 authority_name = authority['name']
 
             if authority['authority_hrn'] == user_authority:
                 authority_name = authority['name']
 

+        # Handle the case when we use only hrn and not name
+        if authority_name is None:
+            authority_name = user_authority

         #
         account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
         account_details = execute_query(wsgi_request, account_query)
         #
         account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
         account_details = execute_query(wsgi_request, account_query)


@@ -98,7 +102,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
                 if authority['name'] == wsgi_request.POST.get('org_name', ''):
                     authority_hrn = authority['authority_hrn']
 
                 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
+            # Handle the case when we use only hrn and not name

             if authority_hrn is None:
                 authority_hrn = wsgi_request.POST.get('org_name', '')
 
             if authority_hrn is None:
                 authority_hrn = wsgi_request.POST.get('org_name', '')