From bafe25fbd969070dd62ba87583eae37d44279367 Mon Sep 17 00:00:00 2001 From: iyeonok Date: Mon, 28 May 2018 16:12:36 +0900 Subject: [PATCH 1/2] configure proxy environments for Transport property related issue: https://github.com/grafana/grafana/issues/9703 --- pkg/api/login_oauth.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index c4a5f8fdacf..510c31c4ee1 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -75,9 +75,10 @@ func OAuthLogin(ctx *m.ReqContext) { ctx.Handle(500, "login.OAuthLogin(state mismatch)", nil) return } - + // handle call back tr := &http.Transport{ + Proxy: http.ProxyFromEnvironment, TLSClientConfig: &tls.Config{ InsecureSkipVerify: setting.OAuthService.OAuthInfos[name].TlsSkipVerify, }, From d7b5fb4604057cd757e00f8ce77ed1e2568060fb Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 28 May 2018 20:47:48 +0200 Subject: [PATCH 2/2] go fmt fixes --- pkg/api/login_oauth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index 510c31c4ee1..fe4fa93b621 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -75,7 +75,7 @@ func OAuthLogin(ctx *m.ReqContext) { ctx.Handle(500, "login.OAuthLogin(state mismatch)", nil) return } - + // handle call back tr := &http.Transport{ Proxy: http.ProxyFromEnvironment,