Fixed directory on persistent secret key not being created automatically

composer.json

@@ -29,7 +29,8 @@
     "require-dev": {
         "phpunit/phpunit": "^9.0",
         "friendsofphp/php-cs-fixer": "^2.16",
-        "vimeo/psalm": "^3.7"
+        "vimeo/psalm": "^3.7",
+        "adlawson/vfs": "^0.12.1"
     },
     "scripts": {
         "lint": "php-cs-fixer fix --ansi",

src/key/SecretKey.php

@@ -16,6 +16,7 @@
 
 namespace Legatus\Support;
 
+use RuntimeException;
 use SodiumException;
 
 /**
@@ -27,16 +28,21 @@ class SecretKey
     private string $bytes;
 
     /**
-     * @param string $filename
+     * @param string      $filename
+     * @param Random|null $random
      *
      * @return SecretKey
      *
      * @throws SodiumException
      */
-    public static function persistent(string $filename): SecretKey
+    public static function persistent(string $filename, Random $random = null): SecretKey
     {
         if (!is_file($filename)) {
-            $key = static::generate();
+            $dir = dirname($filename);
+            if (!is_dir($dir) && !mkdir($dir, 0750, true) && !is_dir($dir)) {
+                throw new RuntimeException("Could not create directory \"$dir\"");
+            }
+            $key = static::generate($random);
             file_put_contents($filename, $key->toString());
         }
 
@@ -100,7 +106,7 @@ public function decrypt(string $cipher, string $nonce): string
     private function guard(): void
     {
         if (strlen($this->bytes) !== SODIUM_CRYPTO_SECRETBOX_KEYBYTES) {
-            throw new \RuntimeException(sprintf('The key length must be %s bytes in size', SODIUM_CRYPTO_SECRETBOX_KEYBYTES));
+            throw new RuntimeException(sprintf('The key length must be %s bytes in size', SODIUM_CRYPTO_SECRETBOX_KEYBYTES));
         }
     }
 

tests/FixedRandom.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * @project Legatus Crypto
+ * @link https://github.com/legatus-php/crypto
+ * @package legatus/crypto
+ * @author Matias Navarro-Carter mnavarrocarter@gmail.com
+ * @license MIT
+ * @copyright 2021 Matias Navarro-Carter
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Legatus\Support;
+
+/**
+ * Class FixedRandom.
+ */
+final class FixedRandom implements Random
+{
+    private string $bytes;
+
+    /**
+     * @param int $bytes
+     *
+     * @return FixedRandom
+     */
+    public static function ofLength(int $bytes): FixedRandom
+    {
+        return self::fromUint8Array(...range(0, $bytes));
+    }
+
+    /**
+     * @param int ...$bytes
+     *
+     * @return FixedRandom
+     */
+    public static function fromUint8Array(int ...$bytes): FixedRandom
+    {
+        return new self(implode('', array_map('chr', $bytes)));
+    }
+
+    public function __construct(string $bytes)
+    {
+        $this->bytes = $bytes;
+    }
+
+    /**
+     * @param int $bytes
+     *
+     * @return string
+     */
+    public function read(int $bytes): string
+    {
+        return substr($this->bytes, 0, $bytes);
+    }
+}

tests/SecretKeyTest.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * @project Legatus Crypto
+ * @link https://github.com/legatus-php/crypto
+ * @package legatus/crypto
+ * @author Matias Navarro-Carter mnavarrocarter@gmail.com
+ * @license MIT
+ * @copyright 2021 Matias Navarro-Carter
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Legatus\Support;
+
+use PHPUnit\Framework\TestCase;
+use Vfs\FileSystem;
+
+class SecretKeyTest extends TestCase
+{
+    public function testItGeneratesASecretKey(): void
+    {
+        $random = FixedRandom::ofLength(32);
+        $key = SecretKey::generate($random)->toString();
+        self::assertSame('AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8', $key);
+    }
+
+    public function testItGeneratesAPersistentSecretKey(): void
+    {
+        $fs = FileSystem::factory('vfs://');
+        $fs->mount();
+
+        $random = FixedRandom::ofLength(32);
+        $key = SecretKey::persistent('vfs://data/secret.key', $random)->toString();
+        self::assertSame('AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8', $key);
+        self::assertFileExists('vfs://data/secret.key');
+
+        $fs->unmount();
+    }
+}