Skip to content
Snippets Groups Projects

Handle port numbers in default token_audience

Merged Duncan Macleod requested to merge duncanmmacleod/gwdatafind:token_audience-port into main
1 file
+ 6
3
Compare changes
  • Side-by-side
  • Inline
+ 6
3
@@ -115,10 +115,13 @@ def get(url, *args, **kwargs):
@@ -115,10 +115,13 @@ def get(url, *args, **kwargs):
if url.startswith("http://") and requests.__version__ < "2.15.0":
if url.startswith("http://") and requests.__version__ < "2.15.0":
# workaround https://github.com/psf/requests/issues/4025
# workaround https://github.com/psf/requests/issues/4025
kwargs.setdefault("cert", False)
kwargs.setdefault("cert", False)
kwargs.setdefault("token_audience", [
scheme, netloc = urlparse(url)[:2]
"{0.scheme}://{0.netloc}".format(urlparse(url)),
host = netloc.split(":", 1)[0] # remove the port
 
kwargs.setdefault("token_audience", list({
 
f"{scheme}://{netloc}",
 
f"{scheme}://{host}",
"ANY",
"ANY",
])
}))
kwargs.setdefault("token_scope", "read:/frames")
kwargs.setdefault("token_scope", "read:/frames")
return _get(url, *args, **kwargs)
return _get(url, *args, **kwargs)
Loading