arnefandCopilot
b4644bc590
- Root handler now only serves the welcome page for GET/HEAD; all other methods (e.g. OPTIONS, PROPFIND) return 405 with an Allow header instead of always returning 200, fixing client capability probes and PROPFIND misbehavior. - Mount /files/ properly and cache one xwebdav.Handler per authenticated user so its LockSystem persists across requests instead of being recreated per-request (which broke LOCK/UNLOCK). - Remove the username segment from all DAV URLs (/cal/, /card/, /files/ are now identical for every account; the acting user is always resolved via Basic Auth, never the path). - Reintroduce a fixed literal "home" path segment (/cal/home/, /card/home/) to preserve the URL segment depth that go-webdav's caldav/carddav server relies on to classify resources (principal vs. home-set vs. collection vs. object). Removing the username had collapsed this depth, silently misclassifying requests and returning empty <multistatus> responses (DAVx5 "no resources found"). - Replace the store's single global mutex with per-user sharded locks so different users' requests no longer serialize against each other. - Add auth.NewContext test helper, WebDAV handler tests (per-user isolation, lock persistence across requests), and a concurrent multi-user store test. - Update README and copilot-instructions to document the new URL scheme and the go-webdav path-depth classification quirk. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
73 lines
2.0 KiB
Go
73 lines
2.0 KiB
Go
package filewebdav
|
|
|
|
import (
|
|
"log/slog"
|
|
"net/http"
|
|
"os"
|
|
"path/filepath"
|
|
"sync"
|
|
|
|
"github.com/yourusername/caldav-server/internal/auth"
|
|
"github.com/yourusername/caldav-server/internal/config"
|
|
xwebdav "golang.org/x/net/webdav"
|
|
)
|
|
|
|
// NewHandler returns an http.Handler that provides standard WebDAV file access,
|
|
// mounted at the fixed URL /files/ for every user and rooted at
|
|
// dataDir/files/<username>/ on disk. The URL is the same for all users —
|
|
// which user's directory is served is resolved from the Basic Auth identity
|
|
// in the request context, not from the URL.
|
|
//
|
|
// A dedicated xwebdav.Handler (with its own persistent LockSystem) is created
|
|
// once per user and cached, so LOCK/UNLOCK state survives across requests
|
|
// instead of being reset on every call.
|
|
func NewHandler(cfg *config.Config, dataDir string, logger *slog.Logger) http.Handler {
|
|
var (
|
|
mu sync.Mutex
|
|
handlers = make(map[string]http.Handler)
|
|
)
|
|
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
p := auth.FromContext(r.Context())
|
|
if p == nil {
|
|
w.WriteHeader(http.StatusUnauthorized)
|
|
return
|
|
}
|
|
|
|
mu.Lock()
|
|
h, ok := handlers[p.Username]
|
|
if !ok {
|
|
username := p.Username
|
|
userDir := filepath.Join(dataDir, "files", username)
|
|
if err := os.MkdirAll(userDir, 0o755); err != nil {
|
|
mu.Unlock()
|
|
logger.Error("creating user WebDAV dir", "user", username, "error", err)
|
|
http.Error(w, "internal server error", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
// Each user gets their own isolated WebDAV handler (and lock
|
|
// system) so paths and locks don't bleed between users, even
|
|
// though they all share the same "/files/" URL.
|
|
h = &xwebdav.Handler{
|
|
FileSystem: xwebdav.Dir(userDir),
|
|
LockSystem: xwebdav.NewMemLS(),
|
|
Logger: func(r *http.Request, err error) {
|
|
if err != nil {
|
|
logger.Warn("WebDAV error",
|
|
"user", username,
|
|
"method", r.Method,
|
|
"path", r.URL.Path,
|
|
"error", err)
|
|
}
|
|
},
|
|
Prefix: "/files",
|
|
}
|
|
handlers[username] = h
|
|
}
|
|
mu.Unlock()
|
|
|
|
h.ServeHTTP(w, r)
|
|
})
|
|
}
|