again getting away with caller_cred and passing just the hrn of the initial caller

[sfa.git] / sfa / methods / remove.py

diff --git a/sfa/methods/remove.py b/sfa/methods/remove.py
index dab6bf3..3d7d5d3 100644 (file)
--- a/sfa/methods/remove.py
+++ b/sfa/methods/remove.py
@@ -9,6 +9,7 @@ from sfa.util.record import GeniRecord
 from sfa.util.genitable import GeniTable
 from sfa.util.debug import log
 from sfa.trust.credential import Credential
+from sfa.server.registry import Registries
 
 class remove(Method):
     """
@@ -27,18 +28,26 @@ class remove(Method):
     accepts = [
         Parameter(str, "Credential string"),
         Parameter(str, "Record type"),
-        Parameter(str, "Human readable name (hrn) of record to be removed")
+        Parameter(str, "Human readable name (hrn) of record to be removed"),
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified"))
         ]
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, type, hrn, caller_cred=None):
+    def call(self, cred, type, hrn, request_hash=None, origin_hrn=None):
+
+        if origin_hrn==None:
+            origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
+        #log the call
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
+        # 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, type, hrn], request_hash)
         self.api.auth.check(cred, "remove")
-       if caller_cred==None:
-          caller_cred=cred
-       
-       #log the call
-       self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
         self.api.auth.verify_object_permission(hrn)
         table = GeniTable()
         filter = {'hrn': hrn}
@@ -48,8 +57,21 @@ class remove(Method):
         if not records:
             raise RecordNotFound(hrn)
         record = records[0]
-        
         type = record['type']
+
+        credential = self.api.getCredential()
+               registries = Registries(self.api) 
+
+        # Try to remove the object from the PLCDB of federated agg.
+        # This is attempted before removing the object from the local agg's PLCDB and sfa table
+        if hrn.startswith(self.api.hrn) and type in ['user', 'slice', 'authority']:
+            for registry in registries:
+                if registry not in [self.api.hrn]:
+                    try:
+                       request_hash=None
+                        result=registries[registry].remove_peer_object(credential, record, request_hash, origin_hrn)
+                    except:
+                        pass
         if type == "user":
             persons = self.api.plshell.GetPersons(self.api.plauth, record['pointer'])
             # only delete this person if he has site ids. if he doesnt, it probably means 
@@ -69,5 +91,7 @@ class remove(Method):
             raise UnknownGeniType(type)
 
         table.remove(record)
+           
+       # forward the call after replacing the root hrn
 
         return 1