Merge pull request #21945 from nextcloud/fix-contact-download-picture

Changed Content-Disposition header to download Contact Photo with correct extension
nextcloud · Sep 7, 2020 · 54438c9 · 54438c9
2 parents da8cff9 + e8a4feb
commit 54438c9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/apps/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php
@@ -103,7 +103,8 @@ public function httpGet(RequestInterface $request, ResponseInterface $response)
 		try {
 			$file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
 			$response->setHeader('Content-Type', $file->getMimeType());
-			$response->setHeader('Content-Disposition', 'attachment');
+			$fileName = $node->getName() . '.' . PhotoCache::ALLOWED_CONTENT_TYPES[$file->getMimeType()];
+			$response->setHeader('Content-Disposition', "attachment; filename=$fileName");
 			$response->setStatus(200);
 
 			$response->setBody($file->getContent());

diff --git a/apps/dav/lib/CardDAV/PhotoCache.php b/apps/dav/lib/CardDAV/PhotoCache.php
@@ -43,7 +43,7 @@
 class PhotoCache {
 
 	/** @var array  */
-	protected const ALLOWED_CONTENT_TYPES = [
+	public const ALLOWED_CONTENT_TYPES = [
 		'image/png' => 'png',
 		'image/jpeg' => 'jpg',
 		'image/gif' => 'gif',

diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
@@ -166,7 +166,7 @@ public function testCard($size, $photo) {
 		if ($photo) {
 			$file = $this->createMock(ISimpleFile::class);
 			$file->method('getMimeType')
-				->willReturn('imgtype');
+				->willReturn('image/jpeg');
 			$file->method('getContent')
 				->willReturn('imgdata');
 
@@ -176,10 +176,10 @@ public function testCard($size, $photo) {
 
 			$this->response->expects($this->at(3))
 				->method('setHeader')
-				->with('Content-Type', 'imgtype');
+				->with('Content-Type', 'image/jpeg');
 			$this->response->expects($this->at(4))
 				->method('setHeader')
-				->with('Content-Disposition', 'attachment');
+				->with('Content-Disposition', 'attachment; filename=card.jpg');
 
 			$this->response->expects($this->once())
 				->method('setStatus')

diff --git a/build/integration/features/carddav.feature b/build/integration/features/carddav.feature
@@ -55,7 +55,7 @@ Feature: carddav
     Given "admin" uploads the contact "bjoern.vcf" to the addressbook "MyAddressbook"
     When Exporting the picture of contact "bjoern.vcf" from addressbook "MyAddressbook" as user "admin"
     Then The following HTTP headers should be set
-      |Content-Disposition|attachment|
+      |Content-Disposition|attachment; filename=bjoern.vcf.jpg|
       |Content-Type|image/jpeg|
       |Content-Security-Policy|default-src 'none';|
       |X-Content-Type-Options |nosniff|