trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into openapi-v3

Browse source 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	outpost/pkg/ak/api.go
#	outpost/pkg/ak/global.go
#	outpost/pkg/ldap/instance_bind.go
This commit is contained in:
Jens Langhammer 2021-05-16 21:36:24 +02:00
parent 6bd27d27ec 8d2a3b67b9
commit ab2bd622a8
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
authentik/lib/config.py
View file

@ -88,10 +88,10 @@ class ConfigLoader:
value = os.getenv(url.netloc, url.query) value = os.getenv(url.netloc, url.query)
if url.scheme == "file": if url.scheme == "file":
try: try:
with open(url.netloc, "r") as _file: with open(url.path, "r") as _file:
value = _file.read() value = _file.read()
except OSError: except OSError:
self._log("error", f"Failed to read config value from {url.netloc}") self._log("error", f"Failed to read config value from {url.path}")
value = url.query value = url.query
return value return value

1
outpost/pkg/ak/global.go
View file

@ -52,6 +52,7 @@ func doGlobalSetup(config map[string]interface{}) {
defer sentry.Flush(2 * time.Second) defer sentry.Flush(2 * time.Second)
} }
// GetTLSTransport Get a TLS transport instance, that skips verification if configured via environment variables.
func GetTLSTransport() http.RoundTripper { func GetTLSTransport() http.RoundTripper {
value, set := os.LookupEnv("AUTHENTIK_INSECURE") value, set := os.LookupEnv("AUTHENTIK_INSECURE")
if !set { if !set {