X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fvalidationview.py;h=23909b47a94232e52fb09958faf086e12795b90d;hb=f0f76a08ca9dc5d208e1521a73ba1ba60a3c0065;hp=1752e271c3e04aba15318bc8e435b252b7a98168;hpb=8e39a03cc88ae7332f044d3810ba24e201c819c7;p=myslice.git diff --git a/portal/validationview.py b/portal/validationview.py index 1752e271..23909b47 100644 --- a/portal/validationview.py +++ b/portal/validationview.py @@ -40,7 +40,7 @@ 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 portal.actions import get_requests from manifold.manifoldapi import execute_query from manifold.core.query import Query from unfold.page import Page @@ -58,6 +58,7 @@ class ValidatePendingView(FreeAccessView): ctx_my_authorities = {} ctx_delegation_authorities = {} + ctx_sub_authorities = {} # The user need to be logged in @@ -141,6 +142,10 @@ 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) + # ** 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') @@ -149,7 +154,17 @@ class ValidatePendingView(FreeAccessView): for pa in pi_authorities_tmp: pi_authorities |= set(pa['pi_authorities']) - print "pi_authorities =", pi_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) + + #print "pi_authorities =", pi_authorities + #print "pi_subauthorities =", pi_subauthorities # My authorities + I have a credential pi_credential_authorities = pi_authorities & credential_authorities @@ -159,51 +174,74 @@ class ValidatePendingView(FreeAccessView): pi_delegation_credential_authorities = credential_authorities - pi_authorities pi_delegation_expired_authorities = credential_authorities_expired - pi_authorities - print "pi_credential_authorities =", pi_credential_authorities - print "pi_no_credential_authorities =", pi_no_credential_authorities - print "pi_expired_credential_authorities =", pi_expired_credential_authorities - print "pi_delegation_credential_authorities = ", pi_delegation_credential_authorities - print "pi_delegation_expired_authorities = ", pi_delegation_expired_authorities + #print "pi_credential_authorities =", pi_credential_authorities + #print "pi_no_credential_authorities =", pi_no_credential_authorities + #print "pi_expired_credential_authorities =", pi_expired_credential_authorities + #print "pi_delegation_credential_authorities = ", pi_delegation_credential_authorities + #print "pi_delegation_expired_authorities = ", pi_delegation_expired_authorities # Summary intermediary pi_my_authorities = pi_credential_authorities | pi_no_credential_authorities | pi_expired_credential_authorities pi_delegation_authorities = pi_delegation_credential_authorities | pi_delegation_expired_authorities - print "--" - print "pi_my_authorities = ", pi_my_authorities - print "pi_delegation_authorities = ", pi_delegation_authorities + #print "--" + #print "pi_my_authorities = ", pi_my_authorities + #print "pi_delegation_authorities = ", pi_delegation_authorities + #print "pi_subauthorities = ", pi_subauthorities # Summary all - queried_pending_authorities = pi_my_authorities | pi_delegation_authorities - print "----" - print "queried_pending_authorities = ", queried_pending_authorities + 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) - print "requests = ", requests +# 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'] - - 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: + 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'] = 'expired' - - 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] = [] @@ -211,6 +249,7 @@ class ValidatePendingView(FreeAccessView): context = super(ValidatePendingView, self).get_context_data(**kwargs) context['my_authorities'] = ctx_my_authorities + context['sub_authorities'] = ctx_sub_authorities context['delegation_authorities'] = ctx_delegation_authorities # XXX This is repeated in all pages