Merge pull request #1463 from adrum/feature/trust-ca-cert

Trust CA Certificate only
laravel · May 31, 2024 · 2da59f9 · 2da59f9
2 parents b62bc68 + c0a2c7e
commit 2da59f9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/cli/Valet/Site.php b/cli/Valet/Site.php
@@ -525,6 +525,14 @@ public function createCa(int $caExpireInDays): void
         $caKeyPath = $this->caPath('LaravelValetCASelfSigned.key');
 
         if ($this->files->exists($caKeyPath) && $this->files->exists($caPemPath)) {
+
+            $isTrusted = $this->cli->run(sprintf(
+                'security verify-cert -c "%s"', $caPemPath
+            ));
+
+            if (strpos($isTrusted, '...certificate verification successful.') === false) {
+                $this->trustCa($caPemPath);
+            }
             return;
         }
 
@@ -607,8 +615,6 @@ public function createCertificate(string $url, int $caExpireInDays): void
                 $caExpireInDays, $caPemPath, $caKeyPath, $caSrlParam, $csrPath, $crtPath, $confPath
             ));
         }
-
-        $this->trustCertificate($crtPath);
     }
 
     /**