From 8decf22177990e0970ae6a3df187a4503067defc Mon Sep 17 00:00:00 2001
From: Felicitas Pojtinger <felicitas@pojtinger.com>
Date: Wed, 12 Jan 2022 23:41:12 +0100
Subject: [PATCH] fix: Prevent creating directories with no parent

---
 pkg/fs/filesystem.go      | 15 +++++++++++++++
 pkg/fs/filesystem_test.go | 19 +++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkg/fs/filesystem.go b/pkg/fs/filesystem.go
index 07e1c03..2bb2d74 100644
--- a/pkg/fs/filesystem.go
+++ b/pkg/fs/filesystem.go
@@ -283,6 +283,21 @@ func (f *STFS) Mkdir(name string, perm os.FileMode) error {
 	f.ioLock.Lock()
 	defer f.ioLock.Unlock()
 
+	if _, err := inventory.Stat(
+		f.metadata,
+
+		filepath.Dir(name),
+		false,
+
+		f.onHeader,
+	); err != nil {
+		if err == sql.ErrNoRows {
+			return os.ErrNotExist
+		}
+
+		return err
+	}
+
 	if hdr, err := inventory.Stat(
 		f.metadata,
 
diff --git a/pkg/fs/filesystem_test.go b/pkg/fs/filesystem_test.go
index 833c40d..8eafacf 100644
--- a/pkg/fs/filesystem_test.go
+++ b/pkg/fs/filesystem_test.go
@@ -806,13 +806,13 @@ var mkdirTests = []struct {
 	wantErr bool
 }{
 	{
-		"Can create directory /test.txt",
-		mkdirArgs{"/test.txt", os.ModePerm},
+		"Can create directory /test",
+		mkdirArgs{"/test", os.ModePerm},
 		false,
 	},
 	{
-		"Can create directory /test.txt with different permissions",
-		mkdirArgs{"/test.txt", 0666},
+		"Can create directory /test with different permissions",
+		mkdirArgs{"/test", 0666},
 		false,
 	},
 	{
@@ -830,12 +830,11 @@ var mkdirTests = []struct {
 		mkdirArgs{"", os.ModePerm},
 		true,
 	},
-	// FIXME: STFS can create directory in non-existent directory, which should not be possible
-	// {
-	// 	"Can not create /nonexistent/test.txt",
-	// 	mkdirArgs{"/nonexistent/test.txt", os.ModePerm},
-	// 	true,
-	// },
+	{
+		"Can not create /nonexistent/test",
+		mkdirArgs{"/nonexistent/test", os.ModePerm},
+		true,
+	},
 }
 
 func TestSTFS_Mkdir(t *testing.T) {