X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Faccountview.py;h=67c765d92c0fff63a5da9e63df1d3ad9bc5cc69d;hb=d77bd6393a4d5a910996e5d0502375b00679ea24;hp=f366555d829b446a1ddb9ba0bfd211b5282b51b5;hpb=bbc146e5dcbd1a5285b7465cd3e7f2c23a6dc9c8;p=unfold.git diff --git a/portal/accountview.py b/portal/accountview.py index f366555d..67c765d9 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) @@ -91,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') @@ -200,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) @@ -236,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/") @@ -328,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} + public_key = public_key.replace('"', ''); + user_pub_key = {'keys': public_key} #sfa_update_user(request, user_hrn, user_pub_key) - messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.') + sfa_update_user(request, user_hrn, user_pub_key) + 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') @@ -367,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: @@ -424,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/") @@ -450,7 +470,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: