fixed up the names of new site names/slices to be more PLC compatible

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

diff --git a/sfa/methods/get_self_credential.py b/sfa/methods/get_self_credential.py
index ab55c47..3bdaecc 100644 (file)
--- a/sfa/methods/get_self_credential.py
+++ b/sfa/methods/get_self_credential.py
@@ -4,17 +4,21 @@
 from sfa.trust.credential import *
 from sfa.trust.rights import *
 from sfa.util.faults import *
+from sfa.util.namespace import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.record import GeniRecord
+from sfa.util.record import SfaRecord
 from sfa.util.debug import log
+from sfa.methods.GetSelfCredential import GetSelfCredential
 
-class get_self_credential(Method):
+class get_self_credential(GetSelfCredential):
     """
+    Deprecated. Use GetSelfCredential instead.
+
     Retrive a credential for an object
     @param cert certificate string 
     @param type type of object (user | slice | sa | ma | node)
-    @param hrn human readable name of object
+    @param hrn human readable name of object (hrn or urn)
 
     @return the string representation of a credential object  
     """
@@ -22,15 +26,15 @@ class get_self_credential(Method):
     interfaces = ['registry']
     
     accepts = [
+        Parameter(str, "Human readable name (hrn or urn)"),
         Parameter(str, "certificate"),
-        Parameter(str, "Human readable name (hrn)"),
         Mixed(Parameter(str, "Request hash"),
               Parameter(None, "Request hash not specified"))
         ]
 
     returns = Parameter(str, "String representation of a credential object")
 
-    def call(self, cert, type, hrn, request_hash=None):
+    def call(self, cert, type, xrn, origin_hrn=None):
         """
         get_self_credential a degenerate version of get_credential used by a client
         to get his initial credential when de doesnt have one. This is the same as
@@ -46,25 +50,4 @@ class get_self_credential(Method):
         @param hrn human readable name of authority to list
         @return string representation of a credential object
         """
-        self.api.auth.verify_object_belongs_to_me(hrn)
-        
-        # send the call to the right manager
-        manager_base = 'sfa.managers'
-        mgr_type = self.api.config.SFA_REGISTRY_TYPE
-        manager_module = manager_base + ".registry_manager_%s" % mgr_type
-        manager = __import__(manager_module, fromlist=[manager_base])
-
-        # authenticate the gid
-        records = manager.resolve(self.api, hrn, type)
-        if not records:
-            raise RecordNotFound(hrn)
-        record = GeniRecord(dict=records[0])
-        gid = record.get_gid_object()
-        gid_str = gid.save_to_string(save_parents=True)
-        self.api.auth.authenticateGid(gid_str, [cert, type, hrn], request_hash)
-        # authenticate the certificate against the gid in the db
-        certificate = Certificate(string=cert)
-        if not certificate.is_pubkey(gid.get_pubkey()):
-            raise ConnectionKeyGIDMismatch(gid.get_subject())
-        
-        return manager.get_credential(self.api, hrn, type, is_self=True)
+        return GetSelfCredential.call(self, cert, xrn, type)