Skip to content

Harden code a bit against edge case #1073

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
CarlSchwan wants to merge 2 commits into
base: master
Choose a base branch
from
+17 −2
Open

Harden code a bit against edge case #1073

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
ecb55cc
fix: Harden libxml_set_external_entity_loader
CarlSchwan Apr 15, 2026
5bda820
fix: Reject paths containing directory traversal sequences
CarlSchwan Apr 15, 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: 5 additions & 2 deletions lib/Helper/TXmlHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ trait TXmlHelper {
*/
public function callWithXmlEntityLoader(callable $func): mixed {
libxml_set_external_entity_loader(static fn ($public, $system) => $system);
$result = $func();
libxml_set_external_entity_loader(static fn () => null);
try {
$result = $func();
} finally {
libxml_set_external_entity_loader(static fn () => null);
}
return $result;
}
}
12 changes: 12 additions & 0 deletions lib/UserBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,18 @@ public function createUserIfNotExists(string $uid, array $attributes = []): void
$this->serverRoot . '/data') . '/' . $home;
}

// Reject paths containing directory traversal sequences
$normalizedHome = str_replace('\\', '/', $home);
if (str_contains($normalizedHome, '/../') || str_ends_with($normalizedHome, '/..')) {
$this->logger->warning(
'Rejecting home path from SAML attribute containing directory traversal sequence',
['app' => 'user_saml', 'home' => $home]
);
$home = '';
}
}

if ($home !== '') {
$values['home'] = $home;
}

Expand Down
Loading