Theme Modules: Added testing coverage for install command

Author: ssddanbrown

app/Console/Commands/InstallModuleCommand.php

@@ -86,12 +86,15 @@ public function handle(): int
             return 1;
         }
 
-        $this->info("Module \"{$newModule->name}\" ({$newModule->version}) successfully installed!");
+        $this->info("Module \"{$newModule->name}\" ({$newModule->getVersion()}) successfully installed!");
         $this->info("Install location: {$moduleFolder}/{$newModule->folderName}");
         $this->cleanup();
         return 0;
     }
 
+    /**
+     * @param ThemeModule[] $existingModules
+     */
     protected function handleExistingModulesWithSameName(array $existingModules, ThemeModuleManager $manager): bool
     {
         if (count($existingModules) === 0) {
@@ -100,7 +103,7 @@ protected function handleExistingModulesWithSameName(array $existingModules, The
 
         $this->warn("The following modules already exist with the same name:");
         foreach ($existingModules as $folder => $module) {
-            $this->line("{$module->name} ({$folder}:{$module->version}) - {$module->description}");
+            $this->line("{$module->name} ({$folder}:{$module->getVersion()}) - {$module->description}");
         }
         $this->line('');
 
@@ -145,7 +148,7 @@ protected function getModuleFolder(string $themeFolder): string|null
     protected function getThemeFolder(): string|null
     {
         $path = theme_path('');
-        if (!$path) {
+        if (!$path || !is_dir($path)) {
             $shouldCreate = $this->confirm('No active theme folder found, would you like to create one?');
             if (!$shouldCreate) {
                 return null;
@@ -178,7 +181,7 @@ protected function validateAndGetModuleInfoFromZip(ThemeModuleZip $zip): ThemeMo
         }
 
         if ($zip->getContentsSize() > (50 * 1024 * 1024)) {
-            $this->error("ERROR: Module ZIP file is too large. Maximum size is 50MB");
+            $this->error("ERROR: Module ZIP file contents are too large. Maximum size is 50MB");
             return null;
         }
 
@@ -196,7 +199,7 @@ protected function downloadModuleFile(string $location): string|null
     {
         $httpRequests = app()->make(HttpRequestService::class);
         $client = $httpRequests->buildClient(30, ['stream' => true]);
-        $originalHost = parse_url($location, PHP_URL_HOST);
+        $originalUrl = parse_url($location);
         $currentLocation = $location;
         $maxRedirects = 3;
         $redirectCount = 0;
@@ -209,8 +212,12 @@ protected function downloadModuleFile(string $location): string|null
             if ($statusCode >= 300 && $statusCode < 400 && $redirectCount < $maxRedirects) {
                 $redirectLocation = $resp->getHeaderLine('Location');
                 if ($redirectLocation) {
-                    $redirectHost = parse_url($redirectLocation, PHP_URL_HOST);
-                    if ($redirectHost === $originalHost) {
+                    $redirectUrl = parse_url($redirectLocation);
+                    if (
+                        ($originalUrl['host'] ?? '') === ($redirectUrl['host'] ?? '')
+                        && ($originalUrl['scheme'] ?? '') === ($redirectUrl['scheme'] ?? '')
+                        && ($originalUrl['port'] ?? '') === ($redirectUrl['port'] ?? '')
+                    ) {
                         $currentLocation = $redirectLocation;
                         $redirectCount++;
                         continue;

app/Theming/ThemeModuleZip.php

@@ -2,6 +2,8 @@
 
 namespace BookStack\Theming;
 
+use ZipArchive;
+
 readonly class ThemeModuleZip
 {
     public function __construct(
@@ -11,7 +13,7 @@ public function __construct(
 
     public function extractTo(string $destinationPath): void
     {
-        $zip = new \ZipArchive();
+        $zip = new ZipArchive();
         $zip->open($this->path);
         $zip->extractTo($destinationPath);
         $zip->close();
@@ -23,7 +25,7 @@ public function extractTo(string $destinationPath): void
      */
     public function getModuleInstance(): ThemeModule
     {
-        $zip = new \ZipArchive();
+        $zip = new ZipArchive();
         $open = $zip->open($this->path);
         if ($open !== true) {
             throw new ThemeModuleException("Unable to open zip file at {$this->path}");
@@ -61,18 +63,21 @@ public function exists(): bool
             return false;
         }
 
-        $zip = new \ZipArchive();
-        $open = $zip->open($this->path);
-        $zip->close();
-        return $open === true;
+        $zip = new ZipArchive();
+        $open = $zip->open($this->path, ZipArchive::RDONLY);
+        if ($open === true) {
+            $zip->close();
+            return true;
+        }
+        return false;
     }
 
     /**
      * Get the total size of the zip file contents when uncompressed.
      */
     public function getContentsSize(): int
     {
-        $zip = new \ZipArchive();
+        $zip = new ZipArchive();
 
         if ($zip->open($this->path) !== true) {
             return 0;