X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=20c2b05c26e4062df81c34d60482b094e05f8156;hb=3b78ac598a00cdd5c3e079381fa3e1d6466e54e8;hp=bb77ed07170ede5238e423cd5814f97b13f57c7f;hpb=091860329ef984b892d5c5a29836dff2201d876f;p=unfold.git diff --git a/portal/accountview.py b/portal/accountview.py index bb77ed07..20c2b05c 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -1,8 +1,8 @@ from unfold.loginrequired import LoginRequiredAutoLogoutView # from manifold.core.query import Query -from manifold.manifoldapi import execute_query -from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user +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 # from unfold.page import Page from ui.topmenu import topmenu_items_live, the_user @@ -10,13 +10,14 @@ from ui.topmenu import topmenu_items_live, the_user from django.http import HttpResponse, HttpResponseRedirect from django.contrib import messages from django.contrib.auth.decorators import login_required -from django.core.mail import send_mail + +from myslice.theme import ThemeView # import json, os, re, itertools # requires login -class AccountView(LoginRequiredAutoLogoutView): +class AccountView(LoginRequiredAutoLogoutView, ThemeView): template_name = "account-view.html" def dispatch(self, *args, **kwargs): return super(AccountView, self).dispatch(*args, **kwargs) @@ -29,12 +30,21 @@ class AccountView(LoginRequiredAutoLogoutView): page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) - user_query = Query().get('local:user').select('config','email') + user_query = Query().get('local:user').select('config','email','status') user_details = execute_query(self.request, user_query) # not always found in user_details... config={} for user_detail in user_details: + # different significations of user_status + if user_detail['status'] == 0: + user_status = 'Disabled' + elif user_detail['status'] == 1: + user_status = 'Validation Pending' + elif user_detail['status'] == 2: + user_status = 'Enabled' + else: + user_status = 'N/A' #email = user_detail['email'] if user_detail['config']: config = json.loads(user_detail['config']) @@ -56,6 +66,7 @@ class AccountView(LoginRequiredAutoLogoutView): my_auths = '' ref_acc_list = '' principal_acc_list = '' + user_status_list = [] platform_name_list = [] platform_name_secondary_list = [] platform_access_list = [] @@ -81,10 +92,11 @@ class AccountView(LoginRequiredAutoLogoutView): for account_detail in account_details: if platform_detail['platform_id'] == account_detail['platform_id']: platform_name = platform_detail['platform'] - account_config = json.loads(account_detail['config']) - account_usr_hrn = account_config.get('user_hrn','N/A') - account_pub_key = account_config.get('user_public_key','N/A') - account_reference = account_config.get ('reference_platform','N/A') + if 'config' in account_detail and account_detail['config'] is not '': + account_config = json.loads(account_detail['config']) + account_usr_hrn = account_config.get('user_hrn','N/A') + account_pub_key = account_config.get('user_public_key','N/A') + account_reference = account_config.get ('reference_platform','N/A') # credentials of myslice platform if 'myslice' in platform_detail['platform']: acc_user_cred = account_config.get('delegated_user_credential','N/A') @@ -149,9 +161,10 @@ class AccountView(LoginRequiredAutoLogoutView): delegation_type_list.append(delegation) usr_hrn_list.append(account_usr_hrn) pub_key_list.append(account_pub_key) + user_status_list.append(user_status) # combining 5 lists into 1 [to render in the template] - principal_acc_list = [{'platform_name': t[0], 'account_type': t[1], 'delegation_type': t[2], 'usr_hrn':t[3], 'usr_pubkey':t[4]} - for t in zip(platform_name_list, account_type_list, delegation_type_list, usr_hrn_list, pub_key_list)] + principal_acc_list = [{'platform_name': t[0], 'account_type': t[1], 'delegation_type': t[2], 'usr_hrn':t[3], 'usr_pubkey':t[4], 'user_status':t[5],} + for t in zip(platform_name_list, account_type_list, delegation_type_list, usr_hrn_list, pub_key_list, user_status_list)] # to hide private key row if it doesn't exist if 'myslice' in platform_detail['platform']: account_config = json.loads(account_detail['config']) @@ -174,6 +187,7 @@ class AccountView(LoginRequiredAutoLogoutView): context['my_users'] = my_users context['my_slices'] = my_slices context['my_auths'] = my_auths + context['user_status'] = user_status context['person'] = self.request.user context['firstname'] = config.get('firstname',"?") context['lastname'] = config.get('lastname',"?") @@ -188,6 +202,8 @@ class AccountView(LoginRequiredAutoLogoutView): context['topmenu_items'] = topmenu_items_live('My Account', page) # so we can sho who is logged context['username'] = the_user(self.request) + context['theme'] = self.theme + context['section'] = "User account" # context ['firstname'] = config['firstname'] prelude_env = page.prelude_env() context.update(prelude_env) @@ -224,7 +240,7 @@ def account_process(request): if 'delete_'+platform_detail['platform'] in request.POST: platform_id = platform_detail['platform_id'] user_params = {'user_id':user_id} - manifold_delete_account(request,platform_id,user_params) + manifold_delete_account(request,platform_id, user_id, user_params) messages.info(request, 'Reference Account is removed from the selected platform') return HttpResponseRedirect("/portal/account/") @@ -316,20 +332,33 @@ def account_process(request): private_key = json.dumps(private.exportKey()) public = private.publickey() public_key = json.dumps(public.exportKey(format='OpenSSH')) - # updating maniolf local:account table + # 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) + #updated_config = json.dumps(account_config) # updating manifold - user_params = { 'config': keypair, 'auth_type':'managed'} - manifold_update_account(request,user_params) + #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) sfa_update_user(request, user_hrn, user_pub_key) - messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.') + result_sfa_user = sfa_get_user(request, user_hrn, public_key) + try: + result_sfa_user = result_sfa_user[0] + 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.') return HttpResponseRedirect("/portal/account/") else: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') @@ -355,7 +384,10 @@ def account_process(request): 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) + 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: @@ -412,7 +444,7 @@ def account_process(request): updated_config = json.dumps(account_config) user_params = { 'config': updated_config, 'auth_type':'user'} - manifold_update_account(request,user_params) + 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/") @@ -423,6 +455,29 @@ def account_process(request): else: 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: + 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/") + + else: + messages.error(request, 'Account error: You need an account in myslice platform to perform this action') + return HttpResponseRedirect("/portal/account/") #clear all creds elif 'clear_cred' in request.POST: @@ -438,7 +493,7 @@ def account_process(request): user_priv_key = json.dumps(account_config.get('user_private_key','N/A')) updated_config = '{"user_public_key":'+ user_pub_key + ', "user_private_key":'+ user_priv_key + ', "user_hrn":"'+ user_hrn + '"}' user_params = { 'config': updated_config} - manifold_update_account(request,user_params) + manifold_update_account(request,user_id, user_params) messages.success(request, 'All Credentials cleared') return HttpResponseRedirect("/portal/account/") else: