mirror of
https://github.com/hacdias/webdav.git
synced 2026-09-24 04:01:54 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
390fe21ed9 | ||
|
|
44e5e02dd3 | ||
|
|
d59dd02f96 | ||
|
|
10183d09bc |
@@ -13,7 +13,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@v7
|
||||||
- uses: actions/setup-go@v6
|
- uses: actions/setup-go@v7
|
||||||
with:
|
with:
|
||||||
go-version: "1.26.x"
|
go-version: "1.26.x"
|
||||||
- run: go build .
|
- run: go build .
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@v7
|
||||||
- uses: actions/setup-go@v6
|
- uses: actions/setup-go@v7
|
||||||
with:
|
with:
|
||||||
go-version: "1.26.x"
|
go-version: "1.26.x"
|
||||||
- uses: golangci/golangci-lint-action@v9
|
- uses: golangci/golangci-lint-action@v9
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@v7
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- uses: actions/setup-go@v6
|
- uses: actions/setup-go@v7
|
||||||
with:
|
with:
|
||||||
go-version: "1.26.x"
|
go-version: "1.26.x"
|
||||||
- uses: goreleaser/goreleaser-action@v7
|
- uses: goreleaser/goreleaser-action@v7
|
||||||
|
|||||||
@@ -10,12 +10,21 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
name: test
|
name: test (${{ matrix.os }})
|
||||||
runs-on: ubuntu-latest
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os:
|
||||||
|
- ubuntu-latest
|
||||||
|
- windows-latest
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@v7
|
||||||
- uses: actions/setup-go@v6
|
- uses: actions/setup-go@v7
|
||||||
with:
|
with:
|
||||||
go-version: "1.26.x"
|
go-version: "1.26.x"
|
||||||
- name: Run test with coverage
|
- name: Run test with race detector and coverage
|
||||||
|
if: runner.os != 'Windows'
|
||||||
run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
|
run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
|
||||||
|
- name: Run test with coverage
|
||||||
|
if: runner.os == 'Windows'
|
||||||
|
run: go test "-coverprofile=coverage.txt" -covermode=atomic ./...
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ require (
|
|||||||
github.com/studio-b12/gowebdav v0.13.0
|
github.com/studio-b12/gowebdav v0.13.0
|
||||||
go.uber.org/zap v1.28.0
|
go.uber.org/zap v1.28.0
|
||||||
golang.org/x/crypto v0.54.0
|
golang.org/x/crypto v0.54.0
|
||||||
golang.org/x/crypto/x509roots/fallback v0.0.0-20260709184058-243e02a382f8
|
golang.org/x/crypto/x509roots/fallback v0.0.0-20260723152544-d701c51f7e4e
|
||||||
golang.org/x/net v0.57.0
|
golang.org/x/net v0.57.0
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -57,8 +57,8 @@ go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
|
|||||||
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
||||||
golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
|
golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
|
||||||
golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
|
golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
|
||||||
golang.org/x/crypto/x509roots/fallback v0.0.0-20260709184058-243e02a382f8 h1:OZy0hsjD/gbnVKENxnVK6I3e4bdKwYy4R3dfdKosYyA=
|
golang.org/x/crypto/x509roots/fallback v0.0.0-20260723152544-d701c51f7e4e h1:9TjMDOuGaMMTP5f7GXeHeA0JvFqGmv4DYRIWkzoePGI=
|
||||||
golang.org/x/crypto/x509roots/fallback v0.0.0-20260709184058-243e02a382f8/go.mod h1:+UoQFNBq2p2wO+Q6ddVtYc25GZ6VNdOMyyrd4nrqrKs=
|
golang.org/x/crypto/x509roots/fallback v0.0.0-20260723152544-d701c51f7e4e/go.mod h1:+UoQFNBq2p2wO+Q6ddVtYc25GZ6VNdOMyyrd4nrqrKs=
|
||||||
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
|
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
|
||||||
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
|
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
|
||||||
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
|
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
|
||||||
|
|||||||
+14
-4
@@ -60,12 +60,19 @@ func TestConfigDefaults(t *testing.T) {
|
|||||||
func TestConfigCascade(t *testing.T) {
|
func TestConfigCascade(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
// Directories are resolved to absolute paths, which differ by platform
|
||||||
|
// (for example "/" becomes the current drive root on Windows).
|
||||||
|
rootDirectory, err := filepath.Abs("/")
|
||||||
|
require.NoError(t, err)
|
||||||
|
basicDirectory, err := filepath.Abs("/basic")
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
check := func(t *testing.T, cfg *Config) {
|
check := func(t *testing.T, cfg *Config) {
|
||||||
require.True(t, cfg.Permissions.Read)
|
require.True(t, cfg.Permissions.Read)
|
||||||
require.True(t, cfg.Permissions.Create)
|
require.True(t, cfg.Permissions.Create)
|
||||||
require.False(t, cfg.Permissions.Delete)
|
require.False(t, cfg.Permissions.Delete)
|
||||||
require.False(t, cfg.Permissions.Update)
|
require.False(t, cfg.Permissions.Update)
|
||||||
require.Equal(t, "/", cfg.Directory)
|
require.Equal(t, rootDirectory, cfg.Directory)
|
||||||
require.Len(t, cfg.Rules, 1)
|
require.Len(t, cfg.Rules, 1)
|
||||||
|
|
||||||
require.Len(t, cfg.Users, 2)
|
require.Len(t, cfg.Users, 2)
|
||||||
@@ -73,14 +80,14 @@ func TestConfigCascade(t *testing.T) {
|
|||||||
require.True(t, cfg.Users[0].Permissions.Create)
|
require.True(t, cfg.Users[0].Permissions.Create)
|
||||||
require.False(t, cfg.Users[0].Permissions.Delete)
|
require.False(t, cfg.Users[0].Permissions.Delete)
|
||||||
require.False(t, cfg.Users[0].Permissions.Update)
|
require.False(t, cfg.Users[0].Permissions.Update)
|
||||||
require.Equal(t, "/", cfg.Users[0].Directory)
|
require.Equal(t, rootDirectory, cfg.Users[0].Directory)
|
||||||
require.Len(t, cfg.Users[0].Rules, 1)
|
require.Len(t, cfg.Users[0].Rules, 1)
|
||||||
|
|
||||||
require.True(t, cfg.Users[1].Permissions.Read)
|
require.True(t, cfg.Users[1].Permissions.Read)
|
||||||
require.False(t, cfg.Users[1].Permissions.Create)
|
require.False(t, cfg.Users[1].Permissions.Create)
|
||||||
require.False(t, cfg.Users[1].Permissions.Delete)
|
require.False(t, cfg.Users[1].Permissions.Delete)
|
||||||
require.False(t, cfg.Users[1].Permissions.Update)
|
require.False(t, cfg.Users[1].Permissions.Update)
|
||||||
require.Equal(t, "/basic", cfg.Users[1].Directory)
|
require.Equal(t, basicDirectory, cfg.Users[1].Directory)
|
||||||
require.Len(t, cfg.Users[1].Rules, 0)
|
require.Len(t, cfg.Users[1].Rules, 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -485,8 +492,11 @@ func TestConfigEnv(t *testing.T) {
|
|||||||
cfg, err := ParseConfig("", nil)
|
cfg, err := ParseConfig("", nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
expectedDirectory, err := filepath.Abs("/test")
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
assert.Equal(t, 1234, cfg.Port)
|
assert.Equal(t, 1234, cfg.Port)
|
||||||
assert.Equal(t, "/test", cfg.Directory)
|
assert.Equal(t, expectedDirectory, cfg.Directory)
|
||||||
assert.Equal(t, true, cfg.Debug)
|
assert.Equal(t, true, cfg.Debug)
|
||||||
require.True(t, cfg.Permissions.Read)
|
require.True(t, cfg.Permissions.Read)
|
||||||
require.True(t, cfg.Permissions.Create)
|
require.True(t, cfg.Permissions.Create)
|
||||||
|
|||||||
+22
-20
@@ -7,6 +7,7 @@ import (
|
|||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -486,13 +487,21 @@ func TestServerPartialUpdateHonorsLocks(t *testing.T) {
|
|||||||
func TestServerListingCharacters(t *testing.T) {
|
func TestServerListingCharacters(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
dir := makeTestDirectory(t, map[string][]byte{
|
contents := map[string][]byte{
|
||||||
"富/foo.txt": []byte("foo"),
|
"富/foo.txt": []byte("foo"),
|
||||||
"你好.txt": []byte("bar"),
|
"你好.txt": []byte("bar"),
|
||||||
"z*.txt": []byte("zbar"),
|
|
||||||
"foo.txt": []byte("foo"),
|
"foo.txt": []byte("foo"),
|
||||||
"🌹.txt": []byte("foo"),
|
"🌹.txt": []byte("foo"),
|
||||||
})
|
}
|
||||||
|
expectedNames := []string{"foo.txt", "你好.txt", "富", "🌹.txt"}
|
||||||
|
if runtime.GOOS != "windows" {
|
||||||
|
// Asterisks are invalid in Windows filenames.
|
||||||
|
contents["z*.txt"] = []byte("zbar")
|
||||||
|
expectedNames = append(expectedNames, "z*.txt")
|
||||||
|
}
|
||||||
|
sort.Strings(expectedNames)
|
||||||
|
|
||||||
|
dir := makeTestDirectory(t, contents)
|
||||||
|
|
||||||
srv := makeTestServer(t, "directory: "+dir)
|
srv := makeTestServer(t, "directory: "+dir)
|
||||||
client := gowebdav.NewClient(srv.URL, "", "")
|
client := gowebdav.NewClient(srv.URL, "", "")
|
||||||
@@ -500,28 +509,21 @@ func TestServerListingCharacters(t *testing.T) {
|
|||||||
// By default, reading permissions.
|
// By default, reading permissions.
|
||||||
files, err := client.ReadDir("/")
|
files, err := client.ReadDir("/")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Len(t, files, 5)
|
require.Len(t, files, len(expectedNames))
|
||||||
|
|
||||||
names := []string{
|
names := make([]string, len(files))
|
||||||
files[0].Name(),
|
for i, file := range files {
|
||||||
files[1].Name(),
|
names[i] = file.Name()
|
||||||
files[2].Name(),
|
|
||||||
files[3].Name(),
|
|
||||||
files[4].Name(),
|
|
||||||
}
|
}
|
||||||
sort.Strings(names)
|
sort.Strings(names)
|
||||||
|
|
||||||
require.Equal(t, []string{
|
require.Equal(t, expectedNames, names)
|
||||||
"foo.txt",
|
|
||||||
"z*.txt",
|
|
||||||
"你好.txt",
|
|
||||||
"富",
|
|
||||||
"🌹.txt",
|
|
||||||
}, names)
|
|
||||||
|
|
||||||
data, err := client.Read("/z*.txt")
|
if runtime.GOOS != "windows" {
|
||||||
require.NoError(t, err)
|
data, err := client.Read("/z*.txt")
|
||||||
require.EqualValues(t, []byte("zbar"), data)
|
require.NoError(t, err)
|
||||||
|
require.EqualValues(t, []byte("zbar"), data)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestServerAuthentication(t *testing.T) {
|
func TestServerAuthentication(t *testing.T) {
|
||||||
|
|||||||
+9
-2
@@ -1,6 +1,7 @@
|
|||||||
package lib
|
package lib
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -24,7 +25,10 @@ func newLockSystem(ls webdav.LockSystem, directory string) *lockSystem {
|
|||||||
return &lockSystem{
|
return &lockSystem{
|
||||||
LockSystem: ls,
|
LockSystem: ls,
|
||||||
resolve: func(name string) (string, error) {
|
resolve: func(name string) (string, error) {
|
||||||
return filepath.Join(directory, name), nil
|
// Lock names share a slash-separated namespace across users, even
|
||||||
|
// on Windows where filepath.Join would emit backslashes and break
|
||||||
|
// descendant-lock matching in the underlying LockSystem.
|
||||||
|
return path.Join(filepath.ToSlash(directory), name), nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -44,7 +48,10 @@ func newMultiDirLockSystem(ls webdav.LockSystem, mounts DirectoryMounts) *lockSy
|
|||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
return mount.filePath(rest), nil
|
// filePath returns an OS-native path for real file operations; the
|
||||||
|
// lock namespace must stay slash-separated so descendant locks match
|
||||||
|
// on Windows.
|
||||||
|
return filepath.ToSlash(mount.filePath(rest)), nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,79 @@
|
|||||||
|
package lib
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
"golang.org/x/net/webdav"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestLockSystemRootLockProtectsDescendants(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
locks := newLockSystem(webdav.NewMemLS(), filepath.Join(t.TempDir(), "nested"))
|
||||||
|
now := time.Now()
|
||||||
|
|
||||||
|
token, err := locks.Create(now, webdav.LockDetails{
|
||||||
|
Root: "/",
|
||||||
|
Duration: time.Minute,
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
t.Cleanup(func() {
|
||||||
|
require.NoError(t, locks.Unlock(time.Now(), token))
|
||||||
|
})
|
||||||
|
|
||||||
|
_, err = locks.Create(now, webdav.LockDetails{
|
||||||
|
Root: "/child.txt",
|
||||||
|
Duration: time.Minute,
|
||||||
|
ZeroDepth: true,
|
||||||
|
})
|
||||||
|
require.ErrorIs(t, err, webdav.ErrLocked)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLockSystemSharesLocksAcrossNestedUserDirectories(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
shared := webdav.NewMemLS()
|
||||||
|
parentDirectory := t.TempDir()
|
||||||
|
childDirectory := filepath.Join(parentDirectory, "child")
|
||||||
|
parent := newLockSystem(shared, parentDirectory)
|
||||||
|
child := newLockSystem(shared, childDirectory)
|
||||||
|
now := time.Now()
|
||||||
|
|
||||||
|
token, err := parent.Create(now, webdav.LockDetails{
|
||||||
|
Root: "/",
|
||||||
|
Duration: time.Minute,
|
||||||
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
t.Cleanup(func() {
|
||||||
|
require.NoError(t, parent.Unlock(time.Now(), token))
|
||||||
|
})
|
||||||
|
|
||||||
|
_, err = child.Create(now, webdav.LockDetails{
|
||||||
|
Root: "/file.txt",
|
||||||
|
Duration: time.Minute,
|
||||||
|
ZeroDepth: true,
|
||||||
|
})
|
||||||
|
require.ErrorIs(t, err, webdav.ErrLocked)
|
||||||
|
|
||||||
|
// The lock key is slash-separated on every platform, so the child's file
|
||||||
|
// nests under the parent's root lock rather than diverging on Windows.
|
||||||
|
key, err := child.resolve("/file.txt")
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, path.Join(filepath.ToSlash(childDirectory), "file.txt"), key)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMultiDirLockSystemUsesSlashSeparatedKeys(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
mounts := DirectoryMounts{{Name: "docs", Path: filepath.Join(t.TempDir(), "docs")}}
|
||||||
|
locks := newMultiDirLockSystem(webdav.NewMemLS(), mounts)
|
||||||
|
|
||||||
|
key, err := locks.resolve("/docs/report.txt")
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, path.Join(filepath.ToSlash(mounts[0].Path), "report.txt"), key)
|
||||||
|
require.NotContains(t, key, "\\")
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user