X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/eeef002557bc361a10483d1924c49e35e8a23fde..8a27fe370239ecb8e50d53f46b45ed61203a35ca:/services/keep-web/handler.go diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go index bb77e58594..54b8c02165 100644 --- a/services/keep-web/handler.go +++ b/services/keep-web/handler.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -package main +package keepweb import ( "encoding/json" @@ -19,49 +19,29 @@ import ( "strings" "sync" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/arvadosclient" - "git.curoverse.com/arvados.git/sdk/go/auth" - "git.curoverse.com/arvados.git/sdk/go/health" - "git.curoverse.com/arvados.git/sdk/go/httpserver" - "git.curoverse.com/arvados.git/sdk/go/keepclient" - log "github.com/Sirupsen/logrus" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvadosclient" + "git.arvados.org/arvados.git/sdk/go/auth" + "git.arvados.org/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/httpserver" + "git.arvados.org/arvados.git/sdk/go/keepclient" + "github.com/sirupsen/logrus" "golang.org/x/net/webdav" ) type handler struct { - Config *Config - MetricsAPI http.Handler - clientPool *arvadosclient.ClientPool - setupOnce sync.Once - healthHandler http.Handler - webdavLS webdav.LockSystem -} - -// 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 { - s = s[:i] - } - // Names like {uuid}--collections.example.com serve the same - // purpose as {uuid}.collections.example.com but can reduce - // cost/effort of using [additional] wildcard certificates. - if i := strings.Index(s, "--"); i >= 0 { - s = s[:i] - } - if arvadosclient.UUIDMatch(s) { - return s - } - if pdh := strings.Replace(s, "-", "+", 1); arvadosclient.PDHMatch(pdh) { - return pdh - } - return "" + Cache cache + Cluster *arvados.Cluster + clientPool *arvadosclient.ClientPool + setupOnce sync.Once + webdavLS webdav.LockSystem } var urlPDHDecoder = strings.NewReplacer(" ", "+", "-", "+") +var notFoundMessage = "404 Not found\r\n\r\nThe requested path was not found, or you do not have permission to access it.\r" +var unauthorizedMessage = "401 Unauthorized\r\n\r\nA valid Arvados token must be provided to access this resource.\r" + // 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 "". @@ -76,14 +56,11 @@ func parseCollectionIDFromURL(s string) string { } func (h *handler) setup() { - h.clientPool = arvadosclient.MakeClientPool() + // Errors will be handled at the client pool. + arv, _ := arvados.NewClientFromConfig(h.Cluster) + h.clientPool = arvadosclient.MakeClientPoolWith(arv) - keepclient.RefreshServiceDiscoveryOnSIGHUP() - - h.healthHandler = &health.Handler{ - Token: h.Config.ManagementToken, - Prefix: "/_health/", - } + keepclient.DefaultBlockCache.MaxBlocks = h.Cluster.Collections.WebDAVCache.MaxBlockEntries // Even though we don't accept LOCK requests, every webdav // handler must have a non-nil LockSystem. @@ -101,6 +78,7 @@ func (h *handler) serveStatus(w http.ResponseWriter, r *http.Request) { // are ignored (all response writes return the update error). type updateOnSuccess struct { httpserver.ResponseWriter + logger logrus.FieldLogger update func() error sentHeader bool err error @@ -125,7 +103,7 @@ func (uos *updateOnSuccess) WriteHeader(code int) { if err, ok := uos.err.(*arvados.TransactionError); ok { code = err.StatusCode } - log.Printf("update() changes response to HTTP %d: %T %q", code, uos.err, uos.err) + uos.logger.WithError(uos.err).Errorf("update() returned error type %T, changing response to HTTP %d", uos.err, code) http.Error(uos.ResponseWriter, uos.err.Error(), code) return } @@ -135,23 +113,34 @@ func (uos *updateOnSuccess) WriteHeader(code int) { } var ( + corsAllowHeadersHeader = strings.Join([]string{ + "Authorization", "Content-Type", "Range", + // WebDAV request headers: + "Depth", "Destination", "If", "Lock-Token", "Overwrite", "Timeout", + }, ", ") writeMethod = map[string]bool{ - "COPY": true, - "DELETE": true, - "MKCOL": true, - "MOVE": true, - "PUT": true, - "RMCOL": true, + "COPY": true, + "DELETE": true, + "LOCK": true, + "MKCOL": true, + "MOVE": true, + "PROPPATCH": true, + "PUT": true, + "RMCOL": true, + "UNLOCK": true, } webdavMethod = map[string]bool{ - "COPY": true, - "DELETE": true, - "MKCOL": true, - "MOVE": true, - "OPTIONS": true, - "PROPFIND": true, - "PUT": true, - "RMCOL": true, + "COPY": true, + "DELETE": true, + "LOCK": true, + "MKCOL": true, + "MOVE": true, + "OPTIONS": true, + "PROPFIND": true, + "PROPPATCH": true, + "PUT": true, + "RMCOL": true, + "UNLOCK": true, } browserMethod = map[string]bool{ "GET": true, @@ -166,56 +155,50 @@ var ( } ) +func stripDefaultPort(host string) string { + // Will consider port 80 and port 443 to be the same vhost. I think that's fine. + u := &url.URL{Host: host} + if p := u.Port(); p == "80" || p == "443" { + return strings.ToLower(u.Hostname()) + } else { + return strings.ToLower(host) + } +} + +// CheckHealth implements service.Handler. +func (h *handler) CheckHealth() error { + return nil +} + +// Done implements service.Handler. +func (h *handler) Done() <-chan struct{} { + return nil +} + // 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 - - remoteAddr := r.RemoteAddr - if xff := r.Header.Get("X-Forwarded-For"); xff != "" { - remoteAddr = xff + "," + remoteAddr - } if xfp := r.Header.Get("X-Forwarded-Proto"); xfp != "" && xfp != "http" { r.URL.Scheme = xfp } w := httpserver.WrapResponseWriter(wOrig) - defer func() { - if statusCode == 0 { - statusCode = w.WroteStatus() - } else if w.WroteStatus() == 0 { - w.WriteHeader(statusCode) - } else if w.WroteStatus() != statusCode { - log.WithField("RequestID", r.Header.Get("X-Request-Id")).Warn( - fmt.Sprintf("Our status changed from %d to %d after we sent headers", w.WroteStatus(), statusCode)) - } - if statusText == "" { - statusText = http.StatusText(statusCode) - } - }() - - if strings.HasPrefix(r.URL.Path, "/_health/") && r.Method == "GET" { - h.healthHandler.ServeHTTP(w, r) - return - } if method := r.Header.Get("Access-Control-Request-Method"); method != "" && r.Method == "OPTIONS" { if !browserMethod[method] && !webdavMethod[method] { - statusCode = http.StatusMethodNotAllowed + w.WriteHeader(http.StatusMethodNotAllowed) return } - w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type, Range") - w.Header().Set("Access-Control-Allow-Methods", "COPY, DELETE, GET, MKCOL, MOVE, OPTIONS, POST, PROPFIND, PUT, RMCOL") + w.Header().Set("Access-Control-Allow-Headers", corsAllowHeadersHeader) + w.Header().Set("Access-Control-Allow-Methods", "COPY, DELETE, GET, LOCK, MKCOL, MOVE, OPTIONS, POST, PROPFIND, PROPPATCH, PUT, RMCOL, UNLOCK") w.Header().Set("Access-Control-Allow-Origin", "*") w.Header().Set("Access-Control-Max-Age", "86400") - statusCode = http.StatusOK return } if !browserMethod[r.Method] && !webdavMethod[r.Method] { - statusCode, statusText = http.StatusMethodNotAllowed, r.Method + w.WriteHeader(http.StatusMethodNotAllowed) return } @@ -229,6 +212,10 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { w.Header().Set("Access-Control-Expose-Headers", "Content-Range") } + if h.serveS3(w, r) { + return + } + pathParts := strings.Split(r.URL.Path[1:], "/") var stripParts int @@ -238,24 +225,27 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { var pathToken bool var attachment bool var useSiteFS bool - credentialsOK := h.Config.TrustAllContent + credentialsOK := h.Cluster.Collections.TrustAllContent + reasonNotAcceptingCredentials := "" - if r.Host != "" && r.Host == h.Config.AttachmentOnlyHost { + if r.Host != "" && stripDefaultPort(r.Host) == stripDefaultPort(h.Cluster.Services.WebDAVDownload.ExternalURL.Host) { credentialsOK = true attachment = true } else if r.FormValue("disposition") == "attachment" { attachment = true } - if collectionID = parseCollectionIDFromDNSName(r.Host); collectionID != "" { + if !credentialsOK { + reasonNotAcceptingCredentials = fmt.Sprintf("vhost %q does not specify a single collection ID or match Services.WebDAVDownload.ExternalURL %q, and Collections.TrustAllContent is false", + r.Host, h.Cluster.Services.WebDAVDownload.ExternalURL) + } + + if collectionID = arvados.CollectionIDFromDNSName(r.Host); collectionID != "" { // http://ID.collections.example/PATH... credentialsOK = true } else if r.URL.Path == "/status.json" { h.serveStatus(w, r) return - } else if strings.HasPrefix(r.URL.Path, "/metrics") { - h.MetricsAPI.ServeHTTP(w, r) - return } else if siteFSDir[pathParts[0]] { useSiteFS = true } else if len(pathParts) >= 1 && strings.HasPrefix(pathParts[0], "c=") { @@ -272,13 +262,17 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { } else { // /collections/ID/PATH... collectionID = parseCollectionIDFromURL(pathParts[1]) - tokens = h.Config.AnonymousTokens stripParts = 2 + // This path is only meant to work for public + // data. Tokens provided with the request are + // ignored. + credentialsOK = false + reasonNotAcceptingCredentials = "the '/collections/UUID/PATH' form only works for public data" } } if collectionID == "" && !useSiteFS { - statusCode = http.StatusNotFound + http.Error(w, notFoundMessage, http.StatusNotFound) return } @@ -287,37 +281,43 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { forceReload = true } + if credentialsOK { + reqTokens = auth.CredentialsFromRequest(r).Tokens + } + 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: + origin := r.Header.Get("Origin") + cors := origin != "" && !strings.HasSuffix(origin, "://"+r.Host) + safeAjax := cors && (r.Method == http.MethodGet || r.Method == http.MethodHead) + safeAttachment := attachment && r.URL.Query().Get("api_token") == "" + if formToken == "" { + // No token to use or redact. + } else if safeAjax || safeAttachment { + // If this is a cross-origin request, the URL won't + // appear in the browser's address bar, so + // substituting a clipboard-safe URL is pointless. + // Redirect-with-cookie wouldn't work anyway, because + // it's not safe to allow third-party use of our + // cookie. // - // * 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 != "" && browserMethod[r.Method] { - // 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 - // same URL with the query param redacted and method = - // GET. + // If we're supplying an attachment, we don't need to + // convert POST to GET to avoid the "really resubmit + // form?" problem, so provided the token isn't + // embedded in the URL, there's no reason to do + // redirect-with-cookie in this case either. + reqTokens = append(reqTokens, formToken) + } else if browserMethod[r.Method] { + // If this is a page view, and the client provided a + // token via query string or POST body, we must put + // the token in an HttpOnly cookie, and redirect to an + // equivalent URL with the query param redacted and + // method = GET. h.seeOtherWithCookie(w, r, "", credentialsOK) return } if useSiteFS { - if tokens == nil { - tokens = auth.NewCredentialsFromHTTPRequest(r).Tokens - } - h.serveSiteFS(w, r, tokens, credentialsOK, attachment) + h.serveSiteFS(w, r, reqTokens, credentialsOK, attachment) return } @@ -336,10 +336,19 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { } if tokens == nil { - if credentialsOK { - reqTokens = auth.NewCredentialsFromHTTPRequest(r).Tokens + tokens = reqTokens + if h.Cluster.Users.AnonymousUserToken != "" { + tokens = append(tokens, h.Cluster.Users.AnonymousUserToken) + } + } + + if tokens == nil { + if !credentialsOK { + http.Error(w, fmt.Sprintf("Authorization tokens are not accepted here: %v, and no anonymous user token is configured.", reasonNotAcceptingCredentials), http.StatusUnauthorized) + } else { + http.Error(w, fmt.Sprintf("No authorization token in request, and no anonymous user token is configured."), http.StatusUnauthorized) } - tokens = append(reqTokens, h.Config.AnonymousTokens...) + return } if len(targetPath) > 0 && targetPath[0] == "_" { @@ -355,16 +364,17 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { arv := h.clientPool.Get() if arv == nil { - statusCode, statusText = http.StatusInternalServerError, "Pool failed: "+h.clientPool.Err().Error() + http.Error(w, "client pool error: "+h.clientPool.Err().Error(), http.StatusInternalServerError) return } defer h.clientPool.Put(arv) var collection *arvados.Collection + var tokenUser *arvados.User tokenResult := make(map[string]int) for _, arv.ApiToken = range tokens { var err error - collection, err = h.Config.Cache.Get(arv, collectionID, forceReload) + collection, err = h.Cache.Get(arv, collectionID, forceReload) if err == nil { // Success break @@ -379,7 +389,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { } } // Something more serious is wrong - statusCode, statusText = http.StatusInternalServerError, err.Error() + http.Error(w, "cache error: "+err.Error(), http.StatusInternalServerError) return } if collection == nil { @@ -389,14 +399,14 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { // for additional credentials would just be // confusing), or we don't even accept // credentials at this path. - statusCode = http.StatusNotFound + http.Error(w, notFoundMessage, http.StatusNotFound) return } for _, t := range reqTokens { if tokenResult[t] == 404 { // The client provided valid token(s), but the // collection was not found. - statusCode = http.StatusNotFound + http.Error(w, notFoundMessage, http.StatusNotFound) return } } @@ -410,13 +420,13 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { // data that has been deleted. Allow a referrer to // provide this context somehow? w.Header().Add("WWW-Authenticate", "Basic realm=\"collections\"") - statusCode = http.StatusUnauthorized + http.Error(w, unauthorizedMessage, http.StatusUnauthorized) return } kc, err := keepclient.MakeKeepClient(arv) if err != nil { - statusCode, statusText = http.StatusInternalServerError, err.Error() + http.Error(w, "error setting up keep client: "+err.Error(), http.StatusInternalServerError) return } kc.RequestID = r.Header.Get("X-Request-Id") @@ -435,18 +445,28 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { fs, err := collection.FileSystem(client, kc) if err != nil { - statusCode, statusText = http.StatusInternalServerError, err.Error() + http.Error(w, "error creating collection filesystem: "+err.Error(), http.StatusInternalServerError) return } writefs, writeOK := fs.(arvados.CollectionFileSystem) targetIsPDH := arvadosclient.PDHMatch(collectionID) if (targetIsPDH || !writeOK) && writeMethod[r.Method] { - statusCode, statusText = http.StatusMethodNotAllowed, errReadOnly.Error() + http.Error(w, errReadOnly.Error(), http.StatusMethodNotAllowed) return } + // Check configured permission + _, sess, err := h.Cache.GetSession(arv.ApiToken) + tokenUser, err = h.Cache.GetTokenUser(arv.ApiToken) + if webdavMethod[r.Method] { + if !h.userPermittedToUploadOrDownload(r.Method, tokenUser) { + http.Error(w, "Not permitted", http.StatusForbidden) + return + } + h.logUploadOrDownload(r, sess.arvadosclient, nil, strings.Join(targetPath, "/"), collection, tokenUser) + if writeMethod[r.Method] { // Save the collection only if/when all // webdav->filesystem operations succeed -- @@ -454,8 +474,9 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { // collection can't be saved. w = &updateOnSuccess{ ResponseWriter: w, + logger: ctxlog.FromContext(r.Context()), update: func() error { - return h.Config.Cache.Update(client, *collection, writefs) + return h.Cache.Update(client, *collection, writefs) }} } h := webdav.Handler{ @@ -468,7 +489,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { LockSystem: h.webdavLS, Logger: func(_ *http.Request, err error) { if err != nil { - log.Printf("error from webdav handler: %q", err) + ctxlog.FromContext(r.Context()).WithError(err).Error("error reported by webdav handler") } }, } @@ -477,15 +498,20 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { } openPath := "/" + strings.Join(targetPath, "/") - if f, err := fs.Open(openPath); os.IsNotExist(err) { + f, err := fs.Open(openPath) + if os.IsNotExist(err) { // Requested non-existent path - statusCode = http.StatusNotFound + http.Error(w, notFoundMessage, http.StatusNotFound) + return } else if err != nil { // Some other (unexpected) error - statusCode, statusText = http.StatusInternalServerError, err.Error() - } else if stat, err := f.Stat(); err != nil { + http.Error(w, "open: "+err.Error(), http.StatusInternalServerError) + return + } + defer f.Close() + if stat, err := f.Stat(); err != nil { // Can't get Size/IsDir (shouldn't happen with a collectionFS!) - statusCode, statusText = http.StatusInternalServerError, err.Error() + http.Error(w, "stat: "+err.Error(), http.StatusInternalServerError) } else if stat.IsDir() && !strings.HasSuffix(r.URL.Path, "/") { // If client requests ".../dirname", redirect to // ".../dirname/". This way, relative links in the @@ -495,50 +521,64 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { } else if stat.IsDir() { h.serveDirectory(w, r, collection.Name, fs, openPath, true) } else { + if !h.userPermittedToUploadOrDownload(r.Method, tokenUser) { + http.Error(w, "Not permitted", http.StatusForbidden) + return + } + h.logUploadOrDownload(r, sess.arvadosclient, nil, strings.Join(targetPath, "/"), collection, tokenUser) + http.ServeContent(w, r, basename, stat.ModTime(), f) - if r.Header.Get("Range") == "" && int64(w.WroteBodyBytes()) != stat.Size() { + if wrote := int64(w.WroteBodyBytes()); wrote != stat.Size() && w.WroteStatus() == http.StatusOK { // If we wrote fewer bytes than expected, it's // too late to change the real response code // or send an error message to the client, but // at least we can try to put some useful // debugging info in the logs. n, err := f.Read(make([]byte, 1024)) - statusCode, statusText = http.StatusInternalServerError, fmt.Sprintf("f.Size()==%d but only wrote %d bytes; read(1024) returns %d, %s", stat.Size(), w.WroteBodyBytes(), n, err) - + ctxlog.FromContext(r.Context()).Errorf("stat.Size()==%d but only wrote %d bytes; read(1024) returns %d, %v", stat.Size(), wrote, n, err) } } } +func (h *handler) getClients(reqID, token string) (arv *arvadosclient.ArvadosClient, kc *keepclient.KeepClient, client *arvados.Client, release func(), err error) { + arv = h.clientPool.Get() + if arv == nil { + err = h.clientPool.Err() + return + } + release = func() { h.clientPool.Put(arv) } + arv.ApiToken = token + kc, err = keepclient.MakeKeepClient(arv) + if err != nil { + release() + return + } + kc.RequestID = reqID + client = (&arvados.Client{ + APIHost: arv.ApiServer, + AuthToken: arv.ApiToken, + Insecure: arv.ApiInsecure, + }).WithRequestID(reqID) + return +} + func (h *handler) serveSiteFS(w http.ResponseWriter, r *http.Request, tokens []string, credentialsOK, attachment bool) { if len(tokens) == 0 { w.Header().Add("WWW-Authenticate", "Basic realm=\"collections\"") - http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized) + http.Error(w, unauthorizedMessage, http.StatusUnauthorized) return } if writeMethod[r.Method] { http.Error(w, errReadOnly.Error(), http.StatusMethodNotAllowed) return } - arv := h.clientPool.Get() - if arv == nil { - http.Error(w, "Pool failed: "+h.clientPool.Err().Error(), http.StatusInternalServerError) - return - } - defer h.clientPool.Put(arv) - arv.ApiToken = tokens[0] - kc, err := keepclient.MakeKeepClient(arv) + fs, sess, err := h.Cache.GetSession(tokens[0]) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - kc.RequestID = r.Header.Get("X-Request-Id") - client := (&arvados.Client{ - APIHost: arv.ApiServer, - AuthToken: arv.ApiToken, - Insecure: arv.ApiInsecure, - }).WithRequestID(r.Header.Get("X-Request-Id")) - fs := client.SiteFileSystem(kc) + fs.ForwardSlashNameSubstitution(h.Cluster.Collections.ForwardSlashNameSubstitution) f, err := fs.Open(r.URL.Path) if os.IsNotExist(err) { http.Error(w, err.Error(), http.StatusNotFound) @@ -556,6 +596,14 @@ func (h *handler) serveSiteFS(w http.ResponseWriter, r *http.Request, tokens []s } return } + + tokenUser, err := h.Cache.GetTokenUser(tokens[0]) + if !h.userPermittedToUploadOrDownload(r.Method, tokenUser) { + http.Error(w, "Not permitted", http.StatusForbidden) + return + } + h.logUploadOrDownload(r, sess.arvadosclient, fs, r.URL.Path, nil, tokenUser) + if r.Method == "GET" { _, basename := filepath.Split(r.URL.Path) applyContentDispositionHdr(w, r, basename, attachment) @@ -570,7 +618,7 @@ func (h *handler) serveSiteFS(w http.ResponseWriter, r *http.Request, tokens []s LockSystem: h.webdavLS, Logger: func(_ *http.Request, err error) { if err != nil { - log.Printf("error from webdav handler: %q", err) + ctxlog.FromContext(r.Context()).WithError(err).Error("error reported by webdav handler") } }, } @@ -684,7 +732,7 @@ func (h *handler) serveDirectory(w http.ResponseWriter, r *http.Request, collect return nil } if err := walk(""); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + http.Error(w, "error getting directory listing: "+err.Error(), http.StatusInternalServerError) return } @@ -695,7 +743,7 @@ func (h *handler) serveDirectory(w http.ResponseWriter, r *http.Request, collect } tmpl, err := template.New("dir").Funcs(funcs).Parse(dirListingTemplate) if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) + http.Error(w, "error parsing template: "+err.Error(), http.StatusInternalServerError) return } sort.Slice(files, func(i, j int) bool { @@ -735,7 +783,7 @@ func (h *handler) seeOtherWithCookie(w http.ResponseWriter, r *http.Request, loc // into a cookie unless the current vhost // (origin) serves only a single collection or // we are in TrustAllContent mode. - w.WriteHeader(http.StatusBadRequest) + http.Error(w, "cannot serve inline content at this URL (possible configuration error; see https://doc.arvados.org/install/install-keep-web.html#dns)", http.StatusBadRequest) return } @@ -755,6 +803,7 @@ func (h *handler) seeOtherWithCookie(w http.ResponseWriter, r *http.Request, loc Value: auth.EncodeTokenCookie([]byte(formToken)), Path: "/", HttpOnly: true, + SameSite: http.SameSiteLaxMode, }) } @@ -767,7 +816,7 @@ func (h *handler) seeOtherWithCookie(w http.ResponseWriter, r *http.Request, loc if location != "" { newu, err := u.Parse(location) if err != nil { - w.WriteHeader(http.StatusInternalServerError) + http.Error(w, "error resolving redirect target: "+err.Error(), http.StatusInternalServerError) return } u = newu @@ -785,3 +834,125 @@ func (h *handler) seeOtherWithCookie(w http.ResponseWriter, r *http.Request, loc io.WriteString(w, html.EscapeString(redir)) io.WriteString(w, `">Continue`) } + +func (h *handler) userPermittedToUploadOrDownload(method string, tokenUser *arvados.User) bool { + var permitDownload bool + var permitUpload bool + if tokenUser != nil && tokenUser.IsAdmin { + permitUpload = h.Cluster.Collections.WebDAVPermission.Admin.Upload + permitDownload = h.Cluster.Collections.WebDAVPermission.Admin.Download + } else { + permitUpload = h.Cluster.Collections.WebDAVPermission.User.Upload + permitDownload = h.Cluster.Collections.WebDAVPermission.User.Download + } + if (method == "PUT" || method == "POST") && !permitUpload { + // Disallow operations that upload new files. + // Permit webdav operations that move existing files around. + return false + } else if method == "GET" && !permitDownload { + // Disallow downloading file contents. + // Permit webdav operations like PROPFIND that retrieve metadata + // but not file contents. + return false + } + return true +} + +func (h *handler) logUploadOrDownload( + r *http.Request, + client *arvadosclient.ArvadosClient, + fs arvados.CustomFileSystem, + filepath string, + collection *arvados.Collection, + user *arvados.User) { + + log := ctxlog.FromContext(r.Context()) + props := make(map[string]string) + props["reqPath"] = r.URL.Path + var useruuid string + if user != nil { + log = log.WithField("user_uuid", user.UUID). + WithField("user_full_name", user.FullName) + useruuid = user.UUID + } else { + useruuid = fmt.Sprintf("%s-tpzed-anonymouspublic", h.Cluster.ClusterID) + } + if collection == nil && fs != nil { + collection, filepath = h.determineCollection(fs, filepath) + } + if collection != nil { + log = log.WithField("collection_uuid", collection.UUID). + WithField("collection_file_path", filepath) + props["collection_uuid"] = collection.UUID + props["collection_file_path"] = filepath + // h.determineCollection populates the collection_uuid prop with the PDH, if + // this collection is being accessed via PDH. In that case, blank the + // collection_uuid field so that consumers of the log entries can rely on it + // being a UUID, or blank. The PDH remains available via the + // portable_data_hash property. + if props["collection_uuid"] == collection.PortableDataHash { + props["collection_uuid"] = "" + } + } + if r.Method == "PUT" || r.Method == "POST" { + log.Info("File upload") + if h.Cluster.Collections.WebDAVLogEvents { + go func() { + lr := arvadosclient.Dict{"log": arvadosclient.Dict{ + "object_uuid": useruuid, + "event_type": "file_upload", + "properties": props}} + err := client.Create("logs", lr, nil) + if err != nil { + log.WithError(err).Error("Failed to create upload log event on API server") + } + }() + } + } else if r.Method == "GET" { + if collection != nil && collection.PortableDataHash != "" { + log = log.WithField("portable_data_hash", collection.PortableDataHash) + props["portable_data_hash"] = collection.PortableDataHash + } + log.Info("File download") + if h.Cluster.Collections.WebDAVLogEvents { + go func() { + lr := arvadosclient.Dict{"log": arvadosclient.Dict{ + "object_uuid": useruuid, + "event_type": "file_download", + "properties": props}} + err := client.Create("logs", lr, nil) + if err != nil { + log.WithError(err).Error("Failed to create download log event on API server") + } + }() + } + } +} + +func (h *handler) determineCollection(fs arvados.CustomFileSystem, path string) (*arvados.Collection, string) { + segments := strings.Split(path, "/") + var i int + for i = 0; i < len(segments); i++ { + dir := append([]string{}, segments[0:i]...) + dir = append(dir, ".arvados#collection") + f, err := fs.OpenFile(strings.Join(dir, "/"), os.O_RDONLY, 0) + if f != nil { + defer f.Close() + } + if err != nil { + if !os.IsNotExist(err) { + return nil, "" + } + continue + } + // err is nil so we found it. + decoder := json.NewDecoder(f) + var collection arvados.Collection + err = decoder.Decode(&collection) + if err != nil { + return nil, "" + } + return &collection, strings.Join(segments[i:], "/") + } + return nil, "" +}