From 76ace969256d2e3c2c89ddc8566489c9b8cb78bd Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Mon, 20 Mar 2017 09:55:07 +0100
Subject: [PATCH] Create nested directories as needed to store keys

---
 storage/filestorage/main.go      |  4 ++--
 storage/filestorage/main_test.go | 25 +++++++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/storage/filestorage/main.go b/storage/filestorage/main.go
index 4b7dbe525..737f0772c 100644
--- a/storage/filestorage/main.go
+++ b/storage/filestorage/main.go
@@ -35,8 +35,8 @@ type FileStore struct {
 // dir should be an absolute path of a directory owner by this user. It will
 // be created if it doesn't exist already.
 func New(dir string) FileStore {
-	err := os.Mkdir(dir, dirPerm)
-	if err != nil && !os.IsExist(err) {
+	err := os.MkdirAll(dir, dirPerm)
+	if err != nil {
 		panic(err)
 	}
 	return FileStore{dir}
diff --git a/storage/filestorage/main_test.go b/storage/filestorage/main_test.go
index c9c55eb02..890898dcb 100644
--- a/storage/filestorage/main_test.go
+++ b/storage/filestorage/main_test.go
@@ -83,15 +83,24 @@ func TestDirectoryHandling(t *testing.T) {
 	newDir := path.Join(os.TempDir(), "file-test-dir")
 	_, err := os.Open(newDir)
 	assert.True(os.IsNotExist(err))
+	defer os.RemoveAll(newDir)
+
+	// now, check with two levels deep....
+	parentDir := path.Join(os.TempDir(), "missing-dir")
+	nestedDir := path.Join(parentDir, "lots", "of", "levels", "here")
+	_, err = os.Open(parentDir)
+	assert.True(os.IsNotExist(err))
+	defer os.RemoveAll(parentDir)
 
 	// create a new storage, and verify it creates the directory with good permissions
-	New(newDir)
-	defer os.RemoveAll(newDir)
-	d, err := os.Open(newDir)
-	require.Nil(err)
-	defer d.Close()
+	for _, dir := range []string{newDir, nestedDir, newDir} {
+		New(dir)
+		d, err := os.Open(dir)
+		require.Nil(err)
+		defer d.Close()
 
-	stat, err := d.Stat()
-	require.Nil(err)
-	assert.Equal(dirPerm, stat.Mode()&os.ModePerm)
+		stat, err := d.Stat()
+		require.Nil(err)
+		assert.Equal(dirPerm, stat.Mode()&os.ModePerm)
+	}
 }