X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=23703d8cc64202699766ba54d1e8ba8d0d2eef5d;hb=90cfd378e8bec3397b3c0c9171d8e7cac7589700;hp=2d8d7925fd3e9919c173c2a837a1be276e320a2b;hpb=6f45ad7f4ba699c250a8b2e3cb6c9f1686552ed6;p=myslice.git

diff --git a/portal/views.py b/portal/views.py
index 2d8d7925..23703d8c 100644
--- a/portal/views.py
+++ b/portal/views.py
@@ -488,7 +488,7 @@ def acc_process(request):
         #approach borrowed from register view     
         #new_user = PendingUser.objects.create_inactive_user(edited_first_name, edited_last_name, email,  password, site) 
         #conventional approach
-        #b = PendingUser(first_name=edited_first_name, edited_last_name=last_name)
+        #b = PendingUser(first_name=edited_first_name, last_name=edited_last_name)
         #b.save()
         
         # select and update [will be used throughout this view]
@@ -509,9 +509,38 @@ def acc_process(request):
         get_user.save()
         return HttpResponse('Success: Password Changed!!')
     elif 'generate' in request.POST:
-        a =2
-        message = 'Here will generate ssh-rsa keys :D %d' %a
-        return HttpResponse(message)
+        import os
+        from M2Crypto import Rand, RSA, BIO
+
+        KEY_LENGTH = 2048
+
+        def blank_callback():
+            "Replace the default dashes"
+            return
+
+        # Random seed
+        Rand.rand_seed (os.urandom (KEY_LENGTH))
+        # Generate key pair
+        key = RSA.gen_key (KEY_LENGTH, 65537, blank_callback)
+        # Create memory buffers
+        pri_mem = BIO.MemoryBuffer()
+        pub_mem = BIO.MemoryBuffer()
+        # Save keys to buffers
+        key.save_key_bio(pri_mem, None)
+        key.save_pub_key_bio(pub_mem)
+
+        # Get keys 
+        public_key = pub_mem.getvalue()
+        private_key = pri_mem.getvalue()
+        # Saving to DB
+        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')
+        get_user.keypair = keypair
+        get_user.save()
+        return HttpResponse('Success: New Keypair Generated! %s' % keypair)
+
     elif 'upload_key' in request.POST:
         up_file = request.FILES['pubkey']
         file_content =  up_file.read()
@@ -519,7 +548,7 @@ def acc_process(request):
         file_extension = os.path.splitext(file_name)[1] 
         allowed_extension =  ['.pub','.txt']
         if file_extension in allowed_extension:
-            file_content = '{user_public_key:'+ file_content +'}'
+            file_content = '{"user_public_key":"'+ file_content +'"}'
             file_content = re.sub("\r", "", file_content)
             file_content = re.sub("\n", "\\n",file_content)
             get_user.keypair = file_content
@@ -532,7 +561,14 @@ def acc_process(request):
         message = 'You submitted an empty form.'
         return HttpResponse(message)
 
+def register_4m_f4f(request):
+    return render(request, 'register_4m_f4f.html')
 
+def reg_4m_f4f_process(request):
+    if 'submit' in request.POST:
+        return HttpResponse('Registration Successful. Please wait for account validation')
+        
+    
 
 # view for contact form
 def contact(request):