X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fvalidationview.py;h=b87a250fd8d612a454b32bc5d7be58ce0d1798d7;hb=refs%2Fheads%2Ff4f-review;hp=b3d2a3701afdfba881631a9aeda4374cc3a57165;hpb=ecf7dd5d099c5b94952b6795b748380e2284bc14;p=myslice.git diff --git a/portal/validationview.py b/portal/validationview.py index b3d2a370..b87a250f 100644 --- a/portal/validationview.py +++ b/portal/validationview.py @@ -28,7 +28,7 @@ from django.http import HttpResponseRedirect, HttpResponse from django.shortcuts import render from django.template.loader import render_to_string -from unfold.loginrequired import FreeAccessView +from unfold.loginrequired import LoginRequiredAutoLogoutView from ui.topmenu import topmenu_items_live, the_user from portal.event import Event @@ -40,15 +40,17 @@ from plugins.raw import Raw #from portal.util import RegistrationView, ActivationView from portal.models import PendingUser, PendingSlice -from portal.actions import get_request_by_authority -from manifold.manifoldapi import execute_query +from portal.actions import get_requests +from manifoldapi.manifoldapi import execute_query from manifold.core.query import Query from unfold.page import Page +from myslice.theme import ThemeView -class ValidatePendingView(FreeAccessView): +class ValidatePendingView(LoginRequiredAutoLogoutView, ThemeView): template_name = "validate_pending.html" def get_context_data(self, **kwargs): + pi = "" # We might have slices on different registries with different user accounts # We note that this portal could be specific to a given registry, to which we register users, but i'm not sure that simplifies things # Different registries mean different identities, unless we identify via SFA HRN or have associated the user email to a single hrn @@ -59,6 +61,7 @@ class ValidatePendingView(FreeAccessView): ctx_my_authorities = {} ctx_delegation_authorities = {} ctx_sub_authorities = {} + dest = {} # The user need to be logged in @@ -142,29 +145,35 @@ class ValidatePendingView(FreeAccessView): print 'credential_authorities =', credential_authorities print 'credential_authorities_expired =', credential_authorities_expired - # Using cache manifold-tables to get the list of authorities faster - all_authorities_query = Query.get('authority').select('name', 'authority_hrn') - all_authorities = execute_query(self.request, all_authorities_query) +# # Using cache manifold-tables to get the list of authorities faster +# all_authorities_query = Query.get('authority').select('name', 'authority_hrn') +# all_authorities = execute_query(self.request, all_authorities_query) # ** Where am I a PI ** # For this we need to ask SFA (of all authorities) = PI function - pi_authorities_query = Query.get('user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities') + pi_authorities_query = Query.get('myslice:user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities') pi_authorities_tmp = execute_query(self.request, pi_authorities_query) pi_authorities = set() - for pa in pi_authorities_tmp: - pi_authorities |= set(pa['pi_authorities']) - - #print "all_auths = " - #print all_authorities - - # include all sub-authorities of the PI - # if PI on ple, include all sub-auths ple.upmc, ple.inria and so on... - pi_subauthorities = set() - for authority in all_authorities: - authority_hrn = authority['authority_hrn'] - for my_authority in pi_authorities: - if authority_hrn.startswith(my_authority) and authority_hrn not in pi_subauthorities: - pi_subauthorities.add(authority_hrn) + try: + for pa in pi_authorities_tmp: + pi_authorities |= set(pa['pi_authorities']) + except: + print 'No pi_authorities' +# TODO: exception if no parent_authority +# try: +# for pa in pi_authorities_tmp: +# pi_authorities |= set(pa['pi_authorities']) +# except: + + +# # include all sub-authorities of the PI +# # if PI on ple, include all sub-auths ple.upmc, ple.inria and so on... +# pi_subauthorities = set() +# for authority in all_authorities: +# authority_hrn = authority['authority_hrn'] +# for my_authority in pi_authorities: +# if authority_hrn.startswith(my_authority) and authority_hrn not in pi_subauthorities: +# pi_subauthorities.add(authority_hrn) #print "pi_authorities =", pi_authorities #print "pi_subauthorities =", pi_subauthorities @@ -193,50 +202,66 @@ class ValidatePendingView(FreeAccessView): #print "pi_subauthorities = ", pi_subauthorities # Summary all - queried_pending_authorities = pi_my_authorities | pi_delegation_authorities | pi_subauthorities + queried_pending_authorities = pi_my_authorities | pi_delegation_authorities #| pi_subauthorities #print "----" #print "queried_pending_authorities = ", queried_pending_authorities - requests = get_request_by_authority(queried_pending_authorities) +# iterate on the requests and check if the authority matches a prefix startswith an authority on which the user is PI + requests = get_requests() +# requests = get_requests(queried_pending_authorities) for request in requests: auth_hrn = request['authority_hrn'] - #print "authority for this request", auth_hrn - - if auth_hrn in pi_my_authorities: - dest = ctx_my_authorities - - # define the css class - if auth_hrn in pi_credential_authorities: + for my_auth in pi_my_authorities: + if auth_hrn.startswith(my_auth): + dest = ctx_my_authorities request['allowed'] = 'allowed' - elif auth_hrn in pi_expired_credential_authorities: - request['allowed'] = 'expired' - else: # pi_no_credential_authorities - request['allowed'] = 'denied' - - elif auth_hrn in pi_delegation_authorities: - dest = ctx_delegation_authorities - - if auth_hrn in pi_delegation_credential_authorities: - request['allowed'] = 'allowed' - else: # pi_delegation_expired_authorities - request['allowed'] = 'expired' - - elif auth_hrn in pi_subauthorities: - dest = ctx_sub_authorities - - if auth_hrn in pi_subauthorities: + for my_auth in pi_delegation_authorities: + if auth_hrn.startswith(my_auth): + dest = ctx_delegation_authorities request['allowed'] = 'allowed' - else: # pi_delegation_expired_authorities - request['allowed'] = 'denied' - - else: - continue + if auth_hrn in pi_expired_credential_authorities: + request['allowed'] = 'expired' + if 'allowed' not in request: + request['allowed'] = 'denied' + #print "authority for this request", auth_hrn + +# if auth_hrn in pi_my_authorities: +# dest = ctx_my_authorities +# +# # define the css class +# if auth_hrn in pi_credential_authorities: +# request['allowed'] = 'allowed' +# elif auth_hrn in pi_expired_credential_authorities: +# request['allowed'] = 'expired' +# else: # pi_no_credential_authorities +# request['allowed'] = 'denied' +# +# elif auth_hrn in pi_delegation_authorities: +# dest = ctx_delegation_authorities +# +# if auth_hrn in pi_delegation_credential_authorities: +# request['allowed'] = 'allowed' +# else: # pi_delegation_expired_authorities +# request['allowed'] = 'expired' +# +# elif auth_hrn in pi_subauthorities: +# dest = ctx_sub_authorities +# +# if auth_hrn in pi_subauthorities: +# request['allowed'] = 'allowed' +# else: # pi_delegation_expired_authorities +# request['allowed'] = 'denied' +# +# else: +# continue if not auth_hrn in dest: dest[auth_hrn] = [] - dest[auth_hrn].append(request) + dest[auth_hrn].append(request) context = super(ValidatePendingView, self).get_context_data(**kwargs) + print "testing" + print ctx_my_authorities context['my_authorities'] = ctx_my_authorities context['sub_authorities'] = ctx_sub_authorities context['delegation_authorities'] = ctx_delegation_authorities @@ -248,7 +273,9 @@ class ValidatePendingView(FreeAccessView): context['topmenu_items'] = topmenu_items_live('Validation', page) # so we can sho who is logged context['username'] = the_user(self.request) - + context['pi'] = "is_pi" + context['theme'] = self.theme + context['section'] = "Requests" # XXX We need to prepare the page for queries #context.update(page.prelude_env())