nextcloud / server

tests/lib/Federation/CloudIdTest.php

Indentation +29 added lines, -29 removed lines

@@ -19,33 +19,33 @@
  * @group DB
  */
 class CloudIdTest extends TestCase {
-	protected CloudIdManager&MockObject $cloudIdManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->cloudIdManager = $this->createMock(CloudIdManager::class);
-		$this->overwriteService(ICloudIdManager::class, $this->cloudIdManager);
-	}
-
-	public function dataGetDisplayCloudId(): array {
-		return [
-			['test@example.com', 'test', 'example.com', 'test@example.com'],
-			['test@http://example.com', 'test', 'http://example.com', 'test@example.com'],
-			['test@https://example.com', 'test', 'https://example.com', 'test@example.com'],
-			['test@https://example.com', 'test', 'https://example.com', 'Beloved Amy@example.com', 'Beloved Amy'],
-		];
-	}
-
-	/**
-	 * @dataProvider dataGetDisplayCloudId
-	 */
-	public function testGetDisplayCloudId(string $id, string $user, string $remote, string $display, ?string $addressbookName = null): void {
-		$this->cloudIdManager->expects($this->once())
-			->method('getDisplayNameFromContact')
-			->willReturn($addressbookName);
-
-		$cloudId = new CloudId($id, $user, $remote);
-		$this->assertEquals($display, $cloudId->getDisplayId());
-	}
+    protected CloudIdManager&MockObject $cloudIdManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->cloudIdManager = $this->createMock(CloudIdManager::class);
+        $this->overwriteService(ICloudIdManager::class, $this->cloudIdManager);
+    }
+
+    public function dataGetDisplayCloudId(): array {
+        return [
+            ['test@example.com', 'test', 'example.com', 'test@example.com'],
+            ['test@http://example.com', 'test', 'http://example.com', 'test@example.com'],
+            ['test@https://example.com', 'test', 'https://example.com', 'test@example.com'],
+            ['test@https://example.com', 'test', 'https://example.com', 'Beloved Amy@example.com', 'Beloved Amy'],
+        ];
+    }
+
+    /**
+     * @dataProvider dataGetDisplayCloudId
+     */
+    public function testGetDisplayCloudId(string $id, string $user, string $remote, string $display, ?string $addressbookName = null): void {
+        $this->cloudIdManager->expects($this->once())
+            ->method('getDisplayNameFromContact')
+            ->willReturn($addressbookName);
+
+        $cloudId = new CloudId($id, $user, $remote);
+        $this->assertEquals($display, $cloudId->getDisplayId());
+    }
 }

tests/lib/Federation/CloudIdManagerTest.php

Indentation +125 added lines, -125 removed lines

