Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wrong combined paths when traversing upwards. Fixes #557 #652

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix wrong combined paths when traversing upwards. Fixes #557 #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 23 additions & 11 deletions src/JsonSchema/Uri/UriResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,25 +125,37 @@ public function resolve($uri, $baseUri = null)
public static function combineRelativePathWithBasePath($relativePath, $basePath)
{
$relativePath = self::normalizePath($relativePath);
if ($relativePath == '') {
if (!$relativePath) {
return $basePath;
}
if ($relativePath[0] == '/') {
if ($relativePath[0] === '/') {
return $relativePath;
}

$basePathSegments = explode('/', $basePath);

preg_match('|^/?(\.\./(?:\./)*)*|', $relativePath, $match);
$numLevelUp = strlen($match[0]) /3 + 1;
if ($numLevelUp >= count($basePathSegments)) {
if (!$basePath) {
throw new UriResolverException(sprintf("Unable to resolve URI '%s' from base '%s'", $relativePath, $basePath));
}

$basePathSegments = array_slice($basePathSegments, 0, -$numLevelUp);
$path = preg_replace('|^/?(\.\./(\./)*)*|', '', $relativePath);
$dirname = $basePath[strlen($basePath) - 1] === '/' ? $basePath : dirname($basePath);
$combined = rtrim($dirname, '/') . '/' . ltrim($relativePath, '/');
$combinedSegments = explode('/', $combined);
$collapsedSegments = array();
while ($combinedSegments) {
$segment = array_shift($combinedSegments);
if ($segment === '..') {
if (count($collapsedSegments) <= 1) {
// Do not remove the top level (domain)
// This is not ideal - the domain should not be part of the path here. parse() and generate()
// should handle the "domain" separately, like the schema.
// Then the if-condition here would be `if (!$collapsedSegments) {`.
throw new UriResolverException(sprintf("Unable to resolve URI '%s' from base '%s'", $relativePath, $basePath));
}
array_pop($collapsedSegments);
} else {
$collapsedSegments[] = $segment;
}
}

return implode('/', $basePathSegments) . '/' . $path;
return implode('/', $collapsedSegments);
}

/**
Expand Down
29 changes: 23 additions & 6 deletions tests/Uri/UriResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@

class UriResolverTest extends TestCase
{
/**
* @var UriResolver
*/
private $resolver;

public function setUp()
{
$this->resolver = new UriResolver();
Expand Down Expand Up @@ -83,6 +88,21 @@ public function testCombineRelativePathWithBasePathNoPath()
);
}

/**
* Covers https://github.com/justinrainbow/json-schema/issues/557
* Relative paths yield wrong result.
*/
public function testCombineRelativePathWithBasePathTraversingUp()
{
$this->assertEquals(
'/var/packages/schema/UuidSchema.json',
UriResolver::combineRelativePathWithBasePath(
'../../../schema/UuidSchema.json',
'/var/packages/foo/tests/UnitTests/DemoData/../../../schema/Foo/FooSchema_latest.json'
)
);
}

public function testResolveAbsoluteUri()
{
$this->assertEquals(
Expand All @@ -99,12 +119,9 @@ public function testResolveAbsoluteUri()
*/
public function testResolveRelativeUriNoBase()
{
$this->assertEquals(
'http://example.org/foo/bar.json',
$this->resolver->resolve(
'bar.json',
null
)
$this->resolver->resolve(
'bar.json',
null
);
}

Expand Down