namespace module is gone, plxrn provides PL-specific translations

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

diff --git a/sfa/methods/GetSelfCredential.py b/sfa/methods/GetSelfCredential.py
index a5c7d40..6a8261c 100644 (file)
--- a/sfa/methods/GetSelfCredential.py
+++ b/sfa/methods/GetSelfCredential.py
@@ -1,15 +1,12 @@
-### $Id: get_credential.py 15321 2009-10-15 05:01:21Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/get_credential.py $
 
-from sfa.trust.credential import *
-from sfa.trust.rights import *
 from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
 from sfa.util.record import SfaRecord
-from sfa.util.debug import log
+from sfa.trust.credential import Credential
 from sfa.trust.certificate import Certificate
+from sfa.trust.rights import Right, Rights
 
 class GetSelfCredential(Method):
     """
@@ -34,14 +31,14 @@ class GetSelfCredential(Method):
 
     def call(self, cert, xrn, type):
         """
-        get_self_credential a degenerate version of get_credential used by a client
+        GetSelfCredential a degenerate version of GetCredential used by a client
         to get his initial credential when de doesnt have one. This is the same as
-        get_credetial(..., cred = None, ...)
+        GetCredential(..., cred = None, ...)
 
         The registry ensures that the client is the principal that is named by
         (type, name) by comparing the public key in the record's  GID to the
         private key used to encrypt the client side of the HTTPS connection. Thus
-        it is impossible for one principal to retrive another principal's
+        it is impossible for one principal to retrieve another principal's
         credential without having the appropriate private key.
 
         @param type type of object (user | slice | sa | ma | node)
@@ -70,6 +67,11 @@ class GetSelfCredential(Method):
         # authenticate the certificate against the gid in the db
         certificate = Certificate(string=cert)
         if not certificate.is_pubkey(gid.get_pubkey()):
+            for (obj,name) in [ (certificate,"CERT"), (gid,"GID"), ]:
+                self.api.logger.debug("ConnectionKeyGIDMismatch, %s pubkey: %s"%(name,obj.get_pubkey().get_pubkey_string()))
+                self.api.logger.debug("ConnectionKeyGIDMismatch, %s dump: %s"%(name,obj.dump_string()))
+                if hasattr (obj,'filename'): 
+                    self.api.logger.debug("ConnectionKeyGIDMismatch, %s filename: %s"%(name,obj.filename))
             raise ConnectionKeyGIDMismatch(gid.get_subject())
         
         return manager.get_credential(self.api, xrn, type, is_self=True)