@@ -23,129 +23,129 @@
  * @group DB
  */
 class CloudIdManagerTest extends TestCase {
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $contactsManager;
-	/** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
-	private $urlGenerator;
-	/** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $userManager;
-	/** @var CloudIdManager */
-	private $cloudIdManager;
-	/** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $cacheFactory;
-
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->contactsManager = $this->createMock(IManager::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-
-		$this->cacheFactory = $this->createMock(ICacheFactory::class);
-		$this->cacheFactory->method('createDistributed')
-			->willReturn(new ArrayCache(''));
-
-		$this->cloudIdManager = new CloudIdManager(
-			$this->contactsManager,
-			$this->urlGenerator,
-			$this->userManager,
-			$this->cacheFactory,
-			$this->createMock(IEventDispatcher::class)
-		);
-		$this->overwriteService(ICloudIdManager::class, $this->cloudIdManager);
-	}
-
-	public function cloudIdProvider(): array {
-		return [
-			['test@example.com', 'test', 'example.com', 'test@example.com'],
-			['test@example.com/cloud', 'test', 'example.com/cloud', 'test@example.com/cloud'],
-			['test@example.com/cloud/', 'test', 'example.com/cloud', 'test@example.com/cloud'],
-			['test@example.com/cloud/index.php', 'test', 'example.com/cloud', 'test@example.com/cloud'],
-			['test@example.com@example.com', 'test@example.com', 'example.com', 'test@example.com@example.com'],
-		];
-	}
-
-	/**
-	 * @dataProvider cloudIdProvider
-	 */
-	public function testResolveCloudId(string $cloudId, string $user, string $noProtocolRemote, string $cleanId): void {
-		$displayName = 'Ample Ex';
-
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->with($cleanId, ['CLOUD'])
-			->willReturn([
-				[
-					'CLOUD' => [$cleanId],
-					'FN' => $displayName,
-				]
-			]);
-
-		$cloudId = $this->cloudIdManager->resolveCloudId($cloudId);
-
-		$this->assertEquals($user, $cloudId->getUser());
-		$this->assertEquals('https://' . $noProtocolRemote, $cloudId->getRemote());
-		$this->assertEquals($cleanId, $cloudId->getId());
-		$this->assertEquals($displayName . '@' . $noProtocolRemote, $cloudId->getDisplayId());
-	}
-
-	public function invalidCloudIdProvider(): array {
-		return [
-			['example.com'],
-			['test:foo@example.com'],
-			['test/foo@example.com']
-		];
-	}
-
-	/**
-	 * @dataProvider invalidCloudIdProvider
-	 */
-	public function testInvalidCloudId(string $cloudId): void {
-		$this->expectException(\InvalidArgumentException::class);
-
-		$this->contactsManager->expects($this->never())
-			->method('search');
-
-		$this->cloudIdManager->resolveCloudId($cloudId);
-	}
-
-	public function getCloudIdProvider(): array {
-		return [
-			['test', 'example.com', 'test@example.com', null, 'https://example.com', 'https://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', 'http://example.com'],
-			['test@example.com', 'example.com', 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
-			['test@example.com', 'https://example.com', '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'],
-		];
-	}
-
-	/**
-	 * @dataProvider getCloudIdProvider
-	 */
-	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')
-				->with($searchCloudId ?? $id, ['CLOUD'])
-				->willReturn([
-					[
-						'CLOUD' => [$searchCloudId ?? $id],
-						'FN' => 'Ample Ex',
-					]
-				]);
-		} else {
-			$this->urlGenerator->expects(self::once())
-				->method('getAbsoluteUrl')
-				->willReturn($localHost);
-		}
-		$expectedRemoteId ??= $remote;
-
-		$cloudId = $this->cloudIdManager->getCloudId($user, $remote);
-
-		$this->assertEquals($id, $cloudId->getId(), 'Cloud ID');
-		$this->assertEquals($expectedRemoteId, $cloudId->getRemote(), 'Remote URL');
-	}
+    /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
+    protected $contactsManager;
+    /** @var IURLGenerator|\PHPUnit\Framework\MockObject\MockObject */
+    private $urlGenerator;
+    /** @var IUserManager|\PHPUnit\Framework\MockObject\MockObject */
+    private $userManager;
+    /** @var CloudIdManager */
+    private $cloudIdManager;
+    /** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
+    private $cacheFactory;
+
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->contactsManager = $this->createMock(IManager::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+
+        $this->cacheFactory = $this->createMock(ICacheFactory::class);
+        $this->cacheFactory->method('createDistributed')
+            ->willReturn(new ArrayCache(''));
+
+        $this->cloudIdManager = new CloudIdManager(
+            $this->contactsManager,
+            $this->urlGenerator,
+            $this->userManager,
+            $this->cacheFactory,
+            $this->createMock(IEventDispatcher::class)
+        );
+        $this->overwriteService(ICloudIdManager::class, $this->cloudIdManager);
+    }
+
+    public function cloudIdProvider(): array {
+        return [
+            ['test@example.com', 'test', 'example.com', 'test@example.com'],
+            ['test@example.com/cloud', 'test', 'example.com/cloud', 'test@example.com/cloud'],
+            ['test@example.com/cloud/', 'test', 'example.com/cloud', 'test@example.com/cloud'],
+            ['test@example.com/cloud/index.php', 'test', 'example.com/cloud', 'test@example.com/cloud'],
+            ['test@example.com@example.com', 'test@example.com', 'example.com', 'test@example.com@example.com'],
+        ];
+    }
+
+    /**
+     * @dataProvider cloudIdProvider
+     */
+    public function testResolveCloudId(string $cloudId, string $user, string $noProtocolRemote, string $cleanId): void {
+        $displayName = 'Ample Ex';
+
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->with($cleanId, ['CLOUD'])
+            ->willReturn([
+                [
+                    'CLOUD' => [$cleanId],
+                    'FN' => $displayName,
+                ]
+            ]);
+
+        $cloudId = $this->cloudIdManager->resolveCloudId($cloudId);
+
+        $this->assertEquals($user, $cloudId->getUser());
+        $this->assertEquals('https://' . $noProtocolRemote, $cloudId->getRemote());
+        $this->assertEquals($cleanId, $cloudId->getId());
+        $this->assertEquals($displayName . '@' . $noProtocolRemote, $cloudId->getDisplayId());
+    }
+
+    public function invalidCloudIdProvider(): array {
+        return [
+            ['example.com'],
+            ['test:foo@example.com'],
+            ['test/foo@example.com']
+        ];
+    }
+
+    /**
+     * @dataProvider invalidCloudIdProvider
+     */
+    public function testInvalidCloudId(string $cloudId): void {
+        $this->expectException(\InvalidArgumentException::class);
+
+        $this->contactsManager->expects($this->never())
+            ->method('search');
+
+        $this->cloudIdManager->resolveCloudId($cloudId);
+    }
+
+    public function getCloudIdProvider(): array {
+        return [
+            ['test', 'example.com', 'test@example.com', null, 'https://example.com', 'https://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', 'http://example.com'],
+            ['test@example.com', 'example.com', 'test@example.com@example.com', null, 'https://example.com', 'https://example.com'],
+            ['test@example.com', 'https://example.com', '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'],
+        ];
+    }
+
+    /**
+     * @dataProvider getCloudIdProvider
+     */
+    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')
+                ->with($searchCloudId ?? $id, ['CLOUD'])
+                ->willReturn([
+                    [
+                        'CLOUD' => [$searchCloudId ?? $id],
+                        'FN' => 'Ample Ex',
+                    ]
+                ]);
+        } else {
+            $this->urlGenerator->expects(self::once())
+                ->method('getAbsoluteUrl')
+                ->willReturn($localHost);
+        }
+        $expectedRemoteId ??= $remote;
+
+        $cloudId = $this->cloudIdManager->getCloudId($user, $remote);
+
+        $this->assertEquals($id, $cloudId->getId(), 'Cloud ID');
+        $this->assertEquals($expectedRemoteId, $cloudId->getRemote(), 'Remote URL');
+    }
 }

