Skip to content

[stable28] Fix copying or moving from shared groupfolders #48966

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

Merged
provokateurin merged 2 commits into from
Oct 29, 2024
Merged

[stable28] Fix copying or moving from shared groupfolders #48966

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e18de3a
fix: Fix copying or moving from shared groupfolders
danxuliu Sep 9, 2024
accf707
test: add test for nested jail cross-storage move
icewind1991 Oct 2, 2024
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
test: add test for nested jail cross-storage move 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed Oct 29, 2024
commit accf7076591bfee843a00a5f2bab7c648f6eb453
23 changes: 23 additions & 0 deletions tests/lib/Files/Storage/LocalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

namespace Test\Files\Storage;

use OC\Files\Storage\Wrapper\Jail;

/**
* Class LocalTest
*
Expand Down Expand Up @@ -150,4 +152,25 @@ public function testUnavailableNonExternal() {
// no exception thrown
$this->assertNotNull($this->instance);
}

public function testMoveNestedJail(): void {
$this->instance->mkdir('foo');
$this->instance->mkdir('foo/bar');
$this->instance->mkdir('target');
$this->instance->file_put_contents('foo/bar/file.txt', 'foo');
$jail1 = new Jail([
'storage' => $this->instance,
'root' => 'foo'
]);
$jail2 = new Jail([
'storage' => $jail1,
'root' => 'bar'
]);
$jail3 = new Jail([
'storage' => $this->instance,
'root' => 'target'
]);
$jail3->moveFromStorage($jail2, 'file.txt', 'file.txt');
$this->assertTrue($this->instance->file_exists('target/file.txt'));
}
}