working towards supporting speaks for credentials

diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py
index 48ad5b2..0dffa08 100644 (file)
--- a/sfa/trust/auth.py
+++ b/sfa/trust/auth.py
@@ -7,7 +7,7 @@ from sfa.util.faults import InsufficientRights, MissingCallerGID, MissingTrusted
     BadRequestHash, ConnectionKeyGIDMismatch, SfaPermissionDenied
 from sfa.util.sfalogging import logger
 from sfa.util.config import Config
     BadRequestHash, ConnectionKeyGIDMismatch, SfaPermissionDenied
 from sfa.util.sfalogging import logger
 from sfa.util.config import Config

-from sfa.util.xrn import get_authority
+from sfa.util.xrn import get_authority, Xrn

 
 from sfa.trust.gid import GID
 from sfa.trust.rights import Rights
 
 from sfa.trust.gid import GID
 from sfa.trust.rights import Rights


@@ -35,15 +35,16 @@ class Auth:
         self.trusted_cert_file_list = TrustedRoots(self.config.get_trustedroots_dir()).get_file_list()
 
        
         self.trusted_cert_file_list = TrustedRoots(self.config.get_trustedroots_dir()).get_file_list()
 
        

-    def checkCredentials(self, creds, operation, hrn = None, speaking_for_hrn = None):
+    def checkCredentials(self, creds, operation, hrn = None, options = {}):

 
         def log_invalid_cred(cred):
 
         def log_invalid_cred(cred):

-            cred_obj=Credential(string=cred)
-            logger.debug("failed to validate credential - dump=%s"%cred_obj.dump_string(dump_parents=True))
+            #cred_obj=Credential(string=cred)
+            #logger.debug("failed to validate credential - dump=%s"%cred_obj.dump_string(dump_parents=True))

             error = sys.exc_info()[:2]
             return error
 
         valid = []
             error = sys.exc_info()[:2]
             return error
 
         valid = []

+        speaking_for = options.get('geni_speaking_for', None)

         speaks_for_cred = None
 
         if not isinstance(creds, list):
         speaks_for_cred = None
 
         if not isinstance(creds, list):


@@ -55,8 +56,10 @@ class Auth:
                 valid.append(cred)
             except:
                 # check if credential is a 'speaks for  credential'
                 valid.append(cred)
             except:
                 # check if credential is a 'speaks for  credential'

-                if speaking_for_hrn:
+                if speaking_for:

                     try:
                     try:

+                        speaking_for_xrn = Xrn(speaking_for)
+                        speaking_for_hrn = speaking_for_xrn.get_hrn()     

                         self.check(cred, operation, speaking_for_hrn)
                         speaks_for_cred = cred
                         valid.append(cred)    
                         self.check(cred, operation, speaking_for_hrn)
                         speaks_for_cred = cred
                         valid.append(cred)    


@@ -69,7 +72,7 @@ class Auth:
         if not len(valid):
             raise InsufficientRights('Access denied: %s -- %s' % (error[0],error[1]))
         
         if not len(valid):
             raise InsufficientRights('Access denied: %s -- %s' % (error[0],error[1]))
         

-        if speaking_for_hrn and not speaks_for_cred:
+        if speaking_for and not speaks_for_cred:

             raise InsufficientRights('Access denied: "geni_speaking_for" option specified but no valid speaks for credential found: %s -- %s' % (error[0],error[1]))
             
         
             raise InsufficientRights('Access denied: "geni_speaking_for" option specified but no valid speaks for credential found: %s -- %s' % (error[0],error[1]))
             
         

diff --git a/sfa/trust/certificate.py b/sfa/trust/certificate.py
index 59ec442..9e5a36e 100644 (file)
--- a/sfa/trust/certificate.py
+++ b/sfa/trust/certificate.py
@@ -463,8 +463,12 @@ class Certificate:
     # Get the issuer name
 
     def get_issuer(self, which="CN"):
     # Get the issuer name
 
     def get_issuer(self, which="CN"):

-        x = self.cert.get_issuer()
-        return getattr(x, which)
+        if self.cert:
+            x = self.cert.get_issuer()
+            subject = getattr(x, which)    
+        else:
+            subject = ""
+        return subject

 
     ##
     # Set the subject name of the certificate
 
     ##
     # Set the subject name of the certificate