Merge branch 'master' of ssh://git.onelab.eu/git/myslice

diff --combined portal/registrationview.py
index 1f8ab8b,1e0c4f9..4c7c8f2
--- 1/portal/registrationview.py
--- 2/portal/registrationview.py
+++ b/portal/registrationview.py
@@@ -9,7 -9,7 +9,7 @@@ from django.shortcuts           import 
  from unfold.page                import Page
  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
@@@ -30,17 -30,10 +30,17 @@@ class RegistrationView (View)
          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-onelab').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'])
 +        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)
  
@@@ -68,16 -61,24 +68,24 @@@
              # 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')