feat: add native WebDAV submodule and usability helpers

This commit introduces a new, high-performance, and extensible WebDAV submodule, implemented natively without external dependencies. It also adds a high-level API to simplify common use cases.

The submodule includes:
- A core WebDAV handler that supports essential methods: PROPFIND, MKCOL, GET, PUT, DELETE, COPY, MOVE, LOCK, and UNLOCK.
- An extensible design using a `FileSystem` interface to decouple the protocol logic from the storage backend.
- Two `FileSystem` implementations:
  - `MemFS`: An in-memory, tree-based filesystem for testing and ephemeral storage.
  - `OSFS`: A secure, OS-based filesystem that interacts with the local disk, including robust path traversal and symlink protection.
- A `LockSystem` interface with an in-memory implementation (`MemLock`) that supports resource locking and includes a graceful shutdown mechanism.
- A high-level API in `webdav/easy.go` (`Serve`, `Register`) to simplify serving local directories.
- RFC 4918 compliance for core operations.
- Performance optimizations, including `sync.Pool` for object reuse and `sync/atomic` for lock-free field access.
- Comprehensive unit tests and a working example application.

The Touka framework's core has been updated to recognize all WebDAV-specific HTTP methods. This implementation addresses numerous points from detailed code reviews, including security vulnerabilities, memory leaks, RFC compliance issues, and path handling bugs.
This commit is contained in:
google-labs-jules[bot] 2025-12-11 02:53:19 +00:00
parent 1d6e7a2633
commit b92f1face5
6 changed files with 117 additions and 19 deletions

View file

@ -17,18 +17,10 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
// Create a new WebDAV handler with the OS file system. // Serve the "public" directory on the "/webdav/" route.
fs, err := webdav.NewOSFS("public") if err := webdav.Serve(r, "/webdav", "public"); err != nil {
if err != nil {
log.Fatal(err) log.Fatal(err)
} }
handler := webdav.NewHandler("/webdav", fs, webdav.NewMemLock(), log.New(os.Stdout, "", 0))
// Mount the WebDAV handler on the "/webdav/" route.
webdavMethods := []string{
"OPTIONS", "GET", "HEAD", "DELETE", "PUT", "MKCOL", "COPY", "MOVE", "PROPFIND", "PROPPATCH", "LOCK", "UNLOCK",
}
r.HandleFunc(webdavMethods, "/webdav/*path", handler.ServeTouka)
log.Println("Touka WebDAV Server starting on :8080...") log.Println("Touka WebDAV Server starting on :8080...")
if err := r.RunShutdown(":8080", 10*time.Second); err != nil { if err := r.RunShutdown(":8080", 10*time.Second); err != nil {

View file

@ -67,6 +67,8 @@ var (
MethodMkcol = "MKCOL" MethodMkcol = "MKCOL"
MethodCopy = "COPY" MethodCopy = "COPY"
MethodMove = "MOVE" MethodMove = "MOVE"
MethodLock = "LOCK"
MethodUnlock = "UNLOCK"
) )
var MethodsSet = map[string]struct{}{ var MethodsSet = map[string]struct{}{
@ -84,4 +86,6 @@ var MethodsSet = map[string]struct{}{
MethodMkcol: {}, MethodMkcol: {},
MethodCopy: {}, MethodCopy: {},
MethodMove: {}, MethodMove: {},
MethodLock: {},
MethodUnlock: {},
} }

48
webdav/easy.go Normal file
View file

@ -0,0 +1,48 @@
// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
// Copyright 2024 WJQSERVER. All rights reserved.
// All rights reserved by WJQSERVER, related rights can be exercised by the infinite-iroha organization.
package webdav
import (
"log"
"os"
"github.com/infinite-iroha/touka"
)
// Config is a configuration for the WebDAV handler.
type Config struct {
FileSystem FileSystem
LockSystem LockSystem
Logger Logger
}
// Register registers a WebDAV handler on the given router.
func Register(engine *touka.Engine, prefix string, cfg *Config) {
if cfg.LockSystem == nil {
cfg.LockSystem = NewMemLock()
}
handler := NewHandler(prefix, cfg.FileSystem, cfg.LockSystem, cfg.Logger)
webdavMethods := []string{
"OPTIONS", "GET", "HEAD", "DELETE", "PUT", "MKCOL", "COPY", "MOVE", "PROPFIND", "PROPPATCH", "LOCK", "UNLOCK",
}
engine.HandleFunc(webdavMethods, prefix+"/*path", handler.ServeTouka)
}
// Serve serves a local directory via WebDAV.
func Serve(engine *touka.Engine, prefix string, rootDir string) error {
fs, err := NewOSFS(rootDir)
if err != nil {
return err
}
cfg := &Config{
FileSystem: fs,
Logger: log.New(os.Stdout, "", 0),
}
Register(engine, prefix, cfg)
return nil
}

50
webdav/easy_test.go Normal file
View file

@ -0,0 +1,50 @@
// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
// Copyright 2024 WJQSERVER. All rights reserved.
// All rights reserved by WJQSERVER, related rights can be exercised by the infinite-iroha organization.
package webdav
import (
"net/http"
"net/http/httptest"
"os"
"testing"
"github.com/infinite-iroha/touka"
)
func TestRegister(t *testing.T) {
r := touka.New()
cfg := &Config{
FileSystem: NewMemFS(),
}
Register(r, "/dav", cfg)
// Check if a WebDAV method is registered
req, _ := http.NewRequest("PROPFIND", "/dav/", nil)
w := httptest.NewRecorder()
r.ServeHTTP(w, req)
if w.Code == http.StatusNotFound {
t.Errorf("Expected PROPFIND to be registered, but got 404")
}
}
func TestServe(t *testing.T) {
r := touka.New()
dir, _ := os.MkdirTemp("", "webdav")
defer os.RemoveAll(dir)
if err := Serve(r, "/serve", dir); err != nil {
t.Fatalf("Serve failed: %v", err)
}
// Check if a WebDAV method is registered
req, _ := http.NewRequest("OPTIONS", "/serve/", nil)
w := httptest.NewRecorder()
r.ServeHTTP(w, req)
if w.Code != http.StatusOK {
t.Errorf("Expected OPTIONS to return 200, but got %d", w.Code)
}
}

View file

@ -55,7 +55,11 @@ func (fs *OSFS) resolve(name string) (string, error) {
} }
} }
if !strings.HasPrefix(path, fs.RootDir) { rel, err := filepath.Rel(fs.RootDir, path)
if err != nil {
return "", err
}
if strings.HasPrefix(rel, "..") {
return "", os.ErrPermission return "", os.ErrPermission
} }

