Skip to content

[stable29] fix unjailedroot of nested jails if there are other wrappers in between #52861

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

Closed
backportbot wants to merge 2 commits into from
Closed

[stable29] fix unjailedroot of nested jails if there are other wrappers in between #52861

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
261c1ac
test: add test for nested cache jail unjailedroot
icewind1991 May 12, 2025
143ef83
fix: fix unjailedroot of nested jails if there are other wrappers in …
icewind1991 May 12, 2025
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
Prev Previous commit
fix: fix unjailedroot of nested jails if there are other wrappers in … 
…between

Signed-off-by: Robin Appelman <[email protected]>

[skip ci]
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed May 15, 2025
commit 143ef833e118a248c1f714610714fc0146d7658b
11 changes: 7 additions & 4 deletions lib/private/Files/Cache/Wrapper/CacheJail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,13 @@ public function __construct(
parent::__construct($cache, $dependencies);
$this->root = $root;

if ($cache instanceof CacheJail) {
$this->unjailedRoot = $cache->getSourcePath($root);
} else {
$this->unjailedRoot = $root;
$this->unjailedRoot = $root;
$parent = $cache;
while ($parent instanceof CacheWrapper) {
if ($parent instanceof CacheJail) {
$this->unjailedRoot = $parent->getSourcePath($this->unjailedRoot);
}
$parent = $parent->getCache();
}
}

Expand Down