fix tests

This commit is contained in:
Shreyas Goenka 2023-05-26 11:42:20 +02:00
parent 53f0228bf2
commit 8a9175e332
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
1 changed files with 20 additions and 15 deletions

View File

@ -31,6 +31,26 @@ func testRootPath(t *testing.T, uncleanRoot string) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, cleanRoot+"/a/b/f/g", remotePath) assert.Equal(t, cleanRoot+"/a/b/f/g", remotePath)
remotePath, err = rp.Join(".//a/..//./b/..")
assert.NoError(t, err)
assert.Equal(t, cleanRoot, remotePath)
remotePath, err = rp.Join("a/b/../..")
assert.NoError(t, err)
assert.Equal(t, cleanRoot, remotePath)
remotePath, err = rp.Join("")
assert.NoError(t, err)
assert.Equal(t, cleanRoot, remotePath)
remotePath, err = rp.Join(".")
assert.NoError(t, err)
assert.Equal(t, cleanRoot, remotePath)
remotePath, err = rp.Join("/")
assert.NoError(t, err)
assert.Equal(t, cleanRoot, remotePath)
_, err = rp.Join("..") _, err = rp.Join("..")
assert.ErrorContains(t, err, `relative path escapes root: ..`) assert.ErrorContains(t, err, `relative path escapes root: ..`)
@ -57,21 +77,6 @@ func testRootPath(t *testing.T, uncleanRoot string) {
_, err = rp.Join("../..") _, err = rp.Join("../..")
assert.ErrorContains(t, err, `relative path escapes root: ../..`) assert.ErrorContains(t, err, `relative path escapes root: ../..`)
_, err = rp.Join(".//a/..//./b/..")
assert.ErrorContains(t, err, `relative path resolves to root: .//a/..//./b/..`)
_, err = rp.Join("a/b/../..")
assert.ErrorContains(t, err, "relative path resolves to root: a/b/../..")
_, err = rp.Join("")
assert.ErrorContains(t, err, "relative path resolves to root: ")
_, err = rp.Join(".")
assert.ErrorContains(t, err, "relative path resolves to root: .")
_, err = rp.Join("/")
assert.ErrorContains(t, err, "relative path resolves to root: /")
} }
func TestRootPathClean(t *testing.T) { func TestRootPathClean(t *testing.T) {