refs #4183 verify require definition when uploading a plugin zip file or when installing/updating a plugin

1 files changed, 53 insertions, 13 deletions

diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index 70cb27de76..284f2bdd52 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -40,12 +40,23 @@ class PluginInstaller
         $tmpPluginZip = SettingsPiwik::rewriteTmpPathWithHostname($tmpPluginZip);
         $tmpPluginFolder = SettingsPiwik::rewriteTmpPathWithHostname($tmpPluginFolder);
 
-        $this->makeSureFoldersAreWritable();
-        $this->makeSurePluginNameIsValid();
-        $this->downloadPluginFromMarketplace($tmpPluginZip);
-        $this->extractPluginFiles($tmpPluginZip, $tmpPluginFolder);
-        $this->makeSurePluginJsonExists($tmpPluginFolder);
-        $this->copyPluginToDestination($tmpPluginFolder);
+        try {
+            $this->makeSureFoldersAreWritable();
+            $this->makeSurePluginNameIsValid();
+            $this->downloadPluginFromMarketplace($tmpPluginZip);
+            $this->extractPluginFiles($tmpPluginZip, $tmpPluginFolder);
+            $this->makeSurePluginJsonExists($tmpPluginFolder);
+            $metadata = $this->getPluginMetadataIfValid($tmpPluginFolder);
+            $this->makeSureThereAreNoMissingRequirements($metadata);
+            $this->copyPluginToDestination($tmpPluginFolder);
+
+        } catch (\Exception $e) {
+
+            $this->removeFileIfExists($tmpPluginZip);
+            $this->removeFolderIfExists($tmpPluginFolder);
+
+            throw $e;
+        }
 
         $this->removeFileIfExists($tmpPluginZip);
         $this->removeFolderIfExists($tmpPluginFolder);
@@ -56,16 +67,27 @@ class PluginInstaller
         $tmpPluginFolder = PIWIK_USER_PATH . self::PATH_TO_DOWNLOAD . $this->pluginName;
         $tmpPluginFolder = SettingsPiwik::rewriteTmpPathWithHostname($tmpPluginFolder);
 
-        $this->makeSureFoldersAreWritable();
-        $this->extractPluginFiles($pathToZip, $tmpPluginFolder);
+        try {
+            $this->makeSureFoldersAreWritable();
+            $this->extractPluginFiles($pathToZip, $tmpPluginFolder);
+
+            $this->makeSurePluginJsonExists($tmpPluginFolder);
+            $metadata = $this->getPluginMetadataIfValid($tmpPluginFolder);
+            $this->makeSureThereAreNoMissingRequirements($metadata);
+
+            $this->pluginName = $metadata->name;
 
-        $this->makeSurePluginJsonExists($tmpPluginFolder);
-        $metadata = $this->getPluginMetadataIfValid($tmpPluginFolder);
+            $this->fixPluginFolderIfNeeded($tmpPluginFolder);
+            $this->copyPluginToDestination($tmpPluginFolder);
+
+        } catch (\Exception $e) {
 
-        $this->pluginName = $metadata->name;
+            $this->removeFileIfExists($pathToZip);
+            $this->removeFolderIfExists($tmpPluginFolder);
+
+            throw $e;
+        }
 
-        $this->fixPluginFolderIfNeeded($tmpPluginFolder);
-        $this->copyPluginToDestination($tmpPluginFolder);
         $this->removeFileIfExists($pathToZip);
         $this->removeFolderIfExists($tmpPluginFolder);
 
@@ -128,6 +150,24 @@ class PluginInstaller
         }
     }
 
+    private function makeSureThereAreNoMissingRequirements($metadata)
+    {
+        $requires = (array) $metadata->require;
+
+        $dependency = new PluginDependency();
+        $missingDependencies = $dependency->getMissingDependencies($requires);
+
+        if (!empty($missingDependencies)) {
+            $message = '';
+            foreach ($missingDependencies as $dep) {
+                $params   = array(ucfirst($dep['requirement']), $dep['actualVersion'], $dep['requiredVersion']);
+                $message .= Piwik::translate('CorePluginsAdmin_MissingRequirementsNotice', $params);
+            }
+
+            throw new PluginInstallerException($message);
+        }
+    }
+
     private function getPluginMetadataIfValid($tmpPluginFolder)
     {
         $pluginJsonPath = $this->getPathToPluginJson($tmpPluginFolder);