mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-30 17:00:48 +01:00
Chris Lu
28d1ef24ec
* fix(admin): allow control chars in file paths when browsing filer The admin UI rejected any path containing \x00, \r, or \n as "path contains invalid characters". These bytes are legal in S3 object keys, so objects created through the S3 API (or replicated via filer.sync) could exist on the filer but be unreachable from the admin UI — browse, download, and upload all failed with "Invalid file path". Drop the control-character rejection and instead URL-escape the path when constructing filer request URLs, so that such bytes cannot inject into the HTTP request target. Path traversal protection via path.Clean is unchanged. * test(admin): strengthen file path tests with byte-preserving checks Assert full expected output for validateAndCleanFilePath so silent stripping of control characters would fail the test, and cover \r and \x00 escaping in filerFileURL in addition to \n and space.
63 lines
2.0 KiB
Go
63 lines
2.0 KiB
Go
package handlers
|
|
|
|
import (
|
|
"testing"
|
|
)
|
|
|
|
func TestValidateAndCleanFilePath_AllowsControlChars(t *testing.T) {
|
|
h := &FileBrowserHandlers{}
|
|
|
|
// S3 object keys may legally contain any UTF-8 bytes, including control
|
|
// characters like \n, \r, and \x00. The admin UI must be able to browse
|
|
// and manage such entries rather than silently stripping or rejecting them.
|
|
cases := []struct {
|
|
in string
|
|
want string
|
|
}{
|
|
{"/buckets/profilebuilder/3testGB.zip\n ", "/buckets/profilebuilder/3testGB.zip\n "},
|
|
{"/foo\rbar", "/foo\rbar"},
|
|
{"/foo\x00bar", "/foo\x00bar"},
|
|
{"/normal/path.txt", "/normal/path.txt"},
|
|
// Missing leading slash should be added back.
|
|
{"relative/path.txt", "/relative/path.txt"},
|
|
// Duplicate slashes should be collapsed by path.Clean.
|
|
{"/a//b", "/a/b"},
|
|
}
|
|
for _, tc := range cases {
|
|
got, err := h.validateAndCleanFilePath(tc.in)
|
|
if err != nil {
|
|
t.Errorf("validateAndCleanFilePath(%q) unexpected error: %v", tc.in, err)
|
|
continue
|
|
}
|
|
if got != tc.want {
|
|
t.Errorf("validateAndCleanFilePath(%q) = %q, want %q", tc.in, got, tc.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestValidateAndCleanFilePath_RejectsEmpty(t *testing.T) {
|
|
h := &FileBrowserHandlers{}
|
|
if _, err := h.validateAndCleanFilePath(""); err == nil {
|
|
t.Errorf("expected empty path rejection")
|
|
}
|
|
}
|
|
|
|
func TestFilerFileURL_EscapesControlChars(t *testing.T) {
|
|
cases := []struct {
|
|
addr string
|
|
path string
|
|
want string
|
|
}{
|
|
{"http://127.0.0.1:8888", "/buckets/profilebuilder/3testGB.zip\n ", "http://127.0.0.1:8888/buckets/profilebuilder/3testGB.zip%0A%20"},
|
|
{"http://127.0.0.1:8888", "/buckets/profilebuilder/file\rname", "http://127.0.0.1:8888/buckets/profilebuilder/file%0Dname"},
|
|
{"http://127.0.0.1:8888", "/buckets/profilebuilder/file\x00name", "http://127.0.0.1:8888/buckets/profilebuilder/file%00name"},
|
|
// Plain path round-trips unchanged.
|
|
{"http://h:1", "/a/b.txt", "http://h:1/a/b.txt"},
|
|
}
|
|
for _, tc := range cases {
|
|
if got := filerFileURL(tc.addr, tc.path); got != tc.want {
|
|
t.Errorf("filerFileURL(%q, %q) = %q, want %q", tc.addr, tc.path, got, tc.want)
|
|
}
|
|
}
|
|
}
|