git.iko.soy/typeable/oauth2-proxy
on master help sign in
Address PR comments and test failure
commit8102f6300ad548c7a221a0fc91809beb8043b235 authorTero Pihlaja <tero.pihlaja@turckvilant.com> dateWed 27 May 2020, 13:24 (6 years ago) parent85d5f46
3 files changed+6−5
compare with master
unifiedsplit
oauthproxy.go+2−1 pkg/apis/options/options.go+1−1 pkg/validation/options_test.go+3−3
oauthproxy.go+2−1
@@ -148,10 +148,11 @@ func (u *UpstreamProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
148148// servers
149149func NewReverseProxy(target *url.URL, opts *options.Options) (proxy *httputil.ReverseProxy) {
150150 proxy = httputil.NewSingleHostReverseProxy(target)
151+ // Settings from net/http DefaultTransport except timeout
151152 proxy.Transport = &http.Transport{
152153 Proxy: http.ProxyFromEnvironment,
153154 DialContext: (&net.Dialer{
154− Timeout: time.Duration(opts.ProxyTimeOut) * time.Second,
155+ Timeout: opts.ProxyTimeOut,
155156 KeepAlive: 30 * time.Second,
156157 DualStack: true,
157158 }).DialContext,
pkg/apis/options/options.go+1−1
@@ -167,7 +167,7 @@ func NewOptions() *Options {
167167 ProxyWebSockets: true,
168168 HTTPAddress: "127.0.0.1:4180",
169169 HTTPSAddress: ":443",
170− ProxyTimeOut: 30, //TIME_OUT in seconds
170+ ProxyTimeOut: time.Duration(30) * time.Second,
171171 RealClientIPHeader: "X-Real-IP",
172172 ForceHTTPS: false,
173173 DisplayHtpasswdForm: true,
pkg/validation/options_test.go+3−3
@@ -142,9 +142,9 @@ func TestRedirectURL(t *testing.T) {
142142
143143func TestProxyTimeOut(t *testing.T) {
144144 o := testOptions()
145− o.ProxyTimeOut = 40
146− assert.Equal(t, nil, o.Validate())
147− expected := 40
145+ o.ProxyTimeOut = 40 * time.Second
146+ assert.Equal(t, nil, Validate(o))
147+ expected := 40 * time.Second
148148 assert.Equal(t, expected, o.ProxyTimeOut)
149149}
150150