projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16561: Handle implicit port number in ws:// and wss:// urls.
[arvados.git]
/
lib
/
controller
/
proxy.go
diff --git
a/lib/controller/proxy.go
b/lib/controller/proxy.go
index 9aecdc1b2c6bd9cb81877eed5c4ede52eee3ba21..13dfcac16abb0bb27c7b1f3d50d024436453f97c 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,25
+25,32
@@
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,
+
+ // Content-Length depends on encoding.
+ "Content-Length": true,
}
type ResponseFilter func(*http.Response, error) (*http.Response, error)
}
type ResponseFilter func(*http.Response, error) (*http.Response, error)
-// Forward a request to
down
stream service, and return response or error.
-func (p *proxy)
ForwardRequest
(
+// Forward a request to
up
stream service, and return response or error.
+func (p *proxy)
Do
(
reqIn *http.Request,
urlOut *url.URL,
client *http.Client) (*http.Response, error) {
reqIn *http.Request,
urlOut *url.URL,
client *http.Client) (*http.Response, error) {
@@
-69,25
+73,17
@@
func (p *proxy) ForwardRequest(
}
hdrOut.Add("Via", reqIn.Proto+" arvados-controller")
}
hdrOut.Add("Via", reqIn.Proto+" arvados-controller")
- ctx := reqIn.Context()
- if p.RequestTimeout > 0 {
- var cancel context.CancelFunc
- ctx, cancel = context.WithDeadline(ctx, time.Now().Add(time.Duration(p.RequestTimeout)))
- defer cancel()
- }
-
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())
return client.Do(reqOut)
}
return client.Do(reqOut)
}
-// Copy a response (or error) to the
up
stream client
+// Copy a response (or error) to the
down
stream client
func (p *proxy) ForwardResponse(w http.ResponseWriter, resp *http.Response, err error) (int64, error) {
if err != nil {
if he, ok := err.(HTTPError); ok {
func (p *proxy) ForwardResponse(w http.ResponseWriter, resp *http.Response, err error) (int64, error) {
if err != nil {
if he, ok := err.(HTTPError); ok {