update Piwik to version 2.16 (fixes #91)

www/analytics/core/CliMulti/CliPhp.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\CliMulti;
+
+use Piwik\Common;
+
+class CliPhp
+{
+
+    public function findPhpBinary()
+    {
+        if (defined('PHP_BINARY')) {
+            if ($this->isHhvmBinary(PHP_BINARY)) {
+                return PHP_BINARY . ' --php';
+            }
+
+            if ($this->isValidPhpType(PHP_BINARY)) {
+                return PHP_BINARY . ' -q';
+            }
+        }
+
+        $bin = '';
+
+        if (!empty($_SERVER['_']) && Common::isPhpCliMode()) {
+            $bin = $this->getPhpCommandIfValid($_SERVER['_']);
+        }
+
+        if (empty($bin) && !empty($_SERVER['argv'][0]) && Common::isPhpCliMode()) {
+            $bin = $this->getPhpCommandIfValid($_SERVER['argv'][0]);
+        }
+
+        if (!$this->isValidPhpType($bin)) {
+            $bin = shell_exec('which php');
+        }
+
+        if (!$this->isValidPhpType($bin)) {
+            $bin = shell_exec('which php5');
+        }
+
+        if (!$this->isValidPhpType($bin)) {
+            return false;
+        }
+
+        $bin = trim($bin);
+
+        if (!$this->isValidPhpVersion($bin)) {
+            return false;
+        }
+
+        $bin .= ' -q';
+
+        return $bin;
+    }
+
+    private function isHhvmBinary($bin)
+    {
+        return false !== strpos($bin, 'hhvm');
+    }
+
+    private function isValidPhpVersion($bin)
+    {
+        global $piwik_minimumPHPVersion;
+        $cliVersion = $this->getPhpVersion($bin);
+        $isCliVersionValid = version_compare($piwik_minimumPHPVersion, $cliVersion) <= 0;
+        return $isCliVersionValid;
+    }
+
+    private function isValidPhpType($path)
+    {
+        return !empty($path)
+        && false === strpos($path, 'fpm')
+        && false === strpos($path, 'cgi')
+        && false === strpos($path, 'phpunit');
+    }
+
+    private function getPhpCommandIfValid($path)
+    {
+        if (!empty($path) && is_executable($path)) {
+            if (0 === strpos($path, PHP_BINDIR) && $this->isValidPhpType($path)) {
+                return $path;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param string $bin PHP binary
+     * @return string
+     */
+    private function getPhpVersion($bin)
+    {
+        $command = sprintf("%s -r 'echo phpversion();'", $bin);
+        $version = shell_exec($command);
+        return $version;
+    }
+}

www/analytics/core/CliMulti/Output.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -10,9 +10,11 @@ namespace Piwik\CliMulti;
 use Piwik\CliMulti;
 use Piwik\Filesystem;
 
-class Output {
+class Output
+{
 
     private $tmpFile  = '';
+    private $outputId = null;
 
     public function __construct($outputId)
     {
@@ -21,8 +23,15 @@ class Output {
         }
 
         $dir = CliMulti::getTmpPath();
-        Filesystem::mkdir($dir, true);
-        $this->tmpFile = $dir . '/' . $outputId . '.output';
+        Filesystem::mkdir($dir);
+
+        $this->tmpFile  = $dir . '/' . $outputId . '.output';
+        $this->outputId = $outputId;
+    }
+
+    public function getOutputId()
+    {
+        return $this->outputId;
     }
 
     public function write($content)
@@ -35,6 +44,13 @@ class Output {
         return $this->tmpFile;
     }
 
+    public function isAbnormal()
+    {
+        $size = Filesystem::getFileSize($this->tmpFile, 'MB');
+
+        return $size !== null && $size >= 100;
+    }
+
     public function exists()
     {
         return file_exists($this->tmpFile);
@@ -49,5 +65,4 @@ class Output {
     {
         Filesystem::deleteFileIfExists($this->tmpFile);
     }
-
 }

www/analytics/core/CliMulti/Process.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -24,6 +24,7 @@ class Process
     private $pidFile = '';
     private $timeCreation = null;
     private $isSupported = null;
+    private $pid = null;
 
     public function __construct($pid)
     {
@@ -32,15 +33,21 @@ class Process
         }
 
         $pidDir = CliMulti::getTmpPath();
-        Filesystem::mkdir($pidDir, true);
+        Filesystem::mkdir($pidDir);
 
         $this->isSupported  = self::isSupported();
         $this->pidFile      = $pidDir . '/' . $pid . '.pid';
         $this->timeCreation = time();
+        $this->pid = $pid;
 
         $this->markAsNotStarted();
     }
 
+    public function getPid()
+    {
+        return $this->pid;
+    }
+
     private function markAsNotStarted()
     {
         $content = $this->getPidFileContent();
@@ -97,6 +104,11 @@ class Process
             return false;
         }
 
+        if (!$this->pidFileSizeIsNormal()) {
+            $this->finishProcess();
+            return false;
+        }
+
         if ($this->isProcessStillRunning($content)) {
             return true;
         }
@@ -108,6 +120,13 @@ class Process
         return false;
     }
 
+    private function pidFileSizeIsNormal()
+    {
+        $size = Filesystem::getFileSize($this->pidFile);
+
+        return $size !== null && $size < 500;
+    }
+
     public function finishProcess()
     {
         Filesystem::deleteFileIfExists($this->pidFile);
@@ -125,7 +144,7 @@ class Process
         }
 
         $lockedPID   = trim($content);
-        $runningPIDs = explode("\n", trim( `ps -e | awk '{print $1}'` ));
+        $runningPIDs = self::getRunningProcesses();
 
         return !empty($lockedPID) && in_array($lockedPID, $runningPIDs);
     }
@@ -154,17 +173,30 @@ class Process
             return false;
         }
 
-        if (static::commandExists('ps') && self::returnsSuccessCode('ps') && self::commandExists('awk')) {
+        if (!self::commandExists('ps') || !self::returnsSuccessCode('ps') || !self::commandExists('awk')) {
+            return false;
+        }
+
+        if (count(self::getRunningProcesses()) > 0) {
             return true;
         }
 
-        return false;
+        if (!self::isProcFSMounted()) {
+            return false;
+        }
+
+        return true;
     }
 
     private static function isSystemNotSupported()
     {
-        $uname = shell_exec('uname -a');
-        if(strpos($uname, 'synology') !== false) {
+        $uname = @shell_exec('uname -a 2> /dev/null');
+
+        if (empty($uname)) {
+            $uname = php_uname();
+        }
+
+        if (strpos($uname, 'synology') !== false) {
             return true;
         }
         return false;
@@ -175,12 +207,12 @@ class Process
         $command = 'shell_exec';
         $disabled = explode(',', ini_get('disable_functions'));
         $disabled = array_map('trim', $disabled);
-        return in_array($command, $disabled);
+        return in_array($command, $disabled)  || !function_exists($command);
     }
 
     private static function returnsSuccessCode($command)
     {
-        $exec = $command . ' > /dev/null 2>&1 & echo $?';
+        $exec = $command . ' > /dev/null 2>&1; echo $?';
         $returnCode = shell_exec($exec);
         $returnCode = trim($returnCode);
         return 0 == (int) $returnCode;
@@ -188,8 +220,38 @@ class Process
 
     private static function commandExists($command)
     {
-        $result = shell_exec('which ' . escapeshellarg($command));
+        $result = @shell_exec('which ' . escapeshellarg($command) . ' 2> /dev/null');
 
         return !empty($result);
     }
-}
+
+    /**
+     * ps -e requires /proc
+     * @return bool
+     */
+    private static function isProcFSMounted()
+    {
+        if (is_resource(@fopen('/proc', 'r'))) {
+            return true;
+        }
+        // Testing if /proc is a resource with @fopen fails on systems with open_basedir set.
+        // by using stat we not only test the existance of /proc but also confirm it's a 'proc' filesystem
+        $type = @shell_exec('stat -f -c "%T" /proc 2>/dev/null');
+        return strpos($type, 'proc') === 0;
+    }
+
+    /**
+     * @return int[] The ids of the currently running processes
+     */
+     public static function getRunningProcesses()
+     {
+         $ids = explode("\n", trim(`ps ex 2>/dev/null | awk '{print $1}' 2>/dev/null`));
+
+         $ids = array_map('intval', $ids);
+         $ids = array_filter($ids, function ($id) {
+            return $id > 0;
+        });
+
+         return $ids;
+     }
+}

www/analytics/core/CliMulti/RequestCommand.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -8,6 +8,12 @@
 
 namespace Piwik\CliMulti;
 
+use Piwik\Application\Environment;
+use Piwik\Access;
+use Piwik\Container\StaticContainer;
+use Piwik\Db;
+use Piwik\Log;
+use Piwik\Option;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Url;
 use Piwik\UrlHelper;
@@ -15,33 +21,41 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Piwik\Config;
-use Piwik\Common;
-use Piwik\FrontController;
 
 /**
  * RequestCommand
  */
 class RequestCommand extends ConsoleCommand
 {
+    /**
+     * @var Environment
+     */
+    private $environment;
+
     protected function configure()
     {
         $this->setName('climulti:request');
         $this->setDescription('Parses and executes the given query. See Piwik\CliMulti. Intended only for system usage.');
-        $this->addArgument('url-query', null, InputOption::VALUE_REQUIRED, 'Piwik URL query string, for instance: "module=API&method=API.getPiwikVersion&token_auth=123456789"');
+        $this->addArgument('url-query', InputArgument::REQUIRED, 'Piwik URL query string, for instance: "module=API&method=API.getPiwikVersion&token_auth=123456789"');
+        $this->addOption('superuser', null, InputOption::VALUE_NONE, 'If supplied, runs the code as superuser.');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $this->recreateContainerWithWebEnvironment();
+
         $this->initHostAndQueryString($input);
 
         if ($this->isTestModeEnabled()) {
-            Config::getInstance()->setTestEnvironment();
-            $indexFile = '/tests/PHPUnit/proxy/index.php';
+            $indexFile = '/tests/PHPUnit/proxy/';
+
+            $this->resetDatabase();
         } else {
-            $indexFile = '/index.php';
+            $indexFile = '/';
         }
 
+        $indexFile .= 'index.php';
+
         if (!empty($_GET['pid'])) {
             $process = new Process($_GET['pid']);
 
@@ -52,6 +66,16 @@ class RequestCommand extends ConsoleCommand
             $process->startProcess();
         }
 
+        if ($input->getOption('superuser')) {
+            StaticContainer::addDefinitions(array(
+                'observers.global' => \DI\add(array(
+                    array('Environment.bootstrapped', function () {
+                        Access::getInstance()->setSuperUserAccess(true);
+                    })
+                )),
+            ));
+        }
+
         require_once PIWIK_INCLUDE_PATH . $indexFile;
 
         if (!empty($process)) {
@@ -75,10 +99,30 @@ class RequestCommand extends ConsoleCommand
         Url::setHost($hostname);
 
         $query = $input->getArgument('url-query');
-        $query = UrlHelper::getArrayFromQueryString($query);
+        $query = UrlHelper::getArrayFromQueryString($query); // NOTE: this method can create the StaticContainer now
         foreach ($query as $name => $value) {
             $_GET[$name] = $value;
         }
     }
 
-}
+    /**
+     * We will be simulating an HTTP request here (by including index.php).
+     *
+     * To avoid weird side-effects (e.g. the logging output messing up the HTTP response on the CLI output)
+     * we need to recreate the container with the default environment instead of the CLI environment.
+     */
+    private function recreateContainerWithWebEnvironment()
+    {
+        StaticContainer::clearContainer();
+        Log::unsetInstance();
+
+        $this->environment = new Environment(null);
+        $this->environment->init();
+    }
+
+    private function resetDatabase()
+    {
+        Option::clearCache();
+        Db::destroyDatabaseObject();
+    }
+}