X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=fbe3ed6f99a7c731a62f09124601989ce797a66f;hb=b4969d314fe2004575a14b79dd337b6a5cc3fc5b;hp=6d33d0ef797e6d2bbe481aadd3b1c3db36e47b82;hpb=92620bf17c60377b7d156a6edf2c6a3077dd2745;p=myslice.git
diff --git a/portal/homeview.py b/portal/homeview.py
index 6d33d0ef..fbe3ed6f 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -21,7 +21,9 @@ from myslice.theme import ThemeView
from portal.account import Account, get_expiration
from portal.models import PendingSlice
-from portal.actions import authority_check_pis
+from portal.actions import authority_check_pis, get_jfed_identity, get_myslice_account
+
+from myslice.settings import logger
import activity.user
@@ -57,187 +59,157 @@ class HomeView (FreeAccessView, ThemeView):
# let's use ManifoldResult.__repr__
env['state']="%s"%manifoldresult
- return render_to_response(self.template,env, context_instance=RequestContext(request))
# user was authenticated at the backend
elif auth_result is not None:
user=auth_result
- if user.is_active:
+ if user is not None and user.is_active:
login(request, user)
if request.user.is_authenticated():
- env['person'] = self.request.user
- env['username'] = self.request.user
-
- # log user activity
- activity.user.login(self.request)
-
- ## check user is pi or not
- platform_details = {}
- account_details = {}
- acc_auth_cred = {}
- acc_user_cred = {}
- 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)
- if platform_details is not None and platform_details != {}:
- 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')
- acc_user_cred = account_config.get('delegated_user_credential','N/A')
- # assigning values
- #if acc_auth_cred=={} or acc_auth_cred=='N/A':
- # pi = "is_not_pi"
- #else:
- # pi = "is_pi"
- user_email = str(self.request.user)
- pi = authority_check_pis(self.request, user_email)
-
- # 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'
+ try:
+ env['person'] = self.request.user
+ env['username'] = self.request.user
+
+ # log user activity
+ activity.user.login(self.request)
+
+ ## check user is pi or not
+ acc_auth_cred = {}
+ acc_user_cred = {}
+
+ account_detail = get_myslice_account(self.request)
+ if 'config' in account_detail and account_detail['config'] is not '':
+ account_config = json.loads(account_detail['config'])
+ acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
+ acc_user_cred = account_config.get('delegated_user_credential','N/A')
+ # assigning values
+ #if acc_auth_cred=={} or acc_auth_cred=='N/A':
+ # pi = "is_not_pi"
+ #else:
+ # pi = "is_pi"
+ user_email = str(self.request.user)
+ #pi = authority_check_pis(self.request, user_email)
+
+ # check if the user has creds or not
+ if acc_user_cred == {} or acc_user_cred == 'N/A':
+ user_cred = 'no_creds'
else:
- user_cred = 'has_creds'
-
- # list the pending slices of this user
- pending_slices = []
- for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all():
- pending_slices.append(slices.slice_name)
-
- env['pending_slices'] = pending_slices
- env['pi'] = pi
- env['user_cred'] = user_cred
+ exp_date = get_expiration(acc_user_cred, 'timestamp')
+ if exp_date < time.time():
+ user_cred = 'creds_expired'
+ else:
+ user_cred = 'has_creds'
+
+ # list the pending slices of this user
+ pending_slices = []
+ for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all():
+ pending_slices.append(slices.slice_name)
+
+ env['pending_slices'] = pending_slices
+ #env['pi'] = pi
+ env['user_cred'] = user_cred
+ except Exception as e:
+ print e
+ env['person'] = None
+ env['state'] = "Your session has expired"
else:
env['person'] = None
- return render_to_response(self.template,env, context_instance=RequestContext(request))
else:
# log user activity
activity.user.login(self.request, "notactive")
env['state'] = "Your account is not active, please contact the site admin."
env['layout_1_or_2']="layout-unfold2.html"
- return render_to_response(self.template,env, context_instance=RequestContext(request))
+ jfed_identity = get_jfed_identity(request)
+ if jfed_identity is not None:
+ import base64
+ encoded_jfed_identity = base64.b64encode(jfed_identity)
+ env['jfed_identity'] = encoded_jfed_identity
+ else:
+ env['jfed_identity'] = None
+
# otherwise
else:
# log user activity
activity.user.login(self.request, "error")
env['state'] = "Your username and/or password were incorrect."
- return render_to_response(self.template, env, context_instance=RequestContext(request))
+ env['next'] = request.POST.get('next',None)
+ env['request'] = request
+ if env['next']:
+ return HttpResponseRedirect(env['next'])
+ return render_to_response(self.template,env, context_instance=RequestContext(request))
def get (self, request, state=None):
env = self.default_env()
acc_auth_cred={}
- if request.user.is_authenticated():
-
- ## check user is pi or not
- platform_details = {}
- account_details = {}
- acc_auth_cred = {}
- acc_user_cred = {}
- 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')
- # XXX Something like an invalid session seems to make the execute fail sometimes, and thus gives an error on the main page
- platform_details = execute_query(self.request, platform_query)
- account_details = execute_query(self.request, account_query)
- if platform_details is not None and platform_details != {}:
- for platform_detail in platform_details:
- for account_detail in account_details:
- if 'platform_id' in platform_detail:
- 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')
- acc_user_cred = account_config.get('delegated_user_credential','N/A')
- # assigning values
- #if acc_auth_cred=={} or acc_auth_cred=='N/A':
- # pi = "is_not_pi"
- #else:
- # pi = "is_pi"
- user_email = str(self.request.user)
- pi = authority_check_pis(self.request, user_email)
- # 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'
+
+ try:
+ if request.user.is_authenticated():
+ jfed_identity = get_jfed_identity(request)
+ if jfed_identity is not None:
+ import base64
+ encoded_jfed_identity = base64.b64encode(jfed_identity)
+ env['jfed_identity'] = encoded_jfed_identity
+ else:
+ env['jfed_identity'] = None
+
+ ## check user is pi or not
+ platform_details = {}
+ account_details = {}
+ acc_auth_cred = {}
+ acc_user_cred = {}
+ 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')
+ # XXX Something like an invalid session seems to make the execute fail sometimes, and thus gives an error on the main page
+
+ account_detail = get_myslice_account(self.request)
+ if 'config' in account_detail and account_detail['config'] is not '':
+ account_config = json.loads(account_detail['config'])
+ acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
+ acc_user_cred = account_config.get('delegated_user_credential','N/A')
+ # assigning values
+ #if acc_auth_cred=={} or acc_auth_cred=='N/A':
+ # pi = "is_not_pi"
+ #else:
+ # pi = "is_pi"
+ user_email = str(self.request.user)
+ #pi = authority_check_pis(self.request, user_email)
+ # check if the user has creds or not
+ if acc_user_cred == {} or acc_user_cred == 'N/A':
+ user_cred = 'no_creds'
else:
- user_cred = 'has_creds'
+ exp_date = get_expiration(acc_user_cred, 'timestamp')
+ if exp_date < time.time():
+ user_cred = 'creds_expired'
+ else:
+ user_cred = 'has_creds'
- # list the pending slices of this user
- pending_slices = []
- for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all():
- pending_slices.append(slices.slice_name)
+ # list the pending slices of this user
+ pending_slices = []
+ for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all():
+ pending_slices.append(slices.slice_name)
- env['pending_slices'] = pending_slices
- env['pi'] = pi
- env['user_cred'] = user_cred
- env['person'] = self.request.user
- else:
+ env['pending_slices'] = pending_slices
+ #env['pi'] = pi
+ env['user_cred'] = user_cred
+ env['person'] = self.request.user
+ else:
+ env['person'] = None
+ except Exception as e:
+ print e
env['person'] = None
+ env['state'] = "Your session has expired"
env['theme'] = self.theme
env['section'] = "Dashboard"
-
-
+ logger.debug("homeview called")
+ env['next'] = request.GET.get('next',None)
env['username']=the_user(request)
env['topmenu_items'] = topmenu_items(None, request)
+ env['request'] = request
if state: env['state'] = state
elif not env['username']: env['state'] = None
# use one or two columns for the layout - not logged in users will see the login prompt
-
-# account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config')
-# account_details = execute_query(self.request, account_query)
-# for account_detail in account_details:
-# account_config = json.loads(account_detail['config'])
-# platform_name = platform_detail['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)
-#
-# 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)
-#
-# 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)
-
-
return render_to_response(self.template, env, context_instance=RequestContext(request))