X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=f0e7a4a63ad93a3d8b2dc26daa9516bebf4844d2;hb=5c3c3f2147e6adc9178fe82c80596772ce6f7240;hp=4292ca3020e2422c22c1952e283e8b5e87d4790d;hpb=abe96fbd1c668728d5827f82b80449c8e505c4a8;p=myslice.git diff --git a/portal/accountview.py b/portal/accountview.py index 4292ca30..f0e7a4a6 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 @@ -60,12 +60,15 @@ class AccountView(LoginRequiredAutoLogoutView): account_type_list.append(account_type) usr_hrn_list.append(account_usr_hrn) pub_key_list.append(account_pub_key) + + # to hide private key row if it doesn't exist + if 'myslice' in platform_detail['platform']: + account_config = json.loads(account_detail['config']) + account_priv_key = account_config.get('user_private_key','N/A') # combining 4 lists into 1 [to render in the template] lst = [{'platform_name': t[0], 'account_type': t[1], 'usr_hrn':t[2], 'usr_pubkey':t[3]} for t in zip(platform_name_list, account_type_list, usr_hrn_list, pub_key_list)] - #print "test" - #print lst context = super(AccountView, self).get_context_data(**kwargs) context['data'] = lst @@ -74,7 +77,7 @@ class AccountView(LoginRequiredAutoLogoutView): context ['lastname'] = config.get('lastname',"?") context ['fullname'] = context['firstname'] +' '+ context['lastname'] context ['authority'] = config.get('authority',"Unknown Authority") - #context['users'] = userlist.render(self.request) + context['user_private_key'] = account_priv_key # XXX This is repeated in all pages # more general variables expected in the template @@ -142,24 +145,39 @@ 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 + # now we overwrite the config field with keypair + # once there will be user_hrn, we need to keep user_hrn and change only the keypair + # see submit_name section for implementing this # keypair = re.sub("\r", "", keypair) # keypair = re.sub("\n", "\\n", keypair) # #keypair = keypair.rstrip('\r\n') # keypair = ''.join(keypair.split()) # updating maniolf local:account table + account_config = json.loads(account_detail['config']) + # preserving user_hrn + user_hrn = account_config.get('user_hrn','N/A') + keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}' + updated_config = json.dumps(account_config) + user_params = { 'config': keypair, 'auth_type':'managed'} manifold_update_account(request,user_params) messages.success(request, 'Sucess: New Keypair Generated!') @@ -179,7 +197,10 @@ def account_process(request): file_extension = os.path.splitext(file_name)[1] allowed_extension = ['.pub','.txt'] if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content): - file_content = '{"user_public_key":"'+ file_content +'"}' + account_config = json.loads(account_detail['config']) + # preserving user_hrn + user_hrn = account_config.get('user_hrn','N/A') + file_content = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}' #file_content = re.sub("\r", "", file_content) #file_content = re.sub("\n", "\\n",file_content) file_content = ''.join(file_content.split()) @@ -236,14 +257,22 @@ def account_process(request): if 'myslice' in platform_detail['platform']: account_config = json.loads(account_detail['config']) if 'user_private_key' in account_config: - pass + for key in account_config.keys(): + if key== 'user_private_key': + del account_config[key] + + updated_config = json.dumps(account_config) + user_params = { 'config': updated_config, 'auth_type':'user'} + manifold_update_account(request,user_params) + messages.success(request, 'Private Key deleted. You need to delegate credentials manually once it expires.') + return HttpResponseRedirect("/portal/account/") else: messages.error(request, 'Delete error: Private key is not stored in the server') return HttpResponseRedirect("/portal/account/") - - #messages.success(request, 'delete key en cours') - #return HttpResponseRedirect("/portal/account/") + else: + messages.error(request, 'Account error: You need an account in myslice platform to perform this action') + return HttpResponseRedirect("/portal/account/") else: