fix path check where path is same but longer than container. fixes #30

cosmocode · Aug 10, 2017 · 0f0a264 · 0f0a264
1 parent 2b85f30
commit 0f0a264
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/_test/helper.test.php b/_test/helper.test.php
@@ -57,5 +57,8 @@ public function test_isInPath() {
         $this->assertFalse($helper->isInPath('/var/www/foo', '/var/www/foo'));
         $this->assertFalse($helper->isInPath('/var/www/foo/', '/var/www/foo'));
         $this->assertFalse($helper->isInPath('/var/www/foo/bar/../', '/var/www/foo'));
+
+        // https://github.com/cosmocode/dokuwiki-plugin-farmer/issues/30
+        $this->assertFalse($helper->isInPath('/var/lib/dokuwiki.animals', '/var/lib/dokuwiki'));
     }
 }
diff --git a/helper.php b/helper.php
@@ -100,8 +100,8 @@ public function getAllAnimals() {
      * @return bool
      */
     public function isInPath($path, $container) {
-        $path = fullpath($path);
-        $container = fullpath($container);
+        $path = fullpath($path).'/';
+        $container = fullpath($container).'/';
         if($path == $container) return false;
         return (strpos($path, $container) === 0);
     }