X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=2322081c4a12978e12f4025b3be473315b83d620;hb=491bd4d5497b5c431ab35716425f4c95fd2c3696;hp=e756c3fd3f237e11c054139b94bb1d42fbb1f353;hpb=91744ef8420e44ced5ca0f1238d670933e702bec;p=myslice.git

diff --git a/portal/registrationview.py b/portal/registrationview.py
index e756c3fd..2322081c 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -1,4 +1,5 @@
 import os.path, re
+import json
 
 from django.core.mail           import send_mail
 
@@ -7,9 +8,9 @@ from django.template.loader     import render_to_string
 from django.shortcuts           import render
 
 from unfold.page                import Page
-from myslice.viewutils          import topmenu_items
+from ui.topmenu                 import topmenu_items
 
-from manifold.manifoldapi       import execute_query
+from manifold.manifoldapi       import execute_admin_query
 from manifold.core.query        import Query
 
 from portal.models              import PendingUser
@@ -26,14 +27,20 @@ from portal.actions             import authority_get_pi_emails
 class RegistrationView (View):
 
     def dispatch (self, request):
-
         errors = []
 
         authorities_query = Query.get('authority').\
-            filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc']).\
             select('name', 'authority_hrn')
-        #authorities_query = Query.get('authority').select('authority_hrn')
-        authorities = execute_query(request, authorities_query)
+        
+        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:
+            print "ONELAB ENABLED"
+            authorities_query = authorities_query.filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple'])
+        else:
+            print "FIREXP ENABLED"
+
+        authorities = execute_admin_query(request, authorities_query)
         # xxx tocheck - if authorities is empty, it's no use anyway
         # (users won't be able to validate the form anyway)
 
@@ -47,11 +54,12 @@ class RegistrationView (View):
             # We shall use a form here
 
             #get_email = PendingUser.objects.get(email)
-            reg_fname = request.POST.get('firstname', '')
-            reg_lname = request.POST.get('lastname', '')
-            #reg_aff = request.POST.get('affiliation','')
-            reg_auth = request.POST.get('authority_hrn', '')
-            reg_email = request.POST.get('email','').lower()
+            reg_fname  = request.POST.get('firstname', '')
+            reg_lname  = request.POST.get('lastname', '')
+            #reg_aff   = request.POST.get('affiliation','')
+            reg_auth   = request.POST.get('authority_hrn', '')
+            reg_login  = request.POST.get('login', '')
+            reg_email  = request.POST.get('email','').lower()
       
             #POST value validation  
             if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None):
@@ -61,16 +69,24 @@ class RegistrationView (View):
             # XXX validate authority hrn !!
             if PendingUser.objects.filter(email__iexact=reg_email):
                 errors.append('Email already registered.Please provide a new email address.')
+
+# XXX TODO: Factorize with portal/accountview.py
             if 'generate' in request.POST['question']:
-                # Generate public and private keys using SFA Library
-                from sfa.trust.certificate  import Keypair
-                k = Keypair(create=True)
-                public_key = k.get_pubkey_string()
-                private_key = k.as_pem()
-                private_key = ''.join(private_key.split())
-                public_key = "ssh-rsa " + public_key
+                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'))
+
+#                # Generate public and private keys using SFA Library
+#                from sfa.trust.certificate  import Keypair
+#                k = Keypair(create=True)
+#                public_key = k.get_pubkey_string()
+#                private_key = k.as_pem()
+#                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 + '}'
                 #keypair = re.sub("\r", "", keypair)
                 #keypair = re.sub("\n", "\\n", keypair)
                 #keypair = keypair.rstrip('\r\n')
@@ -96,14 +112,15 @@ class RegistrationView (View):
             #b.save()
             if not errors:
                 b = PendingUser(
-                    first_name=reg_fname, 
-                    last_name=reg_lname, 
-                    #affiliation=reg_aff,
-                    authority_hrn=reg_auth,
-                    email=reg_email, 
-                    password=request.POST['password'],
-                    keypair=keypair
-                    )
+                    first_name    = reg_fname, 
+                    last_name     = reg_lname, 
+                    #affiliation  = reg_aff,
+                    authority_hrn = reg_auth,
+                    login         = reg_login,
+                    email         = reg_email, 
+                    password      = request.POST['password'],
+                    keypair       = keypair,
+                )
                 b.save()
 
                 # Send email
@@ -115,15 +132,13 @@ class RegistrationView (View):
                     'keypair'       : 'Public Key :' + public_key,
                     'cc_myself'     : True # form.cleaned_data['cc_myself']
                     }
-                #not working
-                #recipients = authority_get_pi_emails(request,reg_auth)
-                recipients = ['devel@myslice.info']
+
+                recipients = authority_get_pi_emails(request,reg_auth)
+
                 if ctx['cc_myself']:
                     recipients.append(ctx['email'])
 
                 msg = render_to_string('user_request_email.txt', ctx)
-                print "tesing msg"
-                print msg
                 send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients)
 
                 return render(request, 'user_register_complete.html')