X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fget_resources.py;h=4c7e466b159b751f317a2a1fb155fd5dc6ca8b15;hb=6f8fbddbe8ba6a0b6304655d80df53ab813d9001;hp=dc7c68e29aa5731f8e447d31f93d3b33449fa59d;hpb=56602a4f15300ba5b2078aacd98a8386d8a1e32c;p=sfa.git

diff --git a/sfa/methods/get_resources.py b/sfa/methods/get_resources.py
index dc7c68e2..4c7e466b 100644
--- a/sfa/methods/get_resources.py
+++ b/sfa/methods/get_resources.py
@@ -27,14 +27,23 @@ class get_resources(Method):
     accepts = [
         Parameter(str, "Credential string"),
         Mixed(Parameter(str, "Human readable name (hrn)"),
-              Parameter(None, "hrn not specified"))
+              Parameter(None, "hrn not specified")),
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified")),
+        Parameter(str, "Callers credential string")
         ]
 
     returns = Parameter(str, "String representatin of an rspec")
     
-    def call(self, cred, hrn=None, caller_cred=None):
+    def call(self, cred, hrn=None, request_hash = None, caller_cred=None):
         sfa_aggregate_type = Config().get_aggregate_rspec_type()
 
+        # This cred will be an authority cred, not a user, so we cant use it to 
+        # authenticate the caller's request_hash. Let just get the caller's gid
+        # from the cred and authenticate using that 
+        client_gid = Credential(string=cred).get_gid_caller()
+        client_gid_str = client_gid.save_to_string(save_parents=True)
+        self.api.auth.authenticateGid(client_gid_str, [cred,hrn], request_hash)
         self.api.auth.check(cred, 'listnodes')
         if caller_cred==None:
             caller_cred=cred
@@ -59,12 +68,13 @@ class get_resources(Method):
 
         # Filter the outgoing rspec using sfatables
         outgoing_rules = SFATablesRules('OUTGOING')
-
-        request_context = rspec_manager.fetch_context(
-            hrn,
-            Credential(string=caller_cred).get_gid_caller().get_hrn(),
-            outgoing_rules.contexts)
-        outgoing_rules.set_context(request_context)
-        filtered_rspec = outgoing_rules.apply(rspec)
-
-        return filtered_rspec
+	if outgoing_rules.sorted_rule_list:
+           request_context = rspec_manager.fetch_context(
+               hrn,
+               Credential(string=caller_cred).get_gid_caller().get_hrn(),
+               outgoing_rules.contexts)
+           outgoing_rules.set_context(request_context)
+           filtered_rspec = outgoing_rules.apply(rspec)
+           return filtered_rspec
+	else:
+	   return rspec