18122: Fix "get collection by pdh" when manifest_text is unselected.
[arvados.git] / services / keep-web / s3.go
index 357c42ae6caee6e84f15c2c20d0f2ac754caa911..e6262374d640f9ed526ef38c816fa785bce1d3d5 100644 (file)
@@ -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, fs, fspath, 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, fs, fspath, nil, tokenUser)
+                       h.logUploadOrDownload(r, arvclient, fs, fspath, nil, tokenUser)
 
                        _, err = io.Copy(f, r.Body)
                        if err != nil {