X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fauth.py;h=0b76d9ee65f9c5652e0c7af837dd3d586e793e72;hb=06b330f0ee047bdb107e43e82b1d7356c876bc15;hp=8832639634c06346508adefc8685af0b52de7396;hpb=c205adab13e918293f0a031d7dfa11e90b13bfad;p=sfa.git diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py index 88326396..0b76d9ee 100644 --- a/sfa/trust/auth.py +++ b/sfa/trust/auth.py @@ -1,10 +1,7 @@ # # SfaAPI authentication # -### $Id$ -### $URL$ -# - +import sys from sfa.trust.certificate import Keypair, Certificate from sfa.trust.credential import Credential @@ -12,10 +9,10 @@ from sfa.trust.trustedroot import TrustedRootList from sfa.util.faults import * from sfa.trust.hierarchy import Hierarchy from sfa.util.config import * -from sfa.util.namespace import * +from sfa.util.xrn import get_authority from sfa.util.sfaticket import * -from sfa.util.sfalogging import logger -import sys + +from sfa.util.sfalogging import sfa_logger class Auth: """ @@ -39,11 +36,14 @@ class Auth: valid = [] if not isinstance(creds, list): creds = [creds] + sfa_logger().debug("Auth.checkCredentials with %d creds"%len(creds)) for cred in creds: try: self.check(cred, operation, hrn) valid.append(cred) except: + cred_obj=Credential(string=cred) + sfa_logger().debug("failed to validate credential - dump="+cred_obj.dump_string(dump_parents=True)) error = sys.exc_info()[:2] continue @@ -58,7 +58,7 @@ class Auth: Check the credential against the peer cert (callerGID included in the credential matches the caller that is connected to the HTTPS connection, check if the credential was signed by a - trusted cert and check if the credential is allowd to perform + trusted cert and check if the credential is allowed to perform the specified operation. """ self.client_cred = Credential(string = cred) @@ -238,7 +238,7 @@ class Auth: verify_cancreate_credential() """ - rl = RightList() + rl = Rights() type = record['type']