Merge pull request #44625 from nextcloud/bugfix/44608/fix-remote-of-c…

…loudid-being-with-protocol fix(federation): ICloudId->getRemote() should contain the protocol
nextcloud · Apr 2, 2024 · 43204a0 · 43204a0
2 parents 6bced38 + 575e7d8
commit 43204a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/private/Federation/CloudIdManager.php b/lib/private/Federation/CloudIdManager.php
@@ -174,7 +174,6 @@ public function getCloudId(string $user, ?string $remote): ICloudId {
 		// note that for remote id's we don't strip the protocol for the remote we use to construct the CloudId
 		// this way if a user has an explicit non-https cloud id this will be preserved
 		// we do still use the version without protocol for looking up the display name
-		$remote = $this->removeProtocolFromUrl($remote, true);
 		$remote = $this->fixRemoteURL($remote);
 		$host = $this->removeProtocolFromUrl($remote);
 
@@ -191,7 +190,9 @@ public function getCloudId(string $user, ?string $remote): ICloudId {
 		} else {
 			$displayName = $this->getDisplayNameFromContact($user . '@' . $host);
 		}
-		$id = $user . '@' . $remote;
+
+		// For the visible cloudID we only strip away https
+		$id = $user . '@' . $this->removeProtocolFromUrl($remote, true);
 
 		$data = [
 			'id' => $id,

diff --git a/tests/lib/Federation/CloudIdManagerTest.php b/tests/lib/Federation/CloudIdManagerTest.php
@@ -128,11 +128,11 @@ public function getCloudIdProvider(): array {
 		return [
 			['test', 'example.com', 'test@example.com'],
 			['test', 'http://example.com', 'test@http://example.com', 'test@example.com'],
-			['test', null, 'test@http://example.com', 'test@example.com', 'http://example.com'],
+			['test', null, 'test@http://example.com', 'test@example.com', 'http://example.com', 'http://example.com'],
 			['test@example.com', 'example.com', 'test@example.com@example.com'],
 			['test@example.com', 'https://example.com', 'test@example.com@example.com'],
-			['test@example.com', null, 'test@example.com@example.com'],
-			['test@example.com', 'https://example.com/index.php/s/shareToken', 'test@example.com@example.com'],
+			['test@example.com', null, 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
+			['test@example.com', 'https://example.com/index.php/s/shareToken', 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
 		];
 	}
 
@@ -143,7 +143,7 @@ public function getCloudIdProvider(): array {
 	 * @param null|string $remote
 	 * @param string $id
 	 */
-	public function testGetCloudId(string $user, ?string $remote, string $id, ?string $searchCloudId = null, ?string $localHost = 'https://example.com'): void {
+	public function testGetCloudId(string $user, ?string $remote, string $id, ?string $searchCloudId = null, ?string $localHost = 'https://example.com', ?string $expectedRemoteId = null): void {
 		if ($remote !== null) {
 			$this->contactsManager->expects($this->any())
 				->method('search')
@@ -159,9 +159,11 @@ public function testGetCloudId(string $user, ?string $remote, string $id, ?strin
 				->method('getAbsoluteUrl')
 				->willReturn($localHost);
 		}
+		$expectedRemoteId ??= $remote;
 
 		$cloudId = $this->cloudIdManager->getCloudId($user, $remote);
 
-		$this->assertEquals($id, $cloudId->getId());
+		$this->assertEquals($id, $cloudId->getId(), 'Cloud ID');
+		$this->assertEquals($expectedRemoteId, $cloudId->getRemote(), 'Remote URL');
 	}
 }