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:
3b2bf09
)
remove references to speaking_for_hrn
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 26 May 2014 21:30:08 +0000
(17:30 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 26 May 2014 21:30:08 +0000
(17:30 -0400)
sfa/trust/auth.py
patch
|
blob
|
history
diff --git
a/sfa/trust/auth.py
b/sfa/trust/auth.py
index
747b536
..
5ff6ba6
100644
(file)
--- a/
sfa/trust/auth.py
+++ b/
sfa/trust/auth.py
@@
-39,7
+39,7
@@
class Auth:
# do not use mutable as default argument
# http://docs.python-guide.org/en/latest/writing/gotchas/#mutable-default-arguments
def checkCredentials(self, creds, operation, xrns=None,
# do not use mutable as default argument
# http://docs.python-guide.org/en/latest/writing/gotchas/#mutable-default-arguments
def checkCredentials(self, creds, operation, xrns=None,
- check_sliver_callback=None,
speaking_for_hrn=None,
options=None):
+ check_sliver_callback=None, options=None):
if xrns is None: xrns=[]
def log_invalid_cred(cred):
cred_obj=Credential(string=cred)
if xrns is None: xrns=[]
def log_invalid_cred(cred):
cred_obj=Credential(string=cred)
@@
-100,9
+100,6
@@
class Auth:
if not len(valid):
raise Forbidden("Invalid credential %s -- %s"%(error[0],error[1]))
if not len(valid):
raise Forbidden("Invalid credential %s -- %s"%(error[0],error[1]))
- if speaking_for_hrn 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]))
-
return valid
return valid