beenull/sftpgo-mirror
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2024-11-26 01:20:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

osfs: improve isSubDir check

Browse source
This commit is contained in:
Nicola Murino 2020-09-21 19:32:33 +02:00
parent a550d082a3
commit bf708cb8bc
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sftpd/sftpd_test.go
View file

@ -887,6 +887,9 @@ func TestEscapeHomeDir(t *testing.T) {
usePubKey := true usePubKey := true
user, _, err := httpd.AddUser(getTestUser(usePubKey), http.StatusOK) user, _, err := httpd.AddUser(getTestUser(usePubKey), http.StatusOK)
assert.NoError(t, err) assert.NoError(t, err)
dirOutsideHome := filepath.Join(homeBasePath, defaultUsername+"1", "dir")
err = os.MkdirAll(dirOutsideHome, os.ModePerm)
assert.NoError(t, err)
client, err := getSftpClient(user, usePubKey) client, err := getSftpClient(user, usePubKey)
if assert.NoError(t, err) { if assert.NoError(t, err) {
defer client.Close() defer client.Close()
@ -899,6 +902,10 @@ func TestEscapeHomeDir(t *testing.T) {
assert.Error(t, err, "reading a symbolic link outside home dir should not succeeded") assert.Error(t, err, "reading a symbolic link outside home dir should not succeeded")
err = os.Remove(linkPath) err = os.Remove(linkPath)
assert.NoError(t, err) assert.NoError(t, err)
err = os.Symlink(dirOutsideHome, linkPath)
assert.NoError(t, err)
_, err := client.ReadDir(testDir)
assert.Error(t, err, "reading a symbolic link outside home dir should not succeeded")
testFilePath := filepath.Join(homeBasePath, testFileName) testFilePath := filepath.Join(homeBasePath, testFileName)
testFileSize := int64(65535) testFileSize := int64(65535)
err = createTestFile(testFilePath, testFileSize) err = createTestFile(testFilePath, testFileSize)
@ -928,6 +935,8 @@ func TestEscapeHomeDir(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
err = os.RemoveAll(user.GetHomeDir()) err = os.RemoveAll(user.GetHomeDir())
assert.NoError(t, err) assert.NoError(t, err)
err = os.RemoveAll(filepath.Join(homeBasePath, defaultUsername+"1"))
assert.NoError(t, err)
} }
func TestHomeSpecialChars(t *testing.T) { func TestHomeSpecialChars(t *testing.T) {

10
vfs/osfs.go
View file

@ -413,7 +413,15 @@ func (fs *OsFs) isSubDir(sub, rootPath string) error {
fsLog(fs, logger.LevelWarn, "invalid root path %#v: %v", rootPath, err) fsLog(fs, logger.LevelWarn, "invalid root path %#v: %v", rootPath, err)
return err return err
} }
if !strings.HasPrefix(sub, parent) { if parent == sub {
return nil
}
if len(sub) < len(parent) {
err = fmt.Errorf("path %#v is not inside: %#v", sub, parent)
fsLog(fs, logger.LevelWarn, "error: %v ", err)
return err
}
if !strings.HasPrefix(sub, parent+string(os.PathSeparator)) {
err = fmt.Errorf("path %#v is not inside: %#v", sub, parent) err = fmt.Errorf("path %#v is not inside: %#v", sub, parent)
fsLog(fs, logger.LevelWarn, "error: %v ", err) fsLog(fs, logger.LevelWarn, "error: %v ", err)
return err return err