git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86efe70
)
remove debug logging
geni-v2
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 23 May 2014 13:51:01 +0000
(09:51 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 23 May 2014 13:51:01 +0000
(09:51 -0400)
sfa/trust/speaksfor_util.py
patch
|
blob
|
history
diff --git
a/sfa/trust/speaksfor_util.py
b/sfa/trust/speaksfor_util.py
index
bd12195
..
83c88c9
100644
(file)
--- a/
sfa/trust/speaksfor_util.py
+++ b/
sfa/trust/speaksfor_util.py
@@
-158,16
+158,6
@@
def verify_speaks_for(cred, tool_gid, speaking_for_urn, \
principal_keyid = head.get_principal_keyid()
\r
role = head.get_role()
\r
\r
principal_keyid = head.get_principal_keyid()
\r
role = head.get_role()
\r
\r
- logger.info('user keyid: %s' % user_keyid)
\r
- logger.info('principal keyid: %s' % principal_keyid)
\r
- logger.info('tool keyid: %s' % tool_keyid)
\r
- logger.info('subject keyid: %s' % subject_keyid)
\r
- logger.info('role: %s' % role)
\r
- logger.info('user gid: %s' % user_gid.dump_string())
\r
- f = open('/tmp/speaksfor/tool.gid', 'w')
\r
- f.write(tool_gid.dump_string())
\r
- f.close()
\r
-
\r
# Credential must pass xmlsec1 verify
\r
cred_file = write_to_tempfile(cred.save_to_string())
\r
cert_args = []
\r
# Credential must pass xmlsec1 verify
\r
cred_file = write_to_tempfile(cred.save_to_string())
\r
cert_args = []
\r
@@
-241,8
+231,6
@@
def verify_speaks_for(cred, tool_gid, speaking_for_urn, \
# Optionally, provide an XML schema against which to validate the credential
\r
def determine_speaks_for(logger, credentials, caller_gid, options, \
\r
trusted_roots, schema=None):
\r
# Optionally, provide an XML schema against which to validate the credential
\r
def determine_speaks_for(logger, credentials, caller_gid, options, \
\r
trusted_roots, schema=None):
\r
- logger.info(options)
\r
- logger.info("geni speaking for:%s " % 'geni_speaking_for' in options)
\r
if options and 'geni_speaking_for' in options:
\r
speaking_for_urn = options['geni_speaking_for'].strip()
\r
for cred in credentials:
\r
if options and 'geni_speaking_for' in options:
\r
speaking_for_urn = options['geni_speaking_for'].strip()
\r
for cred in credentials:
\r
@@
-266,10
+254,6
@@
def determine_speaks_for(logger, credentials, caller_gid, options, \
# print "Got a cred to check speaksfor for: %s" % cred.get_summary_tostring()
\r
# #cred.dump(True, True)
\r
# print "Caller: %s" % caller_gid.dump_string(2, True)
\r
# print "Got a cred to check speaksfor for: %s" % cred.get_summary_tostring()
\r
# #cred.dump(True, True)
\r
# print "Caller: %s" % caller_gid.dump_string(2, True)
\r
- logger.info(cred.dump_string())
\r
- f = open('/tmp/speaksfor/%s.cred' % cred, 'w')
\r
- f.write(cred.xml)
\r
- f.close()
\r
# See if this is a valid speaks_for
\r
is_valid_speaks_for, user_gid, msg = \
\r
verify_speaks_for(cred,
\r
# See if this is a valid speaks_for
\r
is_valid_speaks_for, user_gid, msg = \
\r
verify_speaks_for(cred,
\r