summary refs log tree commit diff
path: root/synapse/util/macaroons.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-09-14 11:02:37 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-09-14 11:02:37 +0100
commit003c2ab629ac23e5a789b8152f45f999a21dcfb2 (patch)
tree389f4e154384a4aea61aff018c0027f89b5179d0 /synapse/util/macaroons.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentUse direct references for some configuration variables (#10798) (diff)
downloadsynapse-003c2ab629ac23e5a789b8152f45f999a21dcfb2.tar.xz
Merge branch 'release-v1.43' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/util/macaroons.py')
-rw-r--r--synapse/util/macaroons.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/macaroons.py b/synapse/util/macaroons.py

index d1f76e3dc5..84e4f6ff55 100644 --- a/synapse/util/macaroons.py +++ b/synapse/util/macaroons.py
@@ -77,7 +77,7 @@ def satisfy_expiry(v: pymacaroons.Verifier, get_time_ms: Callable[[], int]) -> N should be considered expired. Normally the current time. """ - def verify_expiry_caveat(caveat: str): + def verify_expiry_caveat(caveat: str) -> bool: time_msec = get_time_ms() prefix = "time < " if not caveat.startswith(prefix):