From 664b8c7bdb3df3aaa77dec62970631f404b605d8 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 10 Dec 2015 11:56:18 +0100 Subject: [PATCH] prettified speaksfor a little --- sfa/trust/speaksfor_util.py | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/sfa/trust/speaksfor_util.py b/sfa/trust/speaksfor_util.py index 9e859248..9bad61db 100644 --- a/sfa/trust/speaksfor_util.py +++ b/sfa/trust/speaksfor_util.py @@ -21,6 +21,8 @@ # IN THE WORK. #---------------------------------------------------------------------- +from __future__ import print_function + import datetime from dateutil import parser as du_parser, tz as du_tz import optparse @@ -38,6 +40,7 @@ from sfa.trust.credential import Credential, signature_template, HAVELXML from sfa.trust.abac_credential import ABACCredential, ABACElement from sfa.trust.credential_factory import CredentialFactory from sfa.trust.gid import GID +from sfa.util.sfalogging import logger # Routine to validate that a speaks-for credential # says what it claims to say: @@ -255,27 +258,24 @@ def determine_speaks_for(logger, credentials, caller_gid, speaking_for_xrn, trus if not isinstance(cred_value, ABACCredential): cred = CredentialFactory.createCred(cred_value) -# print "Got a cred to check speaksfor for: %s" % cred.pretty_cred() +# print("Got a cred to check speaksfor for: %s" % cred.pretty_cred()) # #cred.dump(True, True) -# print "Caller: %s" % caller_gid.dump_string(2, True) +# print("Caller: %s" % caller_gid.dump_string(2, True)) # See if this is a valid speaks_for is_valid_speaks_for, user_gid, msg = \ verify_speaks_for(cred, - caller_gid, speaking_for_urn, \ - trusted_roots, schema, logger=logger) + caller_gid, speaking_for_urn, + trusted_roots, schema, logger=logger) logger.info(msg) if is_valid_speaks_for: return user_gid # speaks-for else: - if logger: - logger.info("Got speaks-for option but not a valid speaks_for with this credential: %s" % msg) - else: - print "Got a speaks-for option but not a valid speaks_for with this credential: " + msg + logger.info("Got speaks-for option but not a valid speaks_for with this credential: %s" % msg) return caller_gid # Not speaks-for # Create an ABAC Speaks For credential using the ABACCredential object and it's encode&sign methods def create_sign_abaccred(tool_gid, user_gid, ma_gid, user_key_file, cred_filename, dur_days=365): - print "Creating ABAC SpeaksFor using ABACCredential...\n" + logger.info("Creating ABAC SpeaksFor using ABACCredential...\n") # Write out the user cert from tempfile import mkstemp ma_str = ma_gid.save_to_string() @@ -306,12 +306,12 @@ def create_sign_abaccred(tool_gid, user_gid, ma_gid, user_key_file, cred_filenam cred.sign() # Save it cred.save_to_file(cred_filename) - print "Created ABAC credential: '%s' in file %s" % \ - (cred.pretty_cred(), cred_filename) + logger.info("Created ABAC credential: '%s' in file %s" % + (cred.pretty_cred(), cred_filename)) # FIXME: Assumes signer is itself signed by an 'ma_gid' that can be trusted -def create_speaks_for(tool_gid, user_gid, ma_gid, \ - user_key_file, cred_filename, dur_days=365): +def create_speaks_for(tool_gid, user_gid, ma_gid, + user_key_file, cred_filename, dur_days=365): tool_urn = tool_gid.get_urn() user_urn = user_gid.get_urn() @@ -358,9 +358,9 @@ def create_speaks_for(tool_gid, user_gid, ma_gid, \ user_keyid = get_cert_keyid(user_gid) tool_keyid = get_cert_keyid(tool_gid) - unsigned_cred = template % (reference, expiration_str, version, \ - user_keyid, user_urn, user_keyid, tool_keyid, tool_urn, \ - reference, reference) + unsigned_cred = template % (reference, expiration_str, version, + user_keyid, user_urn, user_keyid, tool_keyid, tool_urn, + reference, reference) unsigned_cred_filename = write_to_tempfile(unsigned_cred) # Now sign the file with xmlsec1 @@ -374,13 +374,13 @@ def create_speaks_for(tool_gid, user_gid, ma_gid, \ cmd = [ xmlsec1, '--sign', '--privkey-pem', pems, '--output', cred_filename, unsigned_cred_filename] -# print " ".join(cmd) +# print(" ".join(cmd)) sign_proc_output = run_subprocess(cmd, stdout=subprocess.PIPE, stderr=None) if sign_proc_output == None: - print "OUTPUT = %s" % sign_proc_output + logger.info("xmlsec1 returns empty output") else: - print "Created ABAC credential: '%s speaks_for %s' in file %s" % \ - (tool_urn, user_urn, cred_filename) + logger.info("Created ABAC credential: '%s speaks_for %s' in file %s" % + (tool_urn, user_urn, cred_filename)) os.unlink(unsigned_cred_filename) @@ -417,17 +417,17 @@ if __name__ == "__main__": user_gid = GID(filename=options.user_cert_file) ma_gid = GID(filename=options.ma_cert_file) if options.useObject: - create_sign_abaccred(tool_gid, user_gid, ma_gid, \ - options.user_key_file, \ - options.create) + create_sign_abaccred(tool_gid, user_gid, ma_gid, + options.user_key_file, + options.create) else: - create_speaks_for(tool_gid, user_gid, ma_gid, \ - options.user_key_file, \ - options.create) + create_speaks_for(tool_gid, user_gid, ma_gid, + options.user_key_file, + options.create) else: - print "Usage: --create cred_file " + \ - "--user_cert_file user_cert_file" + \ - " --user_key_file user_key_file --ma_cert_file ma_cert_file" + print("Usage: --create cred_file " + + "--user_cert_file user_cert_file" + + " --user_key_file user_key_file --ma_cert_file ma_cert_file") sys.exit() user_urn = options.user_urn @@ -438,18 +438,18 @@ if __name__ == "__main__": trusted_roots_directory = options.trusted_roots_directory trusted_roots = \ - [Certificate(filename=os.path.join(trusted_roots_directory, file)) \ - for file in os.listdir(trusted_roots_directory) \ + [Certificate(filename=os.path.join(trusted_roots_directory, file)) + for file in os.listdir(trusted_roots_directory) if file.endswith('.pem') and file != 'CATedCACerts.pem'] cred = open(options.cred_file).read() creds = [{'geni_type' : ABACCredential.ABAC_CREDENTIAL_TYPE, 'geni_value' : cred, 'geni_version' : '1'}] - gid = determine_speaks_for(None, creds, tool_gid, \ - {'geni_speaking_for' : user_urn}, \ - trusted_roots) + gid = determine_speaks_for(None, creds, tool_gid, + {'geni_speaking_for' : user_urn}, + trusted_roots) - print 'SPEAKS_FOR = %s' % (gid != tool_gid) - print "CERT URN = %s" % gid.get_urn() + print('SPEAKS_FOR = %s' % (gid != tool_gid)) + print("CERT URN = %s" % gid.get_urn()) -- 2.43.0