lib/private/Federation/CloudIdManager.php

Indentation +226 added lines, -226 removed lines

@@ -21,230 +21,230 @@
 use OCP\User\Events\UserChangedEvent;
 
 class CloudIdManager implements ICloudIdManager {
-	/** @var IManager */
-	private $contactsManager;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IUserManager */
-	private $userManager;
-	private ICache $memCache;
-	private ICache $displayNameCache;
-	/** @var array[] */
-	private array $cache = [];
-
-	public function __construct(
-		IManager $contactsManager,
-		IURLGenerator $urlGenerator,
-		IUserManager $userManager,
-		ICacheFactory $cacheFactory,
-		IEventDispatcher $eventDispatcher,
-	) {
-		$this->contactsManager = $contactsManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->userManager = $userManager;
-		$this->memCache = $cacheFactory->createDistributed('cloud_id_');
-		$this->displayNameCache = $cacheFactory->createDistributed('cloudid_name_');
-		$eventDispatcher->addListener(UserChangedEvent::class, [$this, 'handleUserEvent']);
-		$eventDispatcher->addListener(CardUpdatedEvent::class, [$this, 'handleCardEvent']);
-	}
-
-	public function handleUserEvent(Event $event): void {
-		if ($event instanceof UserChangedEvent && $event->getFeature() === 'displayName') {
-			$userId = $event->getUser()->getUID();
-			$key = $userId . '@local';
-			unset($this->cache[$key]);
-			$this->memCache->remove($key);
-		}
-	}
-
-	public function handleCardEvent(Event $event): void {
-		if ($event instanceof CardUpdatedEvent) {
-			$data = $event->getCardData()['carddata'];
-			foreach (explode("\r\n", $data) as $line) {
-				if (str_starts_with($line, 'CLOUD;')) {
-					$parts = explode(':', $line, 2);
-					if (isset($parts[1])) {
-						$key = $parts[1];
-						unset($this->cache[$key]);
-						$this->memCache->remove($key);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return ICloudId
-	 * @throws \InvalidArgumentException
-	 */
-	public function resolveCloudId(string $cloudId): ICloudId {
-		// TODO magic here to get the url and user instead of just splitting on @
-
-		if (!$this->isValidCloudId($cloudId)) {
-			throw new \InvalidArgumentException('Invalid cloud id');
-		}
-
-		// Find the first character that is not allowed in user names
-		$id = $this->stripShareLinkFragments($cloudId);
-		$posSlash = strpos($id, '/');
-		$posColon = strpos($id, ':');
-
-		if ($posSlash === false && $posColon === false) {
-			$invalidPos = \strlen($id);
-		} elseif ($posSlash === false) {
-			$invalidPos = $posColon;
-		} elseif ($posColon === false) {
-			$invalidPos = $posSlash;
-		} else {
-			$invalidPos = min($posSlash, $posColon);
-		}
-
-		$lastValidAtPos = strrpos($id, '@', $invalidPos - strlen($id));
-
-		if ($lastValidAtPos !== false) {
-			$user = substr($id, 0, $lastValidAtPos);
-			$remote = substr($id, $lastValidAtPos + 1);
-
-			$this->userManager->validateUserId($user);
-
-			if (!empty($user) && !empty($remote)) {
-				$remote = $this->ensureDefaultProtocol($remote);
-				return new CloudId($id, $user, $remote, null);
-			}
-		}
-		throw new \InvalidArgumentException('Invalid cloud id');
-	}
-
-	public function getDisplayNameFromContact(string $cloudId): ?string {
-		$cachedName = $this->displayNameCache->get($cloudId);
-		if ($cachedName !== null) {
-			return $cachedName;
-		}
-
-		$addressBookEntries = $this->contactsManager->search($cloudId, ['CLOUD'], [
-			'limit' => 1,
-			'enumeration' => false,
-			'fullmatch' => false,
-			'strict_search' => true,
-		]);
-		foreach ($addressBookEntries as $entry) {
-			if (isset($entry['CLOUD'])) {
-				foreach ($entry['CLOUD'] as $cloudID) {
-					if ($cloudID === $cloudId) {
-						// Warning, if user decides to make their full name local only,
-						// no FN is found on federated servers
-						if (isset($entry['FN'])) {
-							$this->displayNameCache->set($cloudId, $entry['FN'], 15 * 60);
-							return $entry['FN'];
-						} else {
-							$this->displayNameCache->set($cloudId, $cloudID, 15 * 60);
-							return $cloudID;
-						}
-					}
-				}
-			}
-		}
-		$this->displayNameCache->set($cloudId, $cloudId, 15 * 60);
-		return null;
-	}
-
-	/**
-	 * @param string $user
-	 * @param string|null $remote
-	 * @return CloudId
-	 */
-	public function getCloudId(string $user, ?string $remote): ICloudId {
-		$isLocal = $remote === null;
-		if ($isLocal) {
-			$remote = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
-		}
-
-		// 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->stripShareLinkFragments($remote);
-		$host = $this->removeProtocolFromUrl($remote);
-		$remote = $this->ensureDefaultProtocol($remote);
-
-		$key = $user . '@' . ($isLocal ? 'local' : $host);
-		$cached = $this->cache[$key] ?? $this->memCache->get($key);
-		if ($cached) {
-			$this->cache[$key] = $cached; // put items from memcache into local cache
-			return new CloudId($cached['id'], $cached['user'], $cached['remote'], $cached['displayName']);
-		}
-
-		if ($isLocal) {
-			$localUser = $this->userManager->get($user);
-			$displayName = $localUser ? $localUser->getDisplayName() : '';
-		} else {
-			$displayName = null;
-		}
-
-		// For the visible cloudID we only strip away https
-		$id = $user . '@' . $this->removeProtocolFromUrl($remote, true);
-
-		$data = [
-			'id' => $id,
-			'user' => $user,
-			'remote' => $remote,
-			'displayName' => $displayName,
-		];
-		$this->cache[$key] = $data;
-		$this->memCache->set($key, $data, 15 * 60);
-		return new CloudId($id, $user, $remote, $displayName);
-	}
-
-	/**
-	 * @param string $url
-	 * @return string
-	 */
-	public function removeProtocolFromUrl(string $url, bool $httpsOnly = false): string {
-		if (str_starts_with($url, 'https://')) {
-			return substr($url, 8);
-		}
-		if (!$httpsOnly && str_starts_with($url, 'http://')) {
-			return substr($url, 7);
-		}
-
-		return $url;
-	}
-
-	protected function ensureDefaultProtocol(string $remote): string {
-		if (!str_contains($remote, '://')) {
-			$remote = 'https://' . $remote;
-		}
-
-		return $remote;
-	}
-
-	/**
-	 * Strips away a potential file names and trailing slashes:
-	 * - http://localhost
-	 * - http://localhost/
-	 * - http://localhost/index.php
-	 * - http://localhost/index.php/s/{shareToken}
-	 *
-	 * all return: http://localhost
-	 *
-	 * @param string $remote
-	 * @return string
-	 */
-	protected function stripShareLinkFragments(string $remote): string {
-		$remote = str_replace('\\', '/', $remote);
-		if ($fileNamePosition = strpos($remote, '/index.php')) {
-			$remote = substr($remote, 0, $fileNamePosition);
-		}
-		$remote = rtrim($remote, '/');
-
-		return $remote;
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return bool
-	 */
-	public function isValidCloudId(string $cloudId): bool {
-		return str_contains($cloudId, '@');
-	}
+    /** @var IManager */
+    private $contactsManager;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IUserManager */
+    private $userManager;
+    private ICache $memCache;
+    private ICache $displayNameCache;
+    /** @var array[] */
+    private array $cache = [];
+
+    public function __construct(
+        IManager $contactsManager,
+        IURLGenerator $urlGenerator,
+        IUserManager $userManager,
+        ICacheFactory $cacheFactory,
+        IEventDispatcher $eventDispatcher,
+    ) {
+        $this->contactsManager = $contactsManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->userManager = $userManager;
+        $this->memCache = $cacheFactory->createDistributed('cloud_id_');
+        $this->displayNameCache = $cacheFactory->createDistributed('cloudid_name_');
+        $eventDispatcher->addListener(UserChangedEvent::class, [$this, 'handleUserEvent']);
+        $eventDispatcher->addListener(CardUpdatedEvent::class, [$this, 'handleCardEvent']);
+    }
+
+    public function handleUserEvent(Event $event): void {
+        if ($event instanceof UserChangedEvent && $event->getFeature() === 'displayName') {
+            $userId = $event->getUser()->getUID();
+            $key = $userId . '@local';
+            unset($this->cache[$key]);
+            $this->memCache->remove($key);
+        }
+    }
+
+    public function handleCardEvent(Event $event): void {
+        if ($event instanceof CardUpdatedEvent) {
+            $data = $event->getCardData()['carddata'];
+            foreach (explode("\r\n", $data) as $line) {
+                if (str_starts_with($line, 'CLOUD;')) {
+                    $parts = explode(':', $line, 2);
+                    if (isset($parts[1])) {
+                        $key = $parts[1];
+                        unset($this->cache[$key]);
+                        $this->memCache->remove($key);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $cloudId
+     * @return ICloudId
+     * @throws \InvalidArgumentException
+     */
+    public function resolveCloudId(string $cloudId): ICloudId {
+        // TODO magic here to get the url and user instead of just splitting on @
+
+        if (!$this->isValidCloudId($cloudId)) {
+            throw new \InvalidArgumentException('Invalid cloud id');
+        }
+
+        // Find the first character that is not allowed in user names
+        $id = $this->stripShareLinkFragments($cloudId);
+        $posSlash = strpos($id, '/');
+        $posColon = strpos($id, ':');
+
+        if ($posSlash === false && $posColon === false) {
+            $invalidPos = \strlen($id);
+        } elseif ($posSlash === false) {
+            $invalidPos = $posColon;
+        } elseif ($posColon === false) {
+            $invalidPos = $posSlash;
+        } else {
+            $invalidPos = min($posSlash, $posColon);
+        }
+
+        $lastValidAtPos = strrpos($id, '@', $invalidPos - strlen($id));
+
+        if ($lastValidAtPos !== false) {
+            $user = substr($id, 0, $lastValidAtPos);
+            $remote = substr($id, $lastValidAtPos + 1);
+
+            $this->userManager->validateUserId($user);
+
+            if (!empty($user) && !empty($remote)) {
+                $remote = $this->ensureDefaultProtocol($remote);
+                return new CloudId($id, $user, $remote, null);
+            }
+        }
+        throw new \InvalidArgumentException('Invalid cloud id');
+    }
+
+    public function getDisplayNameFromContact(string $cloudId): ?string {
+        $cachedName = $this->displayNameCache->get($cloudId);
+        if ($cachedName !== null) {
+            return $cachedName;
+        }
+
+        $addressBookEntries = $this->contactsManager->search($cloudId, ['CLOUD'], [
+            'limit' => 1,
+            'enumeration' => false,
+            'fullmatch' => false,
+            'strict_search' => true,
+        ]);
+        foreach ($addressBookEntries as $entry) {
+            if (isset($entry['CLOUD'])) {
+                foreach ($entry['CLOUD'] as $cloudID) {
+                    if ($cloudID === $cloudId) {
+                        // Warning, if user decides to make their full name local only,
+                        // no FN is found on federated servers
+                        if (isset($entry['FN'])) {
+                            $this->displayNameCache->set($cloudId, $entry['FN'], 15 * 60);
+                            return $entry['FN'];
+                        } else {
+                            $this->displayNameCache->set($cloudId, $cloudID, 15 * 60);
+                            return $cloudID;
+                        }
+                    }
+                }
+            }
+        }
+        $this->displayNameCache->set($cloudId, $cloudId, 15 * 60);
+        return null;
+    }
+
+    /**
+     * @param string $user
+     * @param string|null $remote
+     * @return CloudId
+     */
+    public function getCloudId(string $user, ?string $remote): ICloudId {
+        $isLocal = $remote === null;
+        if ($isLocal) {
+            $remote = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
+        }
+
+        // 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->stripShareLinkFragments($remote);
+        $host = $this->removeProtocolFromUrl($remote);
+        $remote = $this->ensureDefaultProtocol($remote);
+
+        $key = $user . '@' . ($isLocal ? 'local' : $host);
+        $cached = $this->cache[$key] ?? $this->memCache->get($key);
+        if ($cached) {
+            $this->cache[$key] = $cached; // put items from memcache into local cache
+            return new CloudId($cached['id'], $cached['user'], $cached['remote'], $cached['displayName']);
+        }
+
+        if ($isLocal) {
+            $localUser = $this->userManager->get($user);
+            $displayName = $localUser ? $localUser->getDisplayName() : '';
+        } else {
+            $displayName = null;
+        }
+
+        // For the visible cloudID we only strip away https
+        $id = $user . '@' . $this->removeProtocolFromUrl($remote, true);
+
+        $data = [
+            'id' => $id,
+            'user' => $user,
+            'remote' => $remote,
+            'displayName' => $displayName,
+        ];
+        $this->cache[$key] = $data;
+        $this->memCache->set($key, $data, 15 * 60);
+        return new CloudId($id, $user, $remote, $displayName);
+    }
+
+    /**
+     * @param string $url
+     * @return string
+     */
+    public function removeProtocolFromUrl(string $url, bool $httpsOnly = false): string {
+        if (str_starts_with($url, 'https://')) {
+            return substr($url, 8);
+        }
+        if (!$httpsOnly && str_starts_with($url, 'http://')) {
+            return substr($url, 7);
+        }
+
+        return $url;
+    }
+
+    protected function ensureDefaultProtocol(string $remote): string {
+        if (!str_contains($remote, '://')) {
+            $remote = 'https://' . $remote;
+        }
+
+        return $remote;
+    }
+
+    /**
+     * Strips away a potential file names and trailing slashes:
+     * - http://localhost
+     * - http://localhost/
+     * - http://localhost/index.php
+     * - http://localhost/index.php/s/{shareToken}
+     *
+     * all return: http://localhost
+     *
+     * @param string $remote
+     * @return string
+     */
+    protected function stripShareLinkFragments(string $remote): string {
+        $remote = str_replace('\\', '/', $remote);
+        if ($fileNamePosition = strpos($remote, '/index.php')) {
+            $remote = substr($remote, 0, $fileNamePosition);
+        }
+        $remote = rtrim($remote, '/');
+
+        return $remote;
+    }
+
+    /**
+     * @param string $cloudId
+     * @return bool
+     */
+    public function isValidCloudId(string $cloudId): bool {
+        return str_contains($cloudId, '@');
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 	public function handleUserEvent(Event $event): void {
 		if ($event instanceof UserChangedEvent && $event->getFeature() === 'displayName') {
 			$userId = $event->getUser()->getUID();
-			$key = $userId . '@local';
+			$key = $userId.'@local';
 			unset($this->cache[$key]);
 			$this->memCache->remove($key);
 		}
@@ -167,7 +167,7 @@ 
 		$host = $this->removeProtocolFromUrl($remote);
 		$remote = $this->ensureDefaultProtocol($remote);
 
-		$key = $user . '@' . ($isLocal ? 'local' : $host);
+		$key = $user.'@'.($isLocal ? 'local' : $host);
 		$cached = $this->cache[$key] ?? $this->memCache->get($key);
 		if ($cached) {
 			$this->cache[$key] = $cached; // put items from memcache into local cache
@@ -182,7 +182,7 @@ 
 		}
 
 		// For the visible cloudID we only strip away https
-		$id = $user . '@' . $this->removeProtocolFromUrl($remote, true);
+		$id = $user.'@'.$this->removeProtocolFromUrl($remote, true);
 
 		$data = [
 			'id' => $id,
@@ -212,7 +212,7 @@ 
 
 	protected function ensureDefaultProtocol(string $remote): string {
 		if (!str_contains($remote, '://')) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
 		return $remote;

lib/private/Federation/CloudId.php

Indentation +43 added lines, -43 removed lines

@@ -12,53 +12,53 @@
 use OCP\Federation\ICloudIdManager;
 
 class CloudId implements ICloudId {
-	public function __construct(
-		protected string $id,
-		protected string $user,
-		protected string $remote,
-		protected ?string $displayName = null,
-	) {
-	}
+    public function __construct(
+        protected string $id,
+        protected string $user,
+        protected string $remote,
+        protected ?string $displayName = null,
+    ) {
+    }
 
-	/**
-	 * The full remote cloud id
-	 *
-	 * @return string
-	 */
-	public function getId(): string {
-		return $this->id;
-	}
+    /**
+     * The full remote cloud id
+     *
+     * @return string
+     */
+    public function getId(): string {
+        return $this->id;
+    }
 
-	public function getDisplayId(): string {
-		if ($this->displayName === null) {
-			/** @var CloudIdManager $cloudIdManager */
-			$cloudIdManager = \OCP\Server::get(ICloudIdManager::class);
-			$this->displayName = $cloudIdManager->getDisplayNameFromContact($this->getId());
-		}
+    public function getDisplayId(): string {
+        if ($this->displayName === null) {
+            /** @var CloudIdManager $cloudIdManager */
+            $cloudIdManager = \OCP\Server::get(ICloudIdManager::class);
+            $this->displayName = $cloudIdManager->getDisplayNameFromContact($this->getId());
+        }
 
-		$atHost = str_replace(['http://', 'https://'], '', $this->getRemote());
+        $atHost = str_replace(['http://', 'https://'], '', $this->getRemote());
 
-		if ($this->displayName) {
-			return $this->displayName . '@' . $atHost;
-		}
-		return $this->getUser() . '@' . $atHost;
-	}
+        if ($this->displayName) {
+            return $this->displayName . '@' . $atHost;
+        }
+        return $this->getUser() . '@' . $atHost;
+    }
 
-	/**
-	 * The username on the remote server
-	 *
-	 * @return string
-	 */
-	public function getUser(): string {
-		return $this->user;
-	}
+    /**
+     * The username on the remote server
+     *
+     * @return string
+     */
+    public function getUser(): string {
+        return $this->user;
+    }
 
-	/**
-	 * The base address of the remote server
-	 *
-	 * @return string
-	 */
-	public function getRemote(): string {
-		return $this->remote;
-	}
+    /**
+     * The base address of the remote server
+     *
+     * @return string
+     */
+    public function getRemote(): string {
+        return $this->remote;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
 		$atHost = str_replace(['http://', 'https://'], '', $this->getRemote());
 
 		if ($this->displayName) {
-			return $this->displayName . '@' . $atHost;
+			return $this->displayName.'@'.$atHost;
 		}
-		return $this->getUser() . '@' . $atHost;
+		return $this->getUser().'@'.$atHost;
 	}
 
 	/**