X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=81935424b5c825c477e0603a8b76e148b4928ad2;hb=5b317ebfa26716bc4a4d0c761eb46a13c1d39353;hp=734485b808b073b999e911a40d54008806e980f1;hpb=b932fc56d413781f414819c67ade7e69b707d1fb;p=unfold.git diff --git a/portal/accountview.py b/portal/accountview.py index 734485b8..81935424 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -5,7 +5,7 @@ from sfa.trust.certificate import Keypair # 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 +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 unfold.page import Page from ui.topmenu import topmenu_items_live, the_user @@ -16,8 +16,9 @@ from django.contrib.auth.decorators import login_required from myslice.theme import ThemeView +from portal.account import Account, get_expiration # -import json, os, re, itertools +import json, os, re, itertools, time from OpenSSL import crypto from Crypto.PublicKey import RSA @@ -31,9 +32,15 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView): def get_context_data(self, **kwargs): self.template_name = self.template page = Page(self.request) + metadata = page.get_metadata() + page.expose_js_metadata() + page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/my_account.edit_profile.js","js/jquery-ui.js" ] ) page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) + # Execute a Query to delegate credentials if necessary + sfa_user_query = Query().get('myslice:user').select('user_hrn').filter_by('user_hrn','==','$user_hrn') + sfa_user_result = execute_query(self.request, sfa_user_query) user_query = Query().get('local:user').select('config','email','status') user_details = execute_query(self.request, user_query) @@ -187,29 +194,40 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView): ## check user is pi or not - platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled') - account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') - platform_details = execute_query(self.request, platform_query) - account_details = execute_query(self.request, account_query) - for platform_detail in platform_details: - for account_detail in account_details: - if platform_detail['platform_id'] == account_detail['platform_id']: - if 'config' in account_detail and account_detail['config'] is not '': - account_config = json.loads(account_detail['config']) - if 'myslice' in platform_detail['platform']: - acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') + # platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled') + # account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') + # platform_details = execute_query(self.request, platform_query) + # account_details = execute_query(self.request, account_query) + # for platform_detail in platform_details: + # for account_detail in account_details: + # if platform_detail['platform_id'] == account_detail['platform_id']: + # if 'config' in account_detail and account_detail['config'] is not '': + # account_config = json.loads(account_detail['config']) + # if 'myslice' in platform_detail['platform']: + # acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') # assigning values if acc_auth_cred == {} or acc_auth_cred == 'N/A': pi = "is_not_pi" else: pi = "is_pi" + # check if the user has creds or not + if acc_user_cred == {} or acc_user_cred == 'N/A': + user_cred = 'no_creds' + else: + exp_date = get_expiration(acc_user_cred, 'timestamp') + if exp_date < time.time(): + user_cred = 'creds_expired' + else: + user_cred = 'has_creds' + context = super(AccountView, self).get_context_data(**kwargs) context['principal_acc'] = principal_acc_list context['ref_acc'] = ref_acc_list context['platform_list'] = platform_list context['my_users'] = my_users context['pi'] = pi + context['user_cred'] = user_cred context['my_slices'] = my_slices context['my_auths'] = my_auths context['user_status'] = user_status @@ -247,9 +265,19 @@ def account_process(request): platform_query = Query().get('local:platform').select('platform_id','platform') platform_details = execute_query(request, platform_query) - # getting the user_id from the session - for user_detail in user_details: - user_id = user_detail['user_id'] + # getting the user_id from the session + for user_detail in user_details: + user_id = user_detail['user_id'] + user_email = user_detail['email'] + try: + if user_email == request.user.email: + authorize_query = True + else: + print "SECURITY: %s tried to update %s" % (user_email, request.user.email) + messages.error(request, 'You are not authorized to modify another user.') + return HttpResponseRedirect("/portal/account/") + except Exception,e: + print "Exception = %s" % e for account_detail in account_details: for platform_detail in platform_details: @@ -346,6 +374,8 @@ def account_process(request): return HttpResponseRedirect("/portal/account/") # XXX TODO: Factorize with portal/registrationview.py +# XXX TODO: Factorize with portal/registrationview.py +# XXX TODO: Factorize with portal/joinview.py elif 'generate' in request.POST: for account_detail in account_details: @@ -368,7 +398,7 @@ def account_process(request): # 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) result_sfa_user = sfa_get_user(request, user_hrn, public_key) try: @@ -383,6 +413,7 @@ def account_process(request): 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: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') @@ -505,28 +536,16 @@ def account_process(request): #clear all creds elif 'clear_cred' 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']) - 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 = 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_id, user_params) - messages.success(request, 'All Credentials cleared') - return HttpResponseRedirect("/portal/account/") - else: - messages.error(request, 'Delete error: Credentials are not stored in the server') - return HttpResponseRedirect("/portal/account/") - else: + try: + result = clear_user_creds(request, user_email) + if result is not None: + messages.success(request, 'All Credentials cleared') + else: + messages.error(request, 'Delete error: Credentials are not stored in the server') + except Exception,e: + print "Exception in accountview.py in clear_user_creds %s" % e messages.error(request, 'Account error: You need an account in myslice platform to perform this action') - return HttpResponseRedirect("/portal/account/") - + return HttpResponseRedirect("/portal/account/") # Download delegated_user_cred elif 'dl_user_cred' in request.POST: