Skip to content

Update UNC path handling #2591

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

Open
monkeyiq wants to merge 2 commits into
base: simplesamlphp-2.5
Choose a base branch
from
Open

Update UNC path handling #2591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
125eebb
Update UNC path handling
monkeyiq Feb 5, 2026
dc94e11
test case
monkeyiq Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/SimpleSAML/Utils/System.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,12 @@ public function resolvePath(string $path, ?string $base = null): string
// check for absolute path
if (substr($path, 0, 1) === '/') {
// absolute path. */
$ret = '/';
if (substr($path, 0, 2) === '//') {
// UNC absolute path
$ret = '//';
} else {
$ret = '/';
}
} elseif ($this->pathContainsDriveLetter($path)) {
$ret = '';
} else {
Expand Down
17 changes: 17 additions & 0 deletions tests/src/SimpleSAML/Utils/SystemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,4 +279,21 @@ protected function clearInstance(Configuration $service, string $className): voi
$reflectedInstance->setValue($service, []);
$reflectedInstance->setAccessible(false);
}


/**
*/
public function testUNCpaths(): void
Copy link
Member

@tvdijen tvdijen Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not right. If the separator is \\ then the UNC-path should also use backslashes?

{
if (DIRECTORY_SEPARATOR == '\\') {
Copy link
Member

@tvdijen tvdijen Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick, but please use strict comparison (===)


$base = null;
$path = "\\some-pc\some-share\some.key";

$res = $this->sysUtils->resolvePath($path, $base);
$expected = "//some-pc/some-share/some.key";

$this->assertEquals($expected, $res);
}
}
}
Loading