Skip to content

Changed Content-Disposition header to download Contact Photo with correct extension #21945

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
skjnldsv merged 1 commit into from
Sep 7, 2020
Merged

Changed Content-Disposition header to download Contact Photo with correct extension #21945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion apps/dav/lib/CardDAV/ImageExportPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/lib/CardDAV/PhotoCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 3 additions & 3 deletions apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand All @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/carddav.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down