aboutsummaryrefslogtreecommitdiff
path: root/setup/config
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2021-03-05 10:40:27 +0000
committerGitHub <noreply@github.com>2021-03-05 10:40:27 +0000
commit1ad96e2e2df9dc1f5fa7d31522babd6a64ca517f (patch)
tree166e2051273fc89f50d6efac1c40a12cd7c077a7 /setup/config
parent9557ccada4efe50d0f370019ad0b9f017fc7ebcf (diff)
Tweak AS registration check and AS component HTTP clients (#1785)
* Tweak AS registration check * Check appservice usernames using correct function * Update sytest-whitelist * Use gomatrixserverlib.Client since that allows us to disable TLS validation using the config * Add appservice-specific client and ability to control TLS validation for appservices only * Set timeout on appservice client * Review comments * Remove dead code * Enforce LoginTypeApplicationService after all * Check correct auth type field
Diffstat (limited to 'setup/config')
-rw-r--r--setup/config/config_appservice.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/setup/config/config_appservice.go b/setup/config/config_appservice.go
index a042691d..a6f77abf 100644
--- a/setup/config/config_appservice.go
+++ b/setup/config/config_appservice.go
@@ -33,6 +33,10 @@ type AppServiceAPI struct {
Database DatabaseOptions `yaml:"database"`
+ // DisableTLSValidation disables the validation of X.509 TLS certs
+ // on appservice endpoints. This is not recommended in production!
+ DisableTLSValidation bool `yaml:"disable_tls_validation"`
+
ConfigFiles []string `yaml:"config_files"`
}