X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/834ba51d22fa93297e66c60c3eb51cc1cf05fccc..7563e6276baade41eb3faa3ff167abab1cb0f890:/services/keep-web/s3.go diff --git a/services/keep-web/s3.go b/services/keep-web/s3.go index 6a0c943311..e6262374d6 100644 --- a/services/keep-web/s3.go +++ b/services/keep-web/s3.go @@ -406,11 +406,11 @@ func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool { } tokenUser, err := h.Config.Cache.GetTokenUser(token) - if !h.UserPermittedToUploadOrDownload(r.Method, tokenUser) { + if !h.userPermittedToUploadOrDownload(r.Method, tokenUser) { http.Error(w, "Not permitted", http.StatusForbidden) return true } - h.LogUploadOrDownload(r, arvclient, nil, tokenUser) + h.logUploadOrDownload(r, arvclient, fs, fspath, nil, tokenUser) // shallow copy r, and change URL path r := *r @@ -497,11 +497,11 @@ func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool { defer f.Close() tokenUser, err := h.Config.Cache.GetTokenUser(token) - if !h.UserPermittedToUploadOrDownload(r.Method, tokenUser) { + if !h.userPermittedToUploadOrDownload(r.Method, tokenUser) { http.Error(w, "Not permitted", http.StatusForbidden) return true } - h.LogUploadOrDownload(r, arvclient, nil, tokenUser) + h.logUploadOrDownload(r, arvclient, fs, fspath, nil, tokenUser) _, err = io.Copy(f, r.Body) if err != nil {