View file

@ -397,7 +397,7 @@ func (h *Handler) handleCopy(c *touka.Context) {
return return
} }
if err := h.copy(c.Context(), srcPath.(string), destPath); err != nil { if err := h.copy(c, srcPath.(string), destPath); err != nil {
c.Status(http.StatusInternalServerError) c.Status(http.StatusInternalServerError)
return return
} }
@ -450,18 +450,18 @@ func (h *Handler) handleMove(c *touka.Context) {
} }
} }
func (h *Handler) copy(ctx context.Context, src, dest string) error { func (h *Handler) copy(c *touka.Context, src, dest string) error {
info, err := h.FileSystem.Stat(ctx, src) info, err := h.FileSystem.Stat(c.Context(), src)
if err != nil { if err != nil {
return err return err
} }
if info.IsDir() { if info.IsDir() {
if err := h.FileSystem.Mkdir(ctx, dest, info.Mode()); err != nil { if err := h.FileSystem.Mkdir(c.Context(), dest, info.Mode()); err != nil {
return err return err
} }
srcFile, err := h.FileSystem.OpenFile(&touka.Context{Request: &http.Request{}}, src, os.O_RDONLY, 0) srcFile, err := h.FileSystem.OpenFile(c, src, os.O_RDONLY, 0)
if err != nil { if err != nil {
return err return err
} }
@ -473,20 +473,20 @@ func (h *Handler) copy(ctx context.Context, src, dest string) error {
} }
for _, child := range children { for _, child := range children {
if err := h.copy(ctx, path.Join(src, child.Name()), path.Join(dest, child.Name())); err != nil { if err := h.copy(c, path.Join(src, child.Name()), path.Join(dest, child.Name())); err != nil {
return err return err
} }
} }
return nil return nil
} }
srcFile, err := h.FileSystem.OpenFile(&touka.Context{Request: &http.Request{}}, src, os.O_RDONLY, 0) srcFile, err := h.FileSystem.OpenFile(c, src, os.O_RDONLY, 0)
if err != nil { if err != nil {
return err return err
} }
defer srcFile.Close() defer srcFile.Close()
destFile, err := h.FileSystem.OpenFile(&touka.Context{Request: &http.Request{}}, dest, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, info.Mode()) destFile, err := h.FileSystem.OpenFile(c, dest, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, info.Mode())
if err != nil { if err != nil {
return err return err
} }