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 (from parent 1:
8667de4
)
call utcparse before exiting get_expiration istead of calling it when timestamp is...
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 5 Jul 2011 12:07:36 +0000
(08:07 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Tue, 5 Jul 2011 12:07:36 +0000
(08:07 -0400)
sfa/trust/credential.py
patch
|
blob
|
history
diff --git
a/sfa/trust/credential.py
b/sfa/trust/credential.py
index
5f980c9
..
e84b8c9
100644
(file)
--- a/
sfa/trust/credential.py
+++ b/
sfa/trust/credential.py
@@
-362,7
+362,7
@@
class Credential(object):
def get_expiration(self):
\r
if not self.expiration:
\r
self.decode()
\r
def get_expiration(self):
\r
if not self.expiration:
\r
self.decode()
\r
- return
self.expiration
\r
+ return
utcparse(self.expiration)
\r
\r
##
\r
# For legacy sake
\r
\r
##
\r
# For legacy sake
\r
@@
-760,7
+760,7
@@
class Credential(object):
return True
\r
\r
# make sure it is not expired
\r
return True
\r
\r
# make sure it is not expired
\r
- if
utcparse(self.get_expiration()
) < datetime.datetime.utcnow():
\r
+ if
self.get_expiration(
) < datetime.datetime.utcnow():
\r
raise CredentialNotVerifiable("Credential expired at %s" % self.expiration.isoformat())
\r
\r
# Verify the signatures
\r
raise CredentialNotVerifiable("Credential expired at %s" % self.expiration.isoformat())
\r
\r
# Verify the signatures
\r