From ab30c7d1177dd5325390176304d1a053389c3aa2 Mon Sep 17 00:00:00 2001
From: "duncan.macleod" <duncan.macleod@ligo.org>
Date: Fri, 8 Apr 2022 14:46:41 +0100
Subject: [PATCH] ui: handle port numbers in default token_audience
add default audiences with and without the port suffix
---
gwdatafind/ui.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gwdatafind/ui.py b/gwdatafind/ui.py
index 5ca620b..bf4759d 100644
--- a/gwdatafind/ui.py
+++ b/gwdatafind/ui.py
@@ -115,10 +115,13 @@ def get(url, *args, **kwargs):
if url.startswith("http://") and requests.__version__ < "2.15.0":
# workaround https://github.com/psf/requests/issues/4025
kwargs.setdefault("cert", False)
- kwargs.setdefault("token_audience", [
- "{0.scheme}://{0.netloc}".format(urlparse(url)),
+ scheme, netloc = urlparse(url)[:2]
+ host = netloc.split(":", 1)[0] # remove the port
+ kwargs.setdefault("token_audience", list({
+ f"{scheme}://{netloc}",
+ f"{scheme}://{host}",
"ANY",
- ])
+ }))
kwargs.setdefault("token_scope", "read:/frames")
return _get(url, *args, **kwargs)
--
GitLab