From 0bf98d7dbb4eeb8314ba315db529a83247bcc6ec Mon Sep 17 00:00:00 2001 From: Yasin Date: Fri, 13 Dec 2013 18:19:25 +0100 Subject: [PATCH] All credentials visible --- portal/accountview.py | 20 ++++++- portal/templates/account-view.html | 90 +++++++++++++++++++----------- 2 files changed, 76 insertions(+), 34 deletions(-) diff --git a/portal/accountview.py b/portal/accountview.py index 14a4435a..429b2d88 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -56,7 +56,9 @@ class AccountView(LoginRequiredAutoLogoutView): delegation_type_list = [] exp_user_cred_list = [] slice_list = [] + auth_list = [] slice_cred_exp_list = [] + auth_cred_exp_list = [] usr_hrn_list = [] pub_key_list = [] @@ -72,8 +74,10 @@ 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_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_slice_cred: for key, value in acc_slice_cred.iteritems(): slice_list.append(key) @@ -86,6 +90,19 @@ class AccountView(LoginRequiredAutoLogoutView): 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) + + my_auths = [{'auth_name': t[0], 'cred_exp': t[1]} + for t in zip(auth_list, auth_cred_exp_list)] + + account_user_credential = account_config.get('delegated_user_credential','N/A') # Expiration date result = re.search('(.*)', account_user_credential) @@ -139,6 +156,7 @@ class AccountView(LoginRequiredAutoLogoutView): context['ref_acc'] = secondary_list context['platform_list'] = platform_list context['my_slices'] = my_slices + context['my_auths'] = my_auths context['person'] = self.request.user context['firstname'] = config.get('firstname',"?") context['lastname'] = config.get('lastname',"?") diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html index 30116df5..78e6b7f2 100644 --- a/portal/templates/account-view.html +++ b/portal/templates/account-view.html @@ -132,7 +132,7 @@

Account Information

-

Principal Accounts

+

Principal Account

@@ -140,7 +140,6 @@ - @@ -149,7 +148,6 @@ - @@ -158,7 +156,59 @@ -

Secondary Accounts

+ +

Credentials

+
+
+
Platform Account Type Account_delegationCredential Expiration user_hrn
{{ row.platform_name }} {{ row.account_type }} {{ row.delegation_type }} {{ row.credential_expiration }} {{ row.usr_hrn }}
+ + + + + {% for row in data %} + + + + {%endfor%} +
Delegated User Credential
Expiration Date
{{ row.credential_expiration }}
+

+ + + + + + + {% for row in my_slices %} + + + + + {%endfor%} +
Delegated Slice Credentials
Slice NameExpiration Date
{{ row.slice_name }} {{ row.cred_exp }}
+

+ + + + + + + {% for row in my_auths %} + + + + + {%endfor%} +
Delegated Authority Credentials
Authority NameExpiration Date
{{ row.auth_name }} {{ row.cred_exp }}
+

+

+

+
+
+ + + + +

Testbed Accounts

@@ -171,14 +221,14 @@ - + {%endfor%}
{{ row.platform_name }} {{ row.account_type }} {{ row.account_reference }} {{ row.account_reference }}
-

Other Platforms

+

Add Accounts

@@ -190,7 +240,7 @@ {%endfor%} @@ -198,32 +248,6 @@ - - - -

Slice Information

-
-
-
{{ platform.platform_no_access }} - +
- - - - - {% for row in my_slices %} - - - - - {%endfor%} -
Slice nameCredential Expiration
{{ row.slice_name }} {{ row.cred_exp }}
-
-
- - - - - - {% endblock %} -- 2.45.2