osfs: improve isSubDir check

devopsmakers · Sep 21, 2020 · bf708cb · bf708cb
1 parent a550d08
commit bf708cb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/sftpd/sftpd_test.go b/sftpd/sftpd_test.go
@@ -887,6 +887,9 @@ func TestEscapeHomeDir(t *testing.T) {
 	usePubKey := true
 	user, _, err := httpd.AddUser(getTestUser(usePubKey), http.StatusOK)
 	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)
 	if assert.NoError(t, err) {
 		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")
 		err = os.Remove(linkPath)
 		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)
 		testFileSize := int64(65535)
 		err = createTestFile(testFilePath, testFileSize)
@@ -928,6 +935,8 @@ func TestEscapeHomeDir(t *testing.T) {
 	assert.NoError(t, err)
 	err = os.RemoveAll(user.GetHomeDir())
 	assert.NoError(t, err)
+	err = os.RemoveAll(filepath.Join(homeBasePath, defaultUsername+"1"))
+	assert.NoError(t, err)
 }
 
 func TestHomeSpecialChars(t *testing.T) {

diff --git a/vfs/osfs.go b/vfs/osfs.go
@@ -413,7 +413,15 @@ func (fs *OsFs) isSubDir(sub, rootPath string) error {
 		fsLog(fs, logger.LevelWarn, "invalid root path %#v: %v", rootPath, 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)
 		fsLog(fs, logger.LevelWarn, "error: %v ", err)
 		return err