projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18947: Bring back keepproxy systemd unit file.
[arvados.git]
/
services
/
keep-web
/
s3.go
diff --git
a/services/keep-web/s3.go
b/services/keep-web/s3.go
index 357c42ae6caee6e84f15c2c20d0f2ac754caa911..5af7ebb5d52cfe17022ce46ed1e50fed507ca93f 100644
(file)
--- 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)
}
tokenUser, err := h.Config.Cache.GetTokenUser(token)
- if !h.
U
serPermittedToUploadOrDownload(r.Method, tokenUser) {
+ if !h.
u
serPermittedToUploadOrDownload(r.Method, tokenUser) {
http.Error(w, "Not permitted", http.StatusForbidden)
return true
}
http.Error(w, "Not permitted", http.StatusForbidden)
return true
}
- h.
L
ogUploadOrDownload(r, arvclient, fs, fspath, nil, tokenUser)
+ h.
l
ogUploadOrDownload(r, arvclient, fs, fspath, nil, tokenUser)
// shallow copy r, and change URL path
r := *r
// shallow copy r, and change URL path
r := *r
@@
-471,7
+471,7
@@
func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool {
return true
}
err = fs.Mkdir(dir, 0755)
return true
}
err = fs.Mkdir(dir, 0755)
- if err
== arvados.ErrInvalidArgument
{
+ if err
ors.Is(err, arvados.ErrInvalidArgument) || errors.Is(err, arvados.ErrInvalidOperation)
{
// Cannot create a directory
// here.
err = fmt.Errorf("mkdir %q failed: %w", dir, err)
// Cannot create a directory
// here.
err = fmt.Errorf("mkdir %q failed: %w", dir, err)
@@
-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)
defer f.Close()
tokenUser, err := h.Config.Cache.GetTokenUser(token)
- if !h.
U
serPermittedToUploadOrDownload(r.Method, tokenUser) {
+ if !h.
u
serPermittedToUploadOrDownload(r.Method, tokenUser) {
http.Error(w, "Not permitted", http.StatusForbidden)
return true
}
http.Error(w, "Not permitted", http.StatusForbidden)
return true
}
- h.
L
ogUploadOrDownload(r, arvclient, fs, fspath, nil, tokenUser)
+ h.
l
ogUploadOrDownload(r, arvclient, fs, fspath, nil, tokenUser)
_, err = io.Copy(f, r.Body)
if err != nil {
_, err = io.Copy(f, r.Body)
if err != nil {