X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/58692c916bb6dfe2997838ca4147109d9410c86a..224f384d411bb1b4cccc7165c55bb64fd5c695ad:/services/keep-web/handler.go diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go index 847329f331..11d0d96b29 100644 --- a/services/keep-web/handler.go +++ b/services/keep-web/handler.go @@ -1,7 +1,6 @@ package main import ( - "flag" "fmt" "html" "io" @@ -12,6 +11,7 @@ import ( "regexp" "strconv" "strings" + "sync" "git.curoverse.com/arvados.git/sdk/go/arvadosclient" "git.curoverse.com/arvados.git/sdk/go/auth" @@ -19,23 +19,14 @@ import ( "git.curoverse.com/arvados.git/sdk/go/keepclient" ) -type handler struct{} - -var ( - clientPool = arvadosclient.MakeClientPool() - trustAllContent = false - attachmentOnlyHost = "" -) - -func init() { - flag.StringVar(&attachmentOnlyHost, "attachment-only-host", "", - "Accept credentials, and add \"Content-Disposition: attachment\" response headers, for requests at this hostname:port. Prohibiting inline display makes it possible to serve untrusted and non-public content from a single origin, i.e., without wildcard DNS or SSL.") - flag.BoolVar(&trustAllContent, "trust-all-content", false, - "Serve non-public content from a single origin. Dangerous: read docs before using!") +type handler struct { + Config *Config + clientPool *arvadosclient.ClientPool + setupOnce sync.Once } -// return a UUID or PDH if s begins with a UUID or URL-encoded PDH; -// otherwise return "". +// parseCollectionIDFromDNSName returns a UUID or PDH if s begins with +// a UUID or URL-encoded PDH; otherwise "". func parseCollectionIDFromDNSName(s string) string { // Strip domain. if i := strings.IndexRune(s, '.'); i >= 0 { @@ -58,8 +49,9 @@ func parseCollectionIDFromDNSName(s string) string { var urlPDHDecoder = strings.NewReplacer(" ", "+", "-", "+") -// return a UUID or PDH if s is a UUID or a PDH (even if it is a PDH -// with "+" replaced by " " or "-"); otherwise return "". +// parseCollectionIDFromURL returns a UUID or PDH if s is a UUID or a +// PDH (even if it is a PDH with "+" replaced by " " or "-"); +// otherwise "". func parseCollectionIDFromURL(s string) string { if arvadosclient.UUIDMatch(s) { return s @@ -70,7 +62,14 @@ func parseCollectionIDFromURL(s string) string { return "" } +func (h *handler) setup() { + h.clientPool = arvadosclient.MakeClientPool() +} + +// ServeHTTP implements http.Handler. func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { + h.setupOnce.Do(h.setup) + var statusCode = 0 var statusText string @@ -100,12 +99,21 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { return } - arv := clientPool.Get() + if r.Header.Get("Origin") != "" { + // Allow simple cross-origin requests without user + // credentials ("user credentials" as defined by CORS, + // i.e., cookies, HTTP authentication, and client-side + // SSL certificates. See + // http://www.w3.org/TR/cors/#user-credentials). + w.Header().Set("Access-Control-Allow-Origin", "*") + } + + arv := h.clientPool.Get() if arv == nil { - statusCode, statusText = http.StatusInternalServerError, "Pool failed: "+clientPool.Err().Error() + statusCode, statusText = http.StatusInternalServerError, "Pool failed: "+h.clientPool.Err().Error() return } - defer clientPool.Put(arv) + defer h.clientPool.Put(arv) pathParts := strings.Split(r.URL.Path[1:], "/") @@ -115,9 +123,9 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { var reqTokens []string var pathToken bool var attachment bool - credentialsOK := trustAllContent + credentialsOK := h.Config.TrustAllContent - if r.Host != "" && r.Host == attachmentOnlyHost { + if r.Host != "" && r.Host == h.Config.AttachmentOnlyHost { credentialsOK = true attachment = true } else if r.FormValue("disposition") == "attachment" { @@ -142,14 +150,31 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { } else { // /collections/ID/PATH... targetID = pathParts[1] - tokens = anonymousTokens + tokens = h.Config.AnonymousTokens targetPath = pathParts[2:] } } else { statusCode = http.StatusNotFound return } - if t := r.FormValue("api_token"); t != "" { + + formToken := r.FormValue("api_token") + if formToken != "" && r.Header.Get("Origin") != "" && attachment && r.URL.Query().Get("api_token") == "" { + // The client provided an explicit token in the POST + // body. The Origin header indicates this *might* be + // an AJAX request, in which case redirect-with-cookie + // won't work: we should just serve the content in the + // POST response. This is safe because: + // + // * We're supplying an attachment, not inline + // content, so we don't need to convert the POST to + // a GET and avoid the "really resubmit form?" + // problem. + // + // * The token isn't embedded in the URL, so we don't + // need to worry about bookmarks and copy/paste. + tokens = append(tokens, formToken) + } else if formToken != "" { // The client provided an explicit token in the query // string, or a form in POST body. We must put the // token in an HttpOnly cookie, and redirect to the @@ -160,7 +185,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { // It is not safe to copy the provided token // into a cookie unless the current vhost // (origin) serves only a single collection or - // we are in trustAllContent mode. + // we are in TrustAllContent mode. statusCode = http.StatusBadRequest return } @@ -179,7 +204,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { http.SetCookie(w, &http.Cookie{ Name: "arvados_api_token", - Value: auth.EncodeTokenCookie([]byte(t)), + Value: auth.EncodeTokenCookie([]byte(formToken)), Path: "/", HttpOnly: true, }) @@ -220,7 +245,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { if credentialsOK { reqTokens = auth.NewCredentialsFromHTTPRequest(r).Tokens } - tokens = append(reqTokens, anonymousTokens...) + tokens = append(reqTokens, h.Config.AnonymousTokens...) } if len(targetPath) > 0 && targetPath[0] == "_" { @@ -294,6 +319,12 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { statusCode, statusText = http.StatusInternalServerError, err.Error() return } + if kc.Client != nil && kc.Client.Transport != nil { + // Workaround for https://dev.arvados.org/issues/9005 + if t, ok := kc.Client.Transport.(*http.Transport); ok { + defer t.CloseIdleConnections() + } + } rdr, err := kc.CollectionFileReader(collection, filename) if os.IsNotExist(err) { statusCode = http.StatusNotFound