maal/go-webdav
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

webdav: remove path from LocalFileSystem path errors

Browse Source 
We don't want to show local paths in error messages.

`os.Is*` calls were replaced with `errors.Is` to also match the new
wrapped error.
This commit is contained in:
krystiancha
2025-03-05 08:48:59 +01:00
committed by GitHub
parent 002c347f47
commit b689d5daff
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs_local.go
View File

@@ -2,8 +2,10 @@ package webdav
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"io" "io"
"io/fs"
"mime" "mime"
"net/http" "net/http"
"os" "os"
@@ -64,11 +66,17 @@ func fileInfoFromOS(p string, fi os.FileInfo) *FileInfo {
} }
func errFromOS(err error) error { func errFromOS(err error) error {
if os.IsNotExist(err) { // Remove path from path errors so it's not returned to the user
var perr *fs.PathError
if errors.As(err, &perr) {
err = fmt.Errorf("%s: %w", perr.Op, perr.Err)
}
if errors.Is(err, fs.ErrNotExist) {
return NewHTTPError(http.StatusNotFound, err) return NewHTTPError(http.StatusNotFound, err)
} else if os.IsPermission(err) { } else if errors.Is(err, fs.ErrPermission) {
return NewHTTPError(http.StatusForbidden, err) return NewHTTPError(http.StatusForbidden, err)
} else if os.IsTimeout(err) { } else if errors.Is(err, os.ErrDeadlineExceeded) {
return NewHTTPError(http.StatusServiceUnavailable, err) return NewHTTPError(http.StatusServiceUnavailable, err)
} else { } else {
return err return err