X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Faccountview.py;h=4091a6c69379cdd0376455f2d78196c58c72b025;hp=9c730b5b1c7d4fd61a0bad0534c3de193981b189;hb=e6301ba331d8b6ea6c5f2674b13f26603fa1826f;hpb=1cdee7d22da25e8f91f122c3a33876bb37b62a14
diff --git a/portal/accountview.py b/portal/accountview.py
index 9c730b5b..4091a6c6 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -2,9 +2,10 @@ 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
+from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user
#
-from ui.topmenu import topmenu_items, the_user
+from unfold.page import Page
+from ui.topmenu import topmenu_items_live, the_user
#
from django.http import HttpResponse, HttpResponseRedirect
from django.contrib import messages
@@ -17,19 +18,32 @@ import json, os, re, itertools
# requires login
class AccountView(LoginRequiredAutoLogoutView):
template_name = "account-view.html"
-
def dispatch(self, *args, **kwargs):
return super(AccountView, self).dispatch(*args, **kwargs)
def get_context_data(self, **kwargs):
- user_query = Query().get('local:user').select('config','email')
+ page = Page(self.request)
+ page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/my_account.edit_profile.js" ] )
+ page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] )
+
+
+ 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'])
@@ -51,6 +65,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 = []
@@ -69,7 +84,7 @@ class AccountView(LoginRequiredAutoLogoutView):
pub_key_list = []
for platform_detail in platform_details:
- if 'sfa' in platform_detail['gateway_type'] and platform_detail['disabled']==0:
+ if 'sfa' in platform_detail['gateway_type']:
total_platform = platform_detail['platform']
total_platform_list.append(total_platform)
@@ -80,44 +95,45 @@ class AccountView(LoginRequiredAutoLogoutView):
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
- 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')
+ # credentials of myslice 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)
+ 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)]
+ 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)
+ 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)]
+ 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)
+ 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)
- my_auths = [{'auth_name': t[0], 'cred_exp': t[1]}
- for t in zip(auth_list, auth_cred_exp_list)]
+ my_auths = [{'auth_name': t[0], 'cred_exp': t[1]}
+ for t in zip(auth_list, auth_cred_exp_list)]
# for reference accounts
@@ -143,9 +159,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'])
@@ -168,6 +185,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',"?")
@@ -179,11 +197,12 @@ class AccountView(LoginRequiredAutoLogoutView):
# more general variables expected in the template
context['title'] = 'Platforms connected to MySlice'
# the menu items on the top
- context['topmenu_items'] = topmenu_items('My Account', self.request)
+ context['topmenu_items'] = topmenu_items_live('My Account', page)
# so we can sho who is logged
context['username'] = the_user(self.request)
# context ['firstname'] = config['firstname']
- #context.update(page.prelude_env())
+ prelude_env = page.prelude_env()
+ context.update(prelude_env)
return context
@@ -205,11 +224,29 @@ def account_process(request):
for account_detail in account_details:
for platform_detail in platform_details:
+ # Add reference account to the platforms
+ if 'add_'+platform_detail['platform'] in request.POST:
+ platform_id = platform_detail['platform_id']
+ user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'}
+ manifold_add_account(request,user_params)
+ messages.info(request, 'Reference Account is added to the selected platform successfully!')
+ return HttpResponseRedirect("/portal/account/")
+
+ # Delete reference account from the platforms
+ 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_id, user_params)
+ messages.info(request, 'Reference Account is removed from the selected platform')
+ return HttpResponseRedirect("/portal/account/")
+
if platform_detail['platform_id'] == account_detail['platform_id']:
if 'myslice' in platform_detail['platform']:
account_config = json.loads(account_detail['config'])
acc_slice_cred = account_config.get('delegated_slice_credentials','N/A')
acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
+
+
# adding the slices and corresponding credentials to list
@@ -219,7 +256,7 @@ def account_process(request):
for key, value in acc_slice_cred.iteritems():
slice_list.append(key)
slice_cred.append(value)
- # special case: download each slice credentials separately -- too complicated
+ # special case: download each slice credentials separately
for i in range(0, len(slice_list)):
if 'dl_'+slice_list[i] in request.POST:
slice_detail = "Slice name: " + slice_list[i] +"\nSlice Credentials: \n"+ slice_cred[i]
@@ -234,7 +271,7 @@ def account_process(request):
for key, value in acc_auth_cred.iteritems():
auth_list.append(key)
auth_cred.append(value)
- # special case: download each slice credentials separately -- too complicated
+ # special case: download each slice credentials separately
for i in range(0, len(auth_list)):
if 'dl_'+auth_list[i] in request.POST:
auth_detail = "Authority: " + auth_list[i] +"\nAuthority Credentials: \n"+ auth_cred[i]
@@ -261,7 +298,7 @@ def account_process(request):
user_config['config']= '{"firstname":"' + edited_first_name + '", "lastname":"'+ edited_last_name + '", "authority": "Unknown Authority"}'
user_params = {'config': user_config['config']}
# updating config local:user in manifold
- manifold_update_user(request,user_params)
+ manifold_update_user(request, request.user.email,user_params)
# this will be depricated, we will show the success msg in same page
# Redirect to same page with success message
messages.success(request, 'Sucess: First Name and Last Name Updated.')
@@ -274,7 +311,7 @@ def account_process(request):
user_pass['password'] = edited_password
#updating password in local:user
user_params = { 'password': user_pass['password']}
- manifold_update_user(request,user_params)
+ manifold_update_user(request,request.user.email,user_params)
# return HttpResponse('Success: Password Changed!!')
messages.success(request, 'Sucess: Password Updated.')
return HttpResponseRedirect("/portal/account/")
@@ -291,16 +328,20 @@ 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)
-
+ # updating manifold
user_params = { 'config': keypair, 'auth_type':'managed'}
- manifold_update_account(request,user_params)
- messages.success(request, 'Sucess: New Keypair Generated!')
+ 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)
+ messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.')
return HttpResponseRedirect("/portal/account/")
else:
messages.error(request, 'Account error: You need an account in myslice platform to perform this action')
@@ -326,7 +367,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:
@@ -383,8 +427,9 @@ 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/")
else:
messages.error(request, 'Delete error: Private key is not stored in the server')
@@ -404,12 +449,11 @@ def account_process(request):
user_cred = account_config.get('delegated_user_credential','N/A')
if 'N/A' not in user_cred:
user_hrn = account_config.get('user_hrn','N/A')
- user_pub_key = account_config.get('user_public_key','N/A')
- user_priv_key = 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 + '"}'
- updated_config = ''.join(updated_config.split())
+ user_pub_key = json.dumps(account_config.get('user_public_key','N/A'))
+ 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:
@@ -431,102 +475,6 @@ def account_process(request):
messages.error(request, 'Download error: User credential is not stored in the server')
return HttpResponseRedirect("/portal/account/")
- # add reference platforms
- elif 'add_fuseco' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "fuseco":
- platform_id = platform_detail['platform_id']
-
- user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'}
- manifold_add_account(request,user_params)
-
- messages.info(request, 'Reference Account added on Fuseco platform. You have now access to Fuseco resources.')
- return HttpResponseRedirect("/portal/account/")
-
- elif 'add_ple' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "ple":
- platform_id = platform_detail['platform_id']
- user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'}
- manifold_add_account(request,user_params)
- messages.info(request, 'Reference Account added on PLE platform. You have now access to PLE resources.')
- return HttpResponseRedirect("/portal/account/")
-
- elif 'add_omf' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "omf":
- platform_id = platform_detail['platform_id']
- user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'}
- manifold_add_account(request,user_params)
- messages.info(request, 'Reference Account added on OMF:Nitos platform. You have now access to OMF:Nitos resources.')
- return HttpResponseRedirect("/portal/account/")
-
- elif 'add_wilab' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "wilab":
- platform_id = platform_detail['platform_id']
- user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'}
- manifold_add_account(request,user_params)
- messages.info(request, 'Reference Account added on Wilab platform. You have now access to Wilab resources.')
- return HttpResponseRedirect("/portal/account/")
-
- elif 'iotlab' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "iotlab":
- platform_id = platform_detail['platform_id']
- user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'}
- manifold_add_account(request,user_params)
- messages.info(request, 'Reference Account added on IOTLab platform. You have now access to IOTLab resources.')
- return HttpResponseRedirect("/portal/account/")
-
- # delete reference platforms
- elif 'delete_fuseco' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "fuseco":
- platform_id = platform_detail['platform_id']
- user_params = {'user_id':user_id}
- manifold_delete_account(request,platform_id,user_params)
- messages.info(request, 'Reference Account is removed from Fuseco platform. You have no access to Fuseco resources anymore.')
- return HttpResponseRedirect("/portal/account/")
-
- elif 'delete_ple' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "ple":
- platform_id = platform_detail['platform_id']
- user_params = {'user_id':user_id}
- manifold_delete_account(request,platform_id,user_params)
- messages.info(request, 'Reference Account is removed from PLE platform. You have no access to PLE resources anymore.')
- return HttpResponseRedirect("/portal/account/")
-
- elif 'delete_omf' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "omf":
- platform_id = platform_detail['platform_id']
- user_params = {'user_id':user_id}
- manifold_delete_account(request,platform_id,user_params)
- messages.info(request, 'Reference Account is removed from OMF:Nitos platform. You have no access to OMF:Nitos resources anymore.')
- return HttpResponseRedirect("/portal/account/")
-
- elif 'delete_wilab' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "wilab":
- platform_id = platform_detail['platform_id']
- user_params = {'user_id':user_id}
- manifold_delete_account(request,platform_id,user_params)
- query = Query.delete('local:account').filter_by('platform_id','==',platform_id)
- results = execute_query(request,query)
- messages.info(request, 'Reference Account is removed from Wilab platform. You have no access to Wilab resources anymore.')
- return HttpResponseRedirect("/portal/account/")
-
- elif 'delete_iotlab' in request.POST:
- for platform_detail in platform_details:
- if platform_detail['platform'] == "iotlab":
- platform_id = platform_detail['platform_id']
- user_params = {'user_id':user_id}
- manifold_delete_account(request,platform_id,user_params)
- messages.info(request, 'Reference Account is removed from IOTLab platform. You have no access to IOTLab resources anymore.')
- return HttpResponseRedirect("/portal/account/")
-
else:
messages.info(request, 'Under Construction. Please try again later!')
return HttpResponseRedirect("/portal/account/")