X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=e89527e5b0d049f7e783be52c29b3483146d3e21;hb=4dfd873aec658a5f2a22983c7221f8b7006aa475;hp=30e0b9a416e8078760ba8965aee1e78fe38ad5a9;hpb=62fdfd5e3db042a3d7ed380d56542bbe62fc5e00;p=myslice.git diff --git a/portal/accountview.py b/portal/accountview.py index 30e0b9a4..e89527e5 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -1,6 +1,6 @@ -from portal.templateviews import LoginRequiredAutoLogoutView +from unfold.loginrequired import LoginRequiredAutoLogoutView # -from manifold.core.query import Query +from manifold.core.query import Query from manifold.manifoldapi import execute_query from portal.actions import manifold_update_user, manifold_update_account # @@ -93,6 +93,16 @@ class AccountView(LoginRequiredAutoLogoutView): def account_process(request): user_query = Query().get('local:user').select('password','config') user_details = execute_query(request, user_query) + + account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') + account_details = execute_query(request, account_query) + + platform_query = Query().get('local:platform').select('platform_id','platform') + platform_details = execute_query(request, platform_query) + + # for account_detail in account_details: + # if account_detail['platform_id'] == 5: + # account_config = json.loads(account_detail['config']) if 'submit_name' in request.POST: edited_first_name = request.POST['fname'] @@ -119,6 +129,7 @@ def account_process(request): # Redirect to same page with success message messages.success(request, 'Sucess: First Name and Last Name Updated.') return HttpResponseRedirect("/portal/account/") + elif 'submit_pass' in request.POST: edited_password = request.POST['password'] @@ -132,47 +143,108 @@ def account_process(request): return HttpResponseRedirect("/portal/account/") elif 'generate' in request.POST: - # 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 - # 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') -# keypair = ''.join(keypair.split()) - user_params = { 'config': keypair, 'auth_type':'managed'} - manifold_update_account(request,user_params) -# return HttpResponse('Success: New Keypair Generated!') - messages.success(request, 'Sucess: New Keypair Generated!') - return HttpResponseRedirect("/portal/account/") - + 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']: + # 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 + '"}' +# 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 + user_params = { 'config': keypair, 'auth_type':'managed'} + manifold_update_account(request,user_params) + messages.success(request, 'Sucess: New Keypair Generated!') + 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/") + 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 and re.search(r'ssh-rsa',file_content): - file_content = '{"user_public_key":"'+ file_content +'"}' - #file_content = re.sub("\r", "", file_content) - #file_content = re.sub("\n", "\\n",file_content) - file_content = ''.join(file_content.split()) - # update manifold account table - user_params = { 'config': file_content, 'auth_type':'user'} - manifold_update_account(request,user_params) -# return HttpResponse('Success: Publickey uploaded! Please delegate your credentials using SFA: http://trac.myslice.info/wiki/DelegatingCredentials') - messages.success(request, 'Publickey uploaded! Please delegate your credentials using SFA: http://trac.myslice.info/wiki/DelegatingCredentials') + 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']: + 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 and re.search(r'ssh-rsa',file_content): + file_content = '{"user_public_key":"'+ file_content +'"}' + #file_content = re.sub("\r", "", file_content) + #file_content = re.sub("\n", "\\n",file_content) + file_content = ''.join(file_content.split()) + #update manifold local:account table + user_params = { 'config': file_content, 'auth_type':'user'} + manifold_update_account(request,user_params) + messages.success(request, 'Publickey uploaded! Please delegate your credentials using SFA: http://trac.myslice.info/wiki/DelegatingCredentials') + return HttpResponseRedirect("/portal/account/") + else: + messages.error(request, 'RSA key error: Please upload a valid RSA public key [.txt or .pub].') + 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/") + elif 'dl_pubkey' 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']: + account_config = json.loads(account_detail['config']) + public_key = account_config['user_public_key'] + response = HttpResponse(public_key, content_type='text/plain') + response['Content-Disposition'] = 'attachment; filename="pubkey.txt"' + return response + break + else: + messages.error(request, 'Account error: You need an account in myslice platform to perform this action') + return HttpResponseRedirect("/portal/account/") + + elif 'dl_pkey' 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']: + account_config = json.loads(account_detail['config']) + if 'user_private_key' in account_config: + private_key = account_config['user_private_key'] + response = HttpResponse(private_key, content_type='text/plain') + response['Content-Disposition'] = 'attachment; filename="privkey.txt"' + return response + else: + messages.error(request, 'Download error: Private key is not stored in the server') + 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/") + + elif 'delete' 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']: + account_config = json.loads(account_detail['config']) + if 'user_private_key' in account_config: + pass + else: + messages.error(request, 'Delete error: Private key is not stored in the server') + return HttpResponseRedirect("/portal/account/") + else: -# return HttpResponse('Please upload a valid RSA public key [.txt or .pub].') - messages.error(request, 'RSA key error: Please upload a valid RSA public key [.txt or .pub].') + messages.error(request, 'Account error: You need an account in myslice platform to perform this action') return HttpResponseRedirect("/portal/account/") + else: messages.info(request, 'Under Construction. Please try again later!')