Issue 89 - multiple open basedir directories support for upload_tmp_dir check test

.gitignore

@@ -1 +1,2 @@
 vendor/*
+bin/*

src/Psecio/Iniscan/Rule/CheckUploadTmpDir.php

@@ -23,13 +23,20 @@ public function __construct($config, $section)
 	 */
 	public function evaluate(array $ini)
 	{
-		$openBasedir = $this->getCast()->castValue($this->findValue('open_basedir', $ini));
+		$openBasedirDirs = $this->getCast()->castValue($this->findValue('open_basedir', $ini));
+
+		$openBasedirDirs = is_string($openBasedirDirs) ? explode(PATH_SEPARATOR, $openBasedirDirs) : array();
+		$openBasedirDirs = array_filter($openBasedirDirs, function($baseDir) {
+			return trim($baseDir) !== '';
+		});
 
 		// This only matters if an open_basedir is set
-		if ($openBasedir === 0) {
+		if (empty($openBasedirDirs)) {
 			return true;
 		} else {
-			$openBasedir = realpath($openBasedir);
+			array_walk($openBasedirDirs, function(&$openBasedir) {
+				$openBasedir = realpath($openBasedir);
+			});
 		}
 
 		$uploadTmpDir = $this->getCast()->castValue($this->findValue('upload_tmp_dir', $ini));
@@ -41,21 +48,32 @@ public function evaluate(array $ini)
 			$uploadTmpDir = realpath($uploadTmpDir);
 		}
 
+
 		// Make sure the folders are still valid
-		if ($openBasedir === false) {
-			$this->setDescription('The open_basedir did not resolve to a valid directory');
-			$this->fail();
-			return false;
+		foreach ($openBasedirDirs as $openBasedir) {
+			if ($openBasedir === false) {
+				$this->setDescription(sprintf('The open_basedir [%s] did not resolve to a valid directory', $openBasedir));
+				$this->fail();
+				return false;
+			}
 		}
+
 		if ($uploadTmpDir === false) {
 			$this->setDescription('The upload_tmp_dir did not resolve to a valid directory');
 			$this->fail();
 			return false;
 		}
 
 		// Ensure that the upload_tmp_dir is inside the base directory
-		if (strpos($uploadTmpDir, $openBasedir) !== 0) {
-			$this->setDescription('upload_tmp_dir is not inside of open_basedir which will prevent files from being uploaded');
+		$uploadDirInOpenBasedir = false;
+		foreach ($openBasedirDirs as $openBasedir) {
+			if (strpos($uploadTmpDir, $openBasedir) === 0) {
+				$uploadDirInOpenBasedir = true;
+				break;
+			}
+		}
+		if (!$uploadDirInOpenBasedir) {
+			$this->setDescription('upload_tmp_dir is not inside any of open_basedir directories which will prevent files from being uploaded');
 			$this->fail();
 			return false;
 		}

tests/Psecio/Iniscan/Rule/CheckUploadTmpDirTest.php

@@ -9,7 +9,7 @@ class CheckUploadTmpDirTest extends \PHPUnit_Framework_TestCase
      *
      * @covers \Psecio\Iniscan\Rule\CheckUploadTmpDir::evaluate
      */
-/*    public function testUploadTmpDirFail()
+    public function testUploadTmpDirNotInOpenBaseDir()
     {
         $config = array();
         $section = 'PHP';
@@ -45,11 +45,11 @@ public function testUploadTmpDirSuccess()
     }
 
     /**
-     * Test that when upload_tmp_dir is inside open_basedir, we evaluate true
+     * Test that when open_basedir is set to system tmp dir and upload_tmp_dir is not set, we evaluate true
      *
      * @covers \Psecio\Iniscan\Rule\CheckUploadTmpDir::evaluate
      */
-/*    public function testUploadTmpDirSysDefault()
+    public function testUploadTmpDirSysDefault()
     {
         $config = array();
         $section = 'PHP';
@@ -61,5 +61,46 @@ public function testUploadTmpDirSuccess()
 
         $result = $rule->evaluate($ini);
         $this->assertTrue($result);
-    }*/
+    }
+
+    /**
+     * Test that when upload_tmp_dir is inside one of open_basedir directories, we evaluate true
+     *
+     * @covers \Psecio\Iniscan\Rule\CheckUploadTmpDir::evaluate
+     */
+    public function testUploadTmpDirInOneOfOpenBasedir()
+    {
+        $config = array();
+        $section = 'PHP';
+        $rule = new CheckUploadTmpDir($config, $section);
+
+        $ini = array(
+            'open_basedir' => '/tmp' . PATH_SEPARATOR . '/var',
+            'upload_tmp_dir' => '/tmp'
+        );
+
+        $result = $rule->evaluate($ini);
+        $this->assertTrue($result);
+    }
+
+    /**
+     * Test that when upload_tmp_dir is not inside one of open_basedir directories, we evaluate false
+     *
+     * @covers \Psecio\Iniscan\Rule\CheckUploadTmpDir::evaluate
+     */
+    public function testUploadTmpDirNotInOneOfOpenBasedir()
+    {
+        $config = array();
+        $section = 'PHP';
+        $rule = new CheckUploadTmpDir($config, $section);
+
+        $ini = array(
+            'open_basedir' => '/tmp' . PATH_SEPARATOR . '/var',
+            'upload_tmp_dir' => '/etc'
+        );
+
+        $result = $rule->evaluate($ini);
+        $this->assertFalse($result);
+    }
+
 }