X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=d4b68f40e10e8b8c8708f06f0032fefa9b250572;hb=a148aba915464d91abb7407b99131e11998e984c;hp=af0d03ea7dbd54617ec3b36b851cd36199145e6a;hpb=dbce5d7127dc354a18f9f3cd83299be36ffa2ffa;p=myslice.git

diff --git a/portal/accountview.py b/portal/accountview.py
index af0d03ea..d4b68f40 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -4,7 +4,7 @@ from manifold.core.query                import Query
 from manifold.manifoldapi               import execute_query
 from portal.actions                     import manifold_update_user, manifold_update_account
 #
-from myslice.viewutils                  import topmenu_items, the_user
+from ui.topmenu                         import topmenu_items, the_user
 #
 from django.http                        import HttpResponse, HttpResponseRedirect
 from django.contrib                     import messages
@@ -142,19 +142,26 @@ def account_process(request):
         messages.success(request, 'Sucess: Password Updated.')
         return HttpResponseRedirect("/portal/account/")
 
+# XXX TODO: Factorize with portal/registrationview.py
+
     elif 'generate' in request.POST:
         for account_detail in account_details:
             for platform_detail in platform_details:
                 if platform_detail['platform_id'] == account_detail['platform_id']:
                     if 'myslice' in platform_detail['platform']:
+                        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
-                        keypair = '{"user_public_key":"'+ public_key + '", "user_private_key":"'+ private_key + '"}'
+#                        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
+                        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')