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

[myslice.git] / portal / views.py

diff --git a/portal/views.py b/portal/views.py
index d55fc17..5b4399d 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -30,7 +30,7 @@ from django.shortcuts            import render
 
 from plugins.lists.simplelist    import SimpleList
 
-from plugins.pres_view           import PresView
+#from plugins.pres_view           import PresView
 from portal.event import Event
 import json
 
@@ -42,20 +42,22 @@ from manifold.core.query         import Query
 from unfold.page                 import Page
 from myslice.viewutils           import topmenu_items, the_user
 from django.http                 import HttpResponseRedirect, HttpResponse
+import os.path, re
 
 class DashboardView(TemplateView):
     template_name = "dashboard.html"
 
     def get_context_data(self, **kwargs):
-        user_hrn = 'ple.upmc.jordan_auge'
-        #user_hrn = 'iotlab.auge'
+        # We might have slices on different registries with different user accounts 
+        # We note that this portal could be specific to a given registry, to which we register users, but i'm not sure that simplifies things
+        # Different registries mean different identities, unless we identify via SFA HRN or have associated the user email to a single hrn
 
         #messages.info(self.request, 'You have logged in')
         page = Page(self.request)
 
         # Slow...
         #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
-        slice_query = Query().get('user').filter_by('user_hrn', '==', user_hrn).select('user_hrn', 'slice.slice_hrn')
+        slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
         auth_query  = Query().get('network').select('network_hrn')
         page.enqueue_query(slice_query)
         page.enqueue_query(auth_query)
@@ -472,6 +474,8 @@ def my_account(request):
 
 #my_acc form value processing
 def acc_process(request):
+    # getting the user_id from the session [now hardcoded]
+    get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email
     if 'submit_name' in request.POST:
         edited_first_name =  request.POST['fname']
         edited_last_name =  request.POST['lname']
@@ -489,7 +493,7 @@ def acc_process(request):
         
         # select and update [will be used throughout this view]
         # select the logged in user [for the moment hard coded]
-        get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email
+        #get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email
         # update first and last name
         get_user.first_name = edited_first_name
         get_user.last_name = edited_last_name
@@ -499,15 +503,60 @@ def acc_process(request):
     elif 'submit_pass' in request.POST:
         edited_password = request.POST['password']
         # select the logged in user [for the moment hard coded]
-        get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email
+        #get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email
         # update password
         get_user.password = edited_password
         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()
+        file_name = up_file.name
+        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 = re.sub("\r", "", file_content)
+            file_content = re.sub("\n", "\\n",file_content)
+            get_user.keypair = file_content
+            get_user.save()
+            return HttpResponse('Success: Publickey uploaded! Old records overwritten')
+        else:
+            return HttpResponse('Please upload a valid public key.')    
+        
     else:
         message = 'You submitted an empty form.'
         return HttpResponse(message)