Merge pull request cebe#99 from il-m-yamagishi/94-fix-multiple-dots

cebe · web-flow · commit e58a97750d9f · 2021-02-16T10:24:08.000+01:00
cebe#94 fix multiple dots
diff --git a/src/ReferenceContext.php b/src/ReferenceContext.php
@@ -115,14 +115,16 @@ private function reduceDots($path)
     {
         $parts = explode('/', ltrim($path, '/'));
         $c = count($parts);
+        $parentOffset = 1;
         for ($i = 0; $i < $c; $i++) {
             if ($parts[$i] === '.') {
                 unset($parts[$i]);
                 continue;
             }
-            if ($i > 0 && $parts[$i] === '..' && $parts[$i-1] !== '..') {
-                unset($parts[$i-1]);
+            if ($i > 0 && $parts[$i] === '..' && $parts[$i - $parentOffset] !== '..') {
+                unset($parts[$i - $parentOffset]);
                 unset($parts[$i]);
+                $parentOffset += 2;
             }
         }
         return '/'.implode('/', $parts);
diff --git a/tests/ReferenceContextTest.php b/tests/ReferenceContextTest.php
@@ -183,6 +183,10 @@ public function normalizeUriProvider()
                 '/var/www/api/../definitions.yaml#/components/Pet',
                 'file:///var/www/definitions.yaml#/components/Pet',
             ],
+            [
+                '/var/www/api/foo/../../definitions.yaml#/components/Pet',
+                'file:///var/www/definitions.yaml#/components/Pet',
+            ],
         ];
 
         return $data;

Original file line number	Diff line number	Diff line change
`@@ -115,14 +115,16 @@ private function reduceDots($path)`
`115`	`115`	`{`
`116`	`116`	`$parts = explode('/', ltrim($path, '/'));`
`117`	`117`	`$c = count($parts);`
	`118`	`+ $parentOffset = 1;`
`118`	`119`	`for ($i = 0; $i < $c; $i++) {`
`119`	`120`	`if ($parts[$i] === '.') {`
`120`	`121`	`unset($parts[$i]);`
`121`	`122`	`continue;`
`122`	`123`	`}`
`123`		`- if ($i > 0 && $parts[$i] === '..' && $parts[$i-1] !== '..') {`
`124`		`- unset($parts[$i-1]);`
	`124`	`+ if ($i > 0 && $parts[$i] === '..' && $parts[$i - $parentOffset] !== '..') {`
	`125`	`+ unset($parts[$i - $parentOffset]);`
`125`	`126`	`unset($parts[$i]);`
	`127`	`+ $parentOffset += 2;`
`126`	`128`	`}`
`127`	`129`	`}`
`128`	`130`	`return '/'.implode('/', $parts);`