From: Loic Baron Date: Mon, 13 Apr 2015 16:17:23 +0000 (+0200) Subject: Account: download keys and jfed identity based on functions in actions.py X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=690cbb6c4847ded7833a0c5f05c4e767522ff0e5 Account: download keys and jfed identity based on functions in actions.py --- diff --git a/portal/accountview.py b/portal/accountview.py index dfda1826..cea49ee1 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -3,7 +3,7 @@ from unfold.loginrequired import LoginRequiredAutoLogoutView # from manifold.core.query import Query from manifoldapi.manifoldapi import execute_query -from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user, sfa_get_user, clear_user_creds +from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user, sfa_get_user, clear_user_creds, get_myslice_account, get_myslice_platform, get_registry_url, get_jfed_identity # from unfold.page import Page from ui.topmenu import topmenu_items_live, the_user @@ -252,22 +252,6 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView): return context @login_required -def get_myslice_platform(request): - platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled','config').filter_by('platform','==','myslice') - platform_details = execute_query(request, platform_query) - for platform_detail in platform_details: - return platform_detail - -@login_required -def get_myslice_account(request): - platform_myslice = get_myslice_platform(request) - account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config').filter_by('platform_id','==',platform_myslice['platform_id']) - account_details = execute_query(request, account_query) - for account_detail in account_details: - return account_detail - -@login_required -#my_acc form value processing def account_process(request): from sfa.trust.credential import Credential from sfa.trust.certificate import Keypair @@ -352,7 +336,7 @@ def account_process(request): response['Content-Disposition'] = 'attachment; filename="auth_credential.txt"' return response - + account_detail = get_myslice_account(request) if 'submit_name' in request.POST: edited_first_name = request.POST['fname'] @@ -394,158 +378,136 @@ def account_process(request): # XXX TODO: Factorize with portal/joinview.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']: - private = RSA.generate(1024) - private_key = json.dumps(private.exportKey()) - public = private.publickey() - public_key = json.dumps(public.exportKey(format='OpenSSH')) - # updating manifold 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) - # updating manifold - #user_params = { 'config': keypair, 'auth_type':'managed'} - #manifold_update_account(request, user_id, user_params) - # updating sfa - public_key = public_key.replace('"', ''); - user_pub_key = {'keys': public_key} - - sfa_update_user(request, user_hrn, user_pub_key) - result_sfa_user = sfa_get_user(request, user_hrn, public_key) - try: - if 'keys' in result_sfa_user and result_sfa_user['keys'][0] == public_key: - # updating manifold - updated_config = json.dumps(account_config) - user_params = { 'config': keypair, 'auth_type':'managed'} - manifold_update_account(request, user_id, user_params) - messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.') - else: - raise Exception,"Keys are not matching" - except Exception, e: - messages.error(request, 'Error: An error occured during the update of your public key at the Registry, or your public key is not matching the one stored.') - print "Exception in accountview ", e - return HttpResponseRedirect("/portal/account/") - else: + try: + private = RSA.generate(1024) + private_key = json.dumps(private.exportKey()) + public = private.publickey() + public_key = json.dumps(public.exportKey(format='OpenSSH')) + # updating manifold 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) + # updating manifold + #user_params = { 'config': keypair, 'auth_type':'managed'} + #manifold_update_account(request, user_id, user_params) + # updating sfa + public_key = public_key.replace('"', ''); + user_pub_key = {'keys': public_key} + + sfa_update_user(request, user_hrn, user_pub_key) + result_sfa_user = sfa_get_user(request, user_hrn, public_key) + try: + if 'keys' in result_sfa_user and result_sfa_user['keys'][0] == public_key: + # updating manifold + updated_config = json.dumps(account_config) + user_params = { 'config': keypair, 'auth_type':'managed'} + manifold_update_account(request, user_id, user_params) + messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.') + else: + raise Exception,"Keys are not matching" + except Exception as e: + messages.error(request, 'Error: An error occured during the update of your public key at the Registry, or your public key is not matching the one stored.') + logger.error("Exception in accountview {}".format(e)) + return HttpResponseRedirect("/portal/account/") + except Exception as e: 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: - 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): - 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()) - #update manifold local:account table - user_params = { 'config': file_content, 'auth_type':'user'} - manifold_update_account(request, user_id, user_params) - # updating sfa - user_pub_key = {'keys': file_content} - sfa_update_user(request, user_hrn, user_pub_key) - 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: + try: + 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): + 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()) + #update manifold local:account table + user_params = { 'config': file_content, 'auth_type':'user'} + manifold_update_account(request, user_id, user_params) + # updating sfa + user_pub_key = {'keys': file_content} + sfa_update_user(request, user_hrn, user_pub_key) + 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/") + + except Exception as e: 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 or request.POST['button_value'] == 'dl_pubkey': - 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: + try: + 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 + except Exception as e: 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 or request.POST['button_value'] == 'dl_pkey': - 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/") + try: + 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: + except Exception as e: 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 or request.POST['button_value'] == 'delete': - 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: - 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_id, user_params) - messages.success(request, 'Private Key deleted. You need to delegate credentials manually once it expires.') - messages.success(request, 'Once your credentials expire, Please delegate manually using SFA: http://trac.myslice.info/wiki/DelegatingCredentials') - return HttpResponseRedirect("/portal/account/") - else: - messages.error(request, 'Delete error: Private key is not stored in the server') - return HttpResponseRedirect("/portal/account/") + try: + account_config = json.loads(account_detail['config']) + if 'user_private_key' in account_config: + 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_id, user_params) + messages.success(request, 'Private Key deleted. You need to delegate credentials manually once it expires.') + messages.success(request, 'Once your credentials expire, Please delegate manually using SFA: http://trac.myslice.info/wiki/DelegatingCredentials') + return HttpResponseRedirect("/portal/account/") + else: + messages.error(request, 'Delete error: Private key is not stored in the server') + return HttpResponseRedirect("/portal/account/") - else: + except Exception as e: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') return HttpResponseRedirect("/portal/account/") # download identity for jfed elif 'dl_identity' in request.POST or request.POST['button_value'] == 'dl_identity': - 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'] - user_hrn = account_config.get('user_hrn','N/A') - registry = 'http://sfa-fed4fire.pl.sophia.inria.fr:12345/' - jfed_identity = user_hrn + '\n' + registry + '\n' + private_key - response = HttpResponse(jfed_identity, content_type='text/plain') - response['Content-Disposition'] = 'attachment; filename="jfed_identity.txt"' - return response - else: - messages.error(request, 'Download error: Private key is not stored in the server') - return HttpResponseRedirect("/portal/account/") + try: + jfed_identity = get_jfed_identity(request) + if jfed_identity is not None: + response = HttpResponse(jfed_identity, content_type='text/plain') + response['Content-Disposition'] = 'attachment; filename="jfed_identity.txt"' + return response + else: + messages.error(request, 'Download error: Private key is not stored in the server') + return HttpResponseRedirect("/portal/account/") - else: + except Exception as e: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') return HttpResponseRedirect("/portal/account/") @@ -559,13 +521,10 @@ def account_process(request): user_hrn = account_config.get('user_hrn','N/A') t_user_hrn = user_hrn.split('.') authority_hrn = t_user_hrn[0] + '.' + t_user_hrn[1] + registry = get_registry_url(request) import socket hostname = socket.gethostbyaddr(socket.gethostname())[0] - registry = platform_config.get('registry','N/A') admin_user = platform_config.get('user','N/A') - if 'localhost' in registry: - port = registry.split(':')[-1:][0] - registry = "http://" + hostname +':'+ port manifold_host = ConfigEngine().manifold_url() if 'localhost' in manifold_host: manifold_host = manifold_host.replace('localhost',hostname) diff --git a/portal/actions.py b/portal/actions.py index 6d657ed8..0fb0ff64 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -25,6 +25,51 @@ import activity.slice # XXX tmp sfa dependency, should be moved to SFA gateway #from sfa.util.xrn import Xrn +def get_myslice_platform(request): + platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled','config').filter_by('platform','==','myslice') + platform_details = execute_query(request, platform_query) + for platform_detail in platform_details: + return platform_detail + +def get_myslice_account(request): + platform_myslice = get_myslice_platform(request) + account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config').filter_by('platform_id','==',platform_myslice['platform_id']) + account_details = execute_query(request, account_query) + for account_detail in account_details: + return account_detail + +def get_registry_url(request): + try: + platform_detail = get_myslice_platform(request) + platform_config = json.loads(platform_detail['config']) + import socket + hostname = socket.gethostbyaddr(socket.gethostname())[0] + registry = platform_config.get('registry','N/A') + if 'localhost' in registry: + port = registry.split(':')[-1:][0] + registry = "http://" + hostname +':'+ port + return registry + except Exception as e: + print e + return None + +def get_jfed_identity(request): + try: + account_detail = get_myslice_account(request) + account_config = json.loads(account_detail['config']) + if 'user_private_key' in account_config: + private_key = account_config['user_private_key'] + user_hrn = account_config.get('user_hrn','N/A') + platform_detail = get_myslice_platform(request) + #registry = get_registry_url(request) + registry = 'http://sfa-fed4fire.pl.sophia.inria.fr:12345/' + jfed_identity = user_hrn + '\n' + registry + '\n' + private_key + return jfed_identity + else: + return None + except Exception as e: + print e + return None # Get the list of pis in a given authority def authority_get_pis(request, authority_hrn): diff --git a/portal/homeview.py b/portal/homeview.py index a261bc36..6e0fba88 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -19,7 +19,7 @@ from myslice.configengine import ConfigEngine from myslice.theme import ThemeView from portal.account import Account, get_expiration from portal.models import PendingSlice -from portal.actions import authority_check_pis +from portal.actions import authority_check_pis, get_jfed_identity import json, time import activity.user @@ -56,7 +56,6 @@ class HomeView (FreeAccessView, ThemeView): # let's use ManifoldResult.__repr__ env['state']="%s"%manifoldresult - return render_to_response(self.template,env, context_instance=RequestContext(request)) # user was authenticated at the backend elif auth_result is not None: user=auth_result @@ -116,25 +115,40 @@ class HomeView (FreeAccessView, ThemeView): env['user_cred'] = user_cred else: env['person'] = None - return render_to_response(self.template,env, context_instance=RequestContext(request)) else: # log user activity activity.user.login(self.request, "notactive") env['state'] = "Your account is not active, please contact the site admin." env['layout_1_or_2']="layout-unfold2.html" - return render_to_response(self.template,env, context_instance=RequestContext(request)) + jfed_identity = get_jfed_identity(request) + if jfed_identity is not None: + import base64 + encoded_jfed_identity = base64.b64encode(jfed_identity) + env['jfed_identity'] = encoded_jfed_identity + else: + env['jfed_identity'] = None + # otherwise else: # log user activity activity.user.login(self.request, "error") env['state'] = "Your username and/or password were incorrect." - return render_to_response(self.template, env, context_instance=RequestContext(request)) + return render_to_response(self.template,env, context_instance=RequestContext(request)) def get (self, request, state=None): env = self.default_env() acc_auth_cred={} + + jfed_identity = get_jfed_identity(request) + if jfed_identity is not None: + import base64 + encoded_jfed_identity = base64.b64encode(jfed_identity) + env['jfed_identity'] = encoded_jfed_identity + else: + env['jfed_identity'] = None + if request.user.is_authenticated(): ## check user is pi or not @@ -195,48 +209,5 @@ class HomeView (FreeAccessView, ThemeView): if state: env['state'] = state elif not env['username']: env['state'] = None # use one or two columns for the layout - not logged in users will see the login prompt - -# account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') -# account_details = execute_query(self.request, account_query) -# for account_detail in account_details: -# account_config = json.loads(account_detail['config']) -# platform_name = platform_detail['platform'] -# if 'myslice' in platform_detail['platform']: -# acc_user_cred = account_config.get('delegated_user_credential','N/A') -# acc_slice_cred = account_config.get('delegated_slice_credentials','N/A') -# acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') -# -# if 'N/A' not in acc_user_cred: -# exp_date = re.search('(.*)', acc_user_cred) -# if exp_date: -# user_exp_date = exp_date.group(1) -# user_cred_exp_list.append(user_exp_date) -# -# my_users = [{'cred_exp': t[0]} -# for t in zip(user_cred_exp_list)] -# -# -# if 'N/A' not in acc_slice_cred: -# for key, value in acc_slice_cred.iteritems(): -# slice_list.append(key) -# # get cred_exp date -# exp_date = re.search('(.*)', value) -# if exp_date: -# exp_date = exp_date.group(1) -# slice_cred_exp_list.append(exp_date) -# -# my_slices = [{'slice_name': t[0], 'cred_exp': t[1]} -# for t in zip(slice_list, slice_cred_exp_list)] -# -# if 'N/A' not in acc_auth_cred: -# for key, value in acc_auth_cred.iteritems(): -# auth_list.append(key) -# #get cred_exp date -# exp_date = re.search('(.*)', value) -# if exp_date: -# exp_date = exp_date.group(1) -# auth_cred_exp_list.append(exp_date) - - return render_to_response(self.template, env, context_instance=RequestContext(request)) diff --git a/portal/projectrequestview.py b/portal/projectrequestview.py index 451469de..75054dcd 100644 --- a/portal/projectrequestview.py +++ b/portal/projectrequestview.py @@ -107,8 +107,8 @@ class ProjectRequestView(LoginRequiredAutoLogoutView, ThemeView): 'purpose' : wsgi_request.POST.get('purpose', ''), } - if (post['authority_hrn'] is None or post['authority_hrn'] == ''): - errors.append('Organization is mandatory') + #if (post['authority_hrn'] is None or post['authority_hrn'] == ''): + # errors.append('Organization is mandatory') if (post['purpose'] is None or post['purpose'] == ''): errors.append('Project purpose is mandatory') diff --git a/portal/templates/base.html b/portal/templates/base.html index 82fa444f..aed282c1 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -1,6 +1,7 @@ {% load portal_filters %} {# This is required by insert_above #}{% insert_handler %} - + + {{theme}} portal - {{ section }} diff --git a/portal/templates/fed4fire/fed4fire_user_request_validated_subject.txt b/portal/templates/fed4fire/fed4fire_user_request_validated_subject.txt new file mode 100644 index 00000000..4c2582bd --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_user_request_validated_subject.txt @@ -0,0 +1 @@ +Fed4FIRE portal: Account validated diff --git a/portal/templates/user_request_validated_subject.txt b/portal/templates/user_request_validated_subject.txt new file mode 100644 index 00000000..da9ce741 --- /dev/null +++ b/portal/templates/user_request_validated_subject.txt @@ -0,0 +1 @@ +Account validated