projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16129-scoped-token-doc' refs #16129
[arvados.git]
/
lib
/
controller
/
proxy.go
diff --git
a/lib/controller/proxy.go
b/lib/controller/proxy.go
index c89b9b36ae0cddfc67a127d1e6f8bdac84ab6412..939868a17b94f132644e3459292290294514e84f 100644
(file)
--- a/
lib/controller/proxy.go
+++ b/
lib/controller/proxy.go
@@
-5,18
+5,15
@@
package controller
import (
package controller
import (
- "context"
"io"
"net/http"
"net/url"
"io"
"net/http"
"net/url"
- "time"
- "git.
curoverse.com
/arvados.git/sdk/go/httpserver"
+ "git.
arvados.org
/arvados.git/sdk/go/httpserver"
)
type proxy struct {
)
type proxy struct {
- Name string // to use in Via header
- RequestTimeout time.Duration
+ Name string // to use in Via header
}
type HTTPError struct {
}
type HTTPError struct {
@@
-28,19
+25,23
@@
func (h HTTPError) Error() string {
return h.Message
}
return h.Message
}
-// headers that shouldn't be forwarded when proxying. See
-// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
var dropHeaders = map[string]bool{
var dropHeaders = map[string]bool{
+ // Headers that shouldn't be forwarded when proxying. See
+ // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
"Connection": true,
"Keep-Alive": true,
"Proxy-Authenticate": true,
"Proxy-Authorization": true,
"Connection": true,
"Keep-Alive": true,
"Proxy-Authenticate": true,
"Proxy-Authorization": true,
- "TE": true,
- "Trailer": true,
- "Transfer-Encoding": true, // *-Encoding headers interfer with Go's automatic compression/decompression
- "Content-Encoding": true,
+ // (comment/space here makes gofmt1.10 agree with gofmt1.11)
+ "TE": true,
+ "Trailer": true,
+ "Upgrade": true,
+
+ // Headers that would interfere with Go's automatic
+ // compression/decompression if we forwarded them.
"Accept-Encoding": true,
"Accept-Encoding": true,
- "Upgrade": true,
+ "Content-Encoding": true,
+ "Transfer-Encoding": true,
}
type ResponseFilter func(*http.Response, error) (*http.Response, error)
}
type ResponseFilter func(*http.Response, error) (*http.Response, error)
@@
-49,7
+50,7
@@
type ResponseFilter func(*http.Response, error) (*http.Response, error)
func (p *proxy) Do(
reqIn *http.Request,
urlOut *url.URL,
func (p *proxy) Do(
reqIn *http.Request,
urlOut *url.URL,
- client *http.Client) (*http.Response,
context.CancelFunc,
error) {
+ client *http.Client) (*http.Response, error) {
// Copy headers from incoming request, then add/replace proxy
// headers like Via and X-Forwarded-For.
// Copy headers from incoming request, then add/replace proxy
// headers like Via and X-Forwarded-For.
@@
-69,22
+70,16
@@
func (p *proxy) Do(
}
hdrOut.Add("Via", reqIn.Proto+" arvados-controller")
}
hdrOut.Add("Via", reqIn.Proto+" arvados-controller")
- ctx := reqIn.Context()
- var cancel context.CancelFunc
- if p.RequestTimeout > 0 {
- ctx, cancel = context.WithDeadline(ctx, time.Now().Add(time.Duration(p.RequestTimeout)))
- }
-
reqOut := (&http.Request{
Method: reqIn.Method,
URL: urlOut,
Host: reqIn.Host,
Header: hdrOut,
Body: reqIn.Body,
reqOut := (&http.Request{
Method: reqIn.Method,
URL: urlOut,
Host: reqIn.Host,
Header: hdrOut,
Body: reqIn.Body,
- }).WithContext(
ctx
)
+ }).WithContext(
reqIn.Context()
)
resp, err := client.Do(reqOut)
resp, err := client.Do(reqOut)
- return resp,
cancel,
err
+ return resp, err
}
// Copy a response (or error) to the downstream client
}
// Copy a response (or error) to the downstream client