From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 6 Aug 2013 15:36:39 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~75
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=05861f44a20edf11bacba3d0d6fad3dee9ad7957;hp=-c;p=myslice.git

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

05861f44a20edf11bacba3d0d6fad3dee9ad7957
diff --combined portal/views.py
index 2aa68405,2d8d7925..5b4399db
--- a/portal/views.py
+++ b/portal/views.py
@@@ -30,7 -30,7 +30,7 @@@ from django.shortcuts            impor
  
  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
  
@@@ -48,15 -48,16 +48,16 @@@ 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)
@@@ -508,38 -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()
@@@ -547,7 -519,7 +548,7 @@@
          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