Merge pull request #63645 from nextcloud/backport/63635/stable34

[stable34] fix(dav): scope contact photo export to local address books

Author: CarlSchwan

apps/dav/lib/CardDAV/ImageExportPlugin.php

@@ -79,12 +79,16 @@ public function httpGet(RequestInterface $request, ResponseInterface $response)
 		$addressbookpath = explode('/', $path);
 		array_pop($addressbookpath);
 		$addressbookpath = implode('/', $addressbookpath);
-		/** @var AddressBook $addressbook */
 		$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
 
 		$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
 		$response->setHeader('Etag', $node->getETag());
 
+		if (!$addressbook instanceof AddressBook) {
+			$response->setStatus(Http::STATUS_NO_CONTENT);
+			return false;
+		}
+
 		try {
 			$file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
 			$response->setHeader('Content-Type', $file->getMimeType());

apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php

@@ -10,6 +10,7 @@
 
 use OCA\DAV\CardDAV\AddressBook;
 use OCA\DAV\CardDAV\ImageExportPlugin;
+use OCA\DAV\CardDAV\Integration\ExternalAddressBook;
 use OCA\DAV\CardDAV\PhotoCache;
 use OCP\AppFramework\Http;
 use OCP\Files\NotFoundException;
@@ -172,6 +173,39 @@ public function testCard(?int $size, bool $photo): void {
 		$this->assertFalse($result);
 	}
 
+	public function testAppGeneratedAddressBook(): void {
+		$this->request->method('getQueryParameters')
+			->willReturn(['photo' => null]);
+		$this->request->method('getPath')
+			->willReturn('user/book/card');
+
+		$card = $this->createMock(Card::class);
+		$card->method('getETag')
+			->willReturn('"myEtag"');
+		$book = $this->createMock(ExternalAddressBook::class);
+
+		$this->tree->method('getNodeForPath')
+			->willReturnCallback(function ($path) use ($card, $book) {
+				if ($path === 'user/book/card') {
+					return $card;
+				} elseif ($path === 'user/book') {
+					return $book;
+				}
+				$this->fail();
+			});
+
+		$this->cache->expects($this->never())
+			->method('get');
+		$this->response->expects($this->once())
+			->method('setStatus')
+			->with(Http::STATUS_NO_CONTENT);
+		$this->response->expects($this->never())
+			->method('setBody');
+
+		$result = $this->plugin->httpGet($this->request, $this->response);
+		$this->assertFalse($result);
+	}
+
 	public function testCardWithSpecialCharactersInName(): void {
 		$this->request->method('getQueryParameters')
 			->willReturn(['photo' => null]);