mirror of
https://github.com/infinite-iroha/touka.git
synced 2026-02-02 16:31:11 +08:00
Compare commits
4 commits
b92f1face5
...
0ed9fa3290
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ed9fa3290 | ||
|
|
5b41381ac9 | ||
|
|
26cbf45074 | ||
|
|
290878be05 |
7 changed files with 70 additions and 28 deletions
|
|
@ -18,9 +18,11 @@ func main() {
|
|||
}
|
||||
|
||||
// Serve the "public" directory on the "/webdav/" route.
|
||||
if err := webdav.Serve(r, "/webdav", "public"); err != nil {
|
||||
closer, err := webdav.Serve(r, "/webdav", "public")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
defer closer.Close()
|
||||
|
||||
log.Println("Touka WebDAV Server starting on :8080...")
|
||||
if err := r.RunShutdown(":8080", 10*time.Second); err != nil {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
package webdav
|
||||
|
||||
import (
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
|
|
@ -20,10 +21,6 @@ type Config struct {
|
|||
|
||||
// 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{
|
||||
|
|
@ -33,16 +30,18 @@ func Register(engine *touka.Engine, prefix string, cfg *Config) {
|
|||
}
|
||||
|
||||
// Serve serves a local directory via WebDAV.
|
||||
func Serve(engine *touka.Engine, prefix string, rootDir string) error {
|
||||
func Serve(engine *touka.Engine, prefix string, rootDir string) (io.Closer, error) {
|
||||
fs, err := NewOSFS(rootDir)
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ls := NewMemLock()
|
||||
cfg := &Config{
|
||||
FileSystem: fs,
|
||||
LockSystem: ls,
|
||||
Logger: log.New(os.Stdout, "", 0),
|
||||
}
|
||||
Register(engine, prefix, cfg)
|
||||
return nil
|
||||
return ls, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ func TestRegister(t *testing.T) {
|
|||
r := touka.New()
|
||||
cfg := &Config{
|
||||
FileSystem: NewMemFS(),
|
||||
LockSystem: NewMemLock(),
|
||||
}
|
||||
Register(r, "/dav", cfg)
|
||||
|
||||
|
|
@ -35,9 +36,11 @@ func TestServe(t *testing.T) {
|
|||
dir, _ := os.MkdirTemp("", "webdav")
|
||||
defer os.RemoveAll(dir)
|
||||
|
||||
if err := Serve(r, "/serve", dir); err != nil {
|
||||
closer, err := Serve(r, "/serve", dir)
|
||||
if err != nil {
|
||||
t.Fatalf("Serve failed: %v", err)
|
||||
}
|
||||
defer closer.Close()
|
||||
|
||||
// Check if a WebDAV method is registered
|
||||
req, _ := http.NewRequest("OPTIONS", "/serve/", nil)
|
||||
|
|
|
|||
|
|
@ -131,16 +131,35 @@ func (fs *MemFS) RemoveAll(ctx context.Context, name string) error {
|
|||
fs.mu.Lock()
|
||||
defer fs.mu.Unlock()
|
||||
|
||||
dir, base := path.Split(name)
|
||||
cleanPath := path.Clean(name)
|
||||
if cleanPath == "/" {
|
||||
return os.ErrInvalid
|
||||
}
|
||||
|
||||
dir, base := path.Split(cleanPath)
|
||||
parent, err := fs.findNode(dir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if _, exists := parent.children[base]; !exists {
|
||||
node, exists := parent.children[base]
|
||||
if !exists {
|
||||
return os.ErrNotExist
|
||||
}
|
||||
|
||||
var recursiveDelete func(*memNode)
|
||||
recursiveDelete = func(n *memNode) {
|
||||
if n.isDir {
|
||||
for _, child := range n.children {
|
||||
recursiveDelete(child)
|
||||
}
|
||||
}
|
||||
n.parent = nil
|
||||
n.children = nil
|
||||
n.data = nil
|
||||
}
|
||||
recursiveDelete(node)
|
||||
|
||||
delete(parent.children, base)
|
||||
return nil
|
||||
}
|
||||
|
|
@ -240,17 +259,34 @@ func (f *memFile) Read(p []byte) (n int, err error) {
|
|||
func (f *memFile) Write(p []byte) (n int, err error) {
|
||||
f.fs.mu.Lock()
|
||||
defer f.fs.mu.Unlock()
|
||||
newSize := f.offset + int64(len(p))
|
||||
if newSize > int64(cap(f.node.data)) {
|
||||
newData := make([]byte, newSize)
|
||||
|
||||
writeEnd := f.offset + int64(len(p))
|
||||
|
||||
// Grow slice if necessary
|
||||
if writeEnd > int64(cap(f.node.data)) {
|
||||
newCap := int64(cap(f.node.data)) * 2
|
||||
if newCap < writeEnd {
|
||||
newCap = writeEnd
|
||||
}
|
||||
newData := make([]byte, len(f.node.data), newCap)
|
||||
copy(newData, f.node.data)
|
||||
f.node.data = newData
|
||||
} else {
|
||||
f.node.data = f.node.data[:newSize]
|
||||
}
|
||||
|
||||
// Extend slice length if write goes past the end
|
||||
if writeEnd > int64(len(f.node.data)) {
|
||||
f.node.data = f.node.data[:writeEnd]
|
||||
}
|
||||
|
||||
n = copy(f.node.data[f.offset:], p)
|
||||
f.offset += int64(n)
|
||||
atomic.StoreInt64(&f.node.size, newSize)
|
||||
|
||||
// Update size only if the file has grown
|
||||
if f.offset > atomic.LoadInt64(&f.node.size) {
|
||||
atomic.StoreInt64(&f.node.size, f.offset)
|
||||
}
|
||||
f.node.modTime = time.Now()
|
||||
|
||||
return n, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,8 +38,9 @@ func NewMemLock() *MemLock {
|
|||
}
|
||||
|
||||
// Close stops the cleanup goroutine.
|
||||
func (l *MemLock) Close() {
|
||||
func (l *MemLock) Close() error {
|
||||
close(l.stop)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (l *MemLock) cleanup() {
|
||||
|
|
@ -66,6 +67,13 @@ func (l *MemLock) Create(ctx context.Context, path string, info LockInfo) (strin
|
|||
l.mu.Lock()
|
||||
defer l.mu.Unlock()
|
||||
|
||||
// Check for conflicting locks
|
||||
for _, v := range l.locks {
|
||||
if v.path == path {
|
||||
return "", os.ErrExist
|
||||
}
|
||||
}
|
||||
|
||||
token := make([]byte, 16)
|
||||
if _, err := rand.Read(token); err != nil {
|
||||
return "", err
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ func NewOSFS(rootDir string) (*OSFS, error) {
|
|||
}
|
||||
|
||||
func (fs *OSFS) resolve(name string) (string, error) {
|
||||
if filepath.IsAbs(name) || strings.Contains(name, "..") {
|
||||
if strings.Contains(name, "..") {
|
||||
return "", os.ErrPermission
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -588,11 +588,8 @@ func (h *Handler) handlePropfind(c *touka.Context) {
|
|||
}
|
||||
|
||||
|
||||
func (h *Handler) createPropfindResponse(path string, info ObjectInfo, propfind Propfind) *Response {
|
||||
fullPath := path
|
||||
if h.Prefix != "/" {
|
||||
fullPath = h.Prefix + path
|
||||
}
|
||||
func (h *Handler) createPropfindResponse(p string, info ObjectInfo, propfind Propfind) *Response {
|
||||
fullPath := path.Join(h.Prefix, p)
|
||||
|
||||
resp := &Response{
|
||||
Href: []string{fullPath},
|
||||
|
|
@ -641,10 +638,7 @@ func (h *Handler) handleProppatch(c *touka.Context) {
|
|||
}
|
||||
|
||||
func (h *Handler) stripPrefix(p string) string {
|
||||
if h.Prefix == "/" {
|
||||
return p
|
||||
}
|
||||
return strings.TrimPrefix(p, h.Prefix)
|
||||
return strings.TrimPrefix(strings.TrimPrefix(p, h.Prefix), "/")
|
||||
}
|
||||
|
||||
func (h *Handler) handleLock(c *touka.Context) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue