Skip to content

fix: support federation between systems in subdirectories #41599

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
DeepDiver1975 merged 2 commits into from
Jun 8, 2026
Merged

fix: support federation between systems in subdirectories #41599

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
df458c9
fix: support federation between systems in subdirectories
phil-davis May 20, 2026
e66f9f0
fix: handle case when subdirectory has a trailing slash
phil-davis Jun 8, 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
8 changes: 8 additions & 0 deletions apps/files_sharing/lib/External/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,20 +573,28 @@ protected function testUrl(IClientService $clientService, string $remote, bool $
public function testRemoteUrl(IClientService $clientService, string $remote) {
$parsed_host = parse_url($remote, PHP_URL_HOST);
$parsed_port = parse_url($remote, PHP_URL_PORT);
$parsed_path = parse_url($remote, PHP_URL_PATH);
if (\is_string($parsed_host)) {
$remote = $parsed_host;
if ($parsed_port !== null) {
$remote .= ':' . $parsed_port;
}
if ($parsed_path !== null) {
$remote .= \rtrim($parsed_path, '/');
}
} else {
$string_to_parse = 'http://' . $remote;
$parsed_host = parse_url($string_to_parse, PHP_URL_HOST);
$parsed_port = parse_url($string_to_parse, PHP_URL_PORT);
$parsed_path = parse_url($string_to_parse, PHP_URL_PATH);
if (\is_string($parsed_host)) {
$remote = $parsed_host;
if ($parsed_port !== null) {
$remote .= ':' . $parsed_port;
}
if ($parsed_path !== null) {
$remote .= \rtrim($parsed_path, '/');
}
}
}
try {
Expand Down
28 changes: 24 additions & 4 deletions apps/files_sharing/tests/External/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,24 @@ public function testRemoveShare(): void {
$this->assertArrayHasKey('user', $called[1]);
}

public function testRemoteWithValidHttps(): void {
public function providesRemoteAddress() {
return [
[
'owncloud.com',
],
[
'owncloud.com/cloud',
],
[
'owncloud.com/cloud/',
],
];
}

/**
* @dataProvider providesRemoteAddress
*/
public function testRemoteWithValidHttps($remoteAddress): void {
$client = $this->getMockBuilder(IClient::class)
->disableOriginalConstructor()->getMock();
$response = $this->getMockBuilder(IResponse::class)
Expand All @@ -453,10 +470,13 @@ public function testRemoteWithValidHttps(): void {
->method('newClient')
->willReturn($client);

$this->assertEquals('https', $this->manager->testRemoteUrl($clientService, 'owncloud.com'));
$this->assertEquals('https', $this->manager->testRemoteUrl($clientService, $remoteAddress));
}

public function testRemoteWithWorkingHttp(): void {
/**
* @dataProvider providesRemoteAddress
*/
public function testRemoteWithWorkingHttp($remoteAddress): void {
$client = $this->getMockBuilder(IClient::class)
->disableOriginalConstructor()->getMock();
$response = $this->getMockBuilder(IResponse::class)
Expand All @@ -475,7 +495,7 @@ public function testRemoteWithWorkingHttp(): void {
->method('newClient')
->willReturn($client);

$this->assertEquals('http', $this->manager->testRemoteUrl($clientService, 'owncloud.com'));
$this->assertEquals('http', $this->manager->testRemoteUrl($clientService, $remoteAddress));
}

public function testRemoteWithInvalidRemote(): void {
Expand Down
10 changes: 10 additions & 0 deletions changelog/unreleased/41599
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Fix: support federation between systems in subdirectories

If a federated server was installed in a subdirectory like:

mydomain.com/cloud

Then checks to see that the server is up and responding would fail.
This problem has been corrected.

https://github.com/owncloud/core/pull/41599
Loading