feat: enforce folder download policy

This commit is contained in:
OpenClaw Agent
2026-09-21 23:35:11 +08:00
parent 99f6236ff9
commit 1913375251
3 changed files with 78 additions and 1 deletions
+1 -1
View File
@@ -89,7 +89,7 @@ func main() {
if len(cfg.Path) == 1 { if len(cfg.Path) == 1 {
store = storage.Local{Root: root} store = storage.Local{Root: root}
} }
srv := &api.Server{Store: store, Auth: mgr, Sessions: map[string]*auth.Account{}, SessionExpiry: map[string]time.Time{}, SessionTimeout: cfg.SessionTimeout, WebDAVRoot: root, Allow: cfg.Allow, MultiRoot: len(cfg.Path) > 1, RemoveMode: cfg.FileRemove, ImagePreview: cfg.ImagePreview, Log: opslog.New(cfg.Log)} srv := &api.Server{Store: store, Auth: mgr, Sessions: map[string]*auth.Account{}, SessionExpiry: map[string]time.Time{}, SessionTimeout: cfg.SessionTimeout, WebDAVRoot: root, Allow: cfg.Allow, MultiRoot: len(cfg.Path) > 1, RemoveMode: cfg.FileRemove, ImagePreview: cfg.ImagePreview, FolderDownload: cfg.FolderDownload, Log: opslog.New(cfg.Log)}
addr := ":" + itoa(cfg.Port) addr := ":" + itoa(cfg.Port)
log.Printf("chfs-ng listening on %s root=%s removeMode=%d", addr, filepath.Clean(root), cfg.FileRemove) log.Printf("chfs-ng listening on %s root=%s removeMode=%d", addr, filepath.Clean(root), cfg.FileRemove)
if cfg.SSLCert != "" && cfg.SSLKey != "" { if cfg.SSLCert != "" && cfg.SSLKey != "" {
@@ -0,0 +1,55 @@
package api
import (
"net/http"
"net/http/httptest"
"os"
"path/filepath"
"testing"
"chfs-ng/internal/auth"
"chfs-ng/internal/storage"
)
func TestFolderDownloadModes(t *testing.T) {
root := t.TempDir()
if err := os.MkdirAll(filepath.Join(root, "parent", "child"), 0o755); err != nil {
t.Fatal(err)
}
for _, p := range []string{
filepath.Join(root, "parent", "a.txt"),
filepath.Join(root, "parent", "child", "b.txt"),
} {
if err := os.WriteFile(p, []byte("x"), 0o644); err != nil {
t.Fatal(err)
}
}
mk := func(mode string) *Server {
return &Server{
Store: storage.Local{Root: root},
Auth: &auth.Manager{
Accounts: map[string]*auth.Account{},
Guest: &auth.Account{Mask: auth.Read | auth.Write | auth.Delete},
},
FolderDownload: mode,
}
}
for _, tc := range []struct {
mode, path string
want int
}{
{"disable", "parent", http.StatusForbidden},
{"leaf", "parent", http.StatusForbidden},
{"leaf", "parent/child", http.StatusOK},
{"enable", "parent", http.StatusOK},
} {
t.Run(tc.mode+"-"+tc.path, func(t *testing.T) {
req := httptest.NewRequest(http.MethodGet, "/chfs/downloaddir/"+tc.path, nil)
w := httptest.NewRecorder()
mk(tc.mode).Handler().ServeHTTP(w, req)
if w.Code != tc.want {
t.Fatalf("status=%d want=%d body=%s", w.Code, tc.want, w.Body.String())
}
})
}
}
+22
View File
@@ -43,6 +43,7 @@ type Server struct {
MultiRoot bool MultiRoot bool
RemoveMode int RemoveMode int
ImagePreview bool ImagePreview bool
FolderDownload string
Log *opslog.Logger Log *opslog.Logger
} }
type fileInfo struct { type fileInfo struct {
@@ -815,6 +816,27 @@ func (s *Server) downloadDir(w http.ResponseWriter, r *http.Request) {
http.NotFound(w, r) http.NotFound(w, r)
return return
} }
mode := strings.ToLower(strings.TrimSpace(s.FolderDownload))
if mode == "" {
mode = "enable"
}
if mode == "disable" || mode == "false" || mode == "0" {
writeJSONError(w, http.StatusForbidden, "folder download disabled")
return
}
if mode == "leaf" {
items, err := s.Store.List(p)
if err != nil {
http.Error(w, err.Error(), 500)
return
}
for _, item := range items {
if item.IsDir() {
writeJSONError(w, http.StatusForbidden, "folder download is only available for leaf directories")
return
}
}
}
name := fi.Name() name := fi.Name()
if name == "." || name == "" { if name == "." || name == "" {
name = "download" name = "download"