From 1d4e22d819788468808ba81a24bce7af37da4164 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 26 Feb 2020 12:52:20 +0800 Subject: [PATCH] Add insecure test Mode(#609) Signed-off-by: Nan ZiYuan --- appservice/api/query.go | 2 +- appservice/appservice.go | 2 +- appservice/query/query.go | 2 +- clientapi/threepid/invites.go | 2 +- clientapi/threepid/threepid.go | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appservice/api/query.go b/appservice/api/query.go index bf4829290..b89bbc9f0 100644 --- a/appservice/api/query.go +++ b/appservice/api/query.go @@ -107,7 +107,7 @@ func NewAppServiceQueryAPIHTTP( ) AppServiceQueryAPI { if httpClient == nil { customTransport := http.DefaultTransport.(*http.Transport).Clone() - if Cfg.Test.SkipSSLVerify == true { + if Cfg.Test.SkipSSLVerify { customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} } httpClient = &http.Client{ diff --git a/appservice/appservice.go b/appservice/appservice.go index ace3e23bb..bfe7cf709 100644 --- a/appservice/appservice.go +++ b/appservice/appservice.go @@ -83,7 +83,7 @@ func SetupAppServiceAPIComponent( }, Cfg: base.Cfg, } - if base.Cfg.Test.SkipSSLVerify == true { + if base.Cfg.Test.SkipSSLVerify { customTransport := http.DefaultTransport.(*http.Transport).Clone() customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} appserviceQueryAPI.HTTPClient = &http.Client{ diff --git a/appservice/query/query.go b/appservice/query/query.go index 83704571b..354b840f5 100644 --- a/appservice/query/query.go +++ b/appservice/query/query.go @@ -177,7 +177,7 @@ func (a *AppServiceQueryAPI) UserIDExists( // makeHTTPClient creates an HTTP client with certain options that will be used for all query requests to application services func makeHTTPClient(skipSSLVerify bool) *http.Client { customTransport := http.DefaultTransport.(*http.Transport).Clone() - if skipSSLVerify == true { + if skipSSLVerify { customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} } return &http.Client{ diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go index 4d5d992f2..5ff7470b8 100644 --- a/clientapi/threepid/invites.go +++ b/clientapi/threepid/invites.go @@ -227,7 +227,7 @@ func queryIDServerStoreInvite( } client := http.Client{} - if cfg.Test.SkipSSLVerify == true { + if cfg.Test.SkipSSLVerify { customTransport := http.DefaultTransport.(*http.Transport).Clone() customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} client = http.Client{ diff --git a/clientapi/threepid/threepid.go b/clientapi/threepid/threepid.go index 4e8d836ab..e6de925d0 100644 --- a/clientapi/threepid/threepid.go +++ b/clientapi/threepid/threepid.go @@ -76,7 +76,7 @@ func CreateSession( request.Header.Add("Content-Type", "application/x-www-form-urlencoded") client := http.Client{} - if cfg.Test.SkipSSLVerify == true { + if cfg.Test.SkipSSLVerify { customTransport := http.DefaultTransport.(*http.Transport).Clone() customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} client = http.Client{ @@ -171,7 +171,7 @@ func PublishAssociation(creds Credentials, userID string, cfg *config.Dendrite) request.Header.Add("Content-Type", "application/x-www-form-urlencoded") client := http.Client{} - if cfg.Test.SkipSSLVerify == true { + if cfg.Test.SkipSSLVerify { customTransport := http.DefaultTransport.(*http.Transport).Clone() customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} client = http.Client{