Skip to content

fix(socialApi): check avatar mimetype againt allow list #5124

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
kesselb merged 1 commit into from
Feb 18, 2026
+85 −14
Merged

fix(socialApi): check avatar mimetype againt allow list #5124

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
10 changes: 10 additions & 0 deletions lib/Service/SocialApiService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,15 @@
use OCP\IL10N;
use OCP\IURLGenerator;
use Psr\Container\ContainerInterface;
use function in_array;

class SocialApiService {

protected const ALLOWED_CONTENT_TYPES = [
'image/png',
'image/jpeg',
'image/gif'
];
private $appName;

public function __construct(
Expand Down Expand Up @@ -186,6 +193,9 @@ public function updateContact(string $addressbookId, string $contactId, ?string
if (!$socialdata || $imageType === null) {
return new JSONResponse([], Http::STATUS_NOT_FOUND);
}
if (!in_array($imageType, self::ALLOWED_CONTENT_TYPES)) {
return new JSONResponse([], Http::STATUS_UNSUPPORTED_MEDIA_TYPE);
}

if (is_resource($socialdata)) {
$socialdata = stream_get_contents($socialdata);
Expand Down
89 changes: 75 additions & 14 deletions tests/unit/Service/SocialApiServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
use OCP\IConfig;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Util;

use PHPUnit\Framework\MockObject\MockObject;
use Psr\Container\ContainerInterface;
Expand Down Expand Up @@ -53,7 +52,7 @@ class SocialApiServiceTest extends TestCase {

public function allSocialProfileProviders(): array {
$body = 'the body';
$imageType = 'jpg';
$imageType = 'image/jpeg';
$contact = [
'URI' => '3225c0d5-1bd2-43e5-a08c-4e65eaa406b0',
'VERSION' => '4.0'
Expand Down Expand Up @@ -183,7 +182,7 @@ public function testUpdateContactWithoutNetwork($addressbooks, $providers, $body
public function testUpdateContactWithNetworkVersion3() {
$network = 'mastodon';
$body = 'the body';
$imageType = 'jpg';
$imageType = 'image/jpeg';
$addressBookId = 'contacts';
$contactId = '3225c0d5-1bd2-43e5-a08c-4e65eaa406b0';
$contact = [
Expand Down Expand Up @@ -236,7 +235,7 @@ public function testUpdateContactWithNetworkVersion3() {
$changes = [
'URI' => $contact['URI'],
'VERSION' => $contact['VERSION'],
'PHOTO;ENCODING=b;TYPE=' . $imageType . ';VALUE=BINARY' => base64_encode($body)
'PHOTO;ENCODING=b;TYPE=jpeg;VALUE=BINARY' => base64_encode($body)
];

$this->socialProvider
Expand All @@ -256,7 +255,7 @@ public function testUpdateContactWithNetworkVersion3() {
public function testUpdateContactWithNetworkVersion4() {
$network = 'mastodon';
$body = 'the body';
$imageType = 'jpg';
$imageType = 'image/jpeg';
$addressBookId = 'contacts';
$contactId = '3225c0d5-1bd2-43e5-a08c-4e65eaa406b0';
$contact = [
Expand Down Expand Up @@ -326,6 +325,75 @@ public function testUpdateContactWithNetworkVersion4() {
$this->assertEquals(Http::STATUS_OK, $result->getStatus());
}

public function testUpdateContactWithUnallowedMimeVersion4() {
$network = 'mastodon';
$body = 'the body';
$imageType = 'application/pdf';
$addressBookId = 'contacts';
$contactId = '3225c0d5-1bd2-43e5-a08c-4e65eaa406b0';
$contact = [
'URI' => $contactId,
'VERSION' => '4.0'
];
$provider = $this->createMock(ISocialProvider::class);
$provider->method('supportsContact')->willReturn(true);
$provider->method('getImageUrls')->willReturn(['https://url1.com/an-url']);

$addressbook = $this->createMock(IAddressBook::class);
$addressbook
->method('getUri')
->willReturn('contacts');
$addressbook
->method('search')
->willReturn([$contact]);

$this->manager
->method('getUserAddressBooks')
->willReturn([$addressbook]);

$this->socialProvider
->method('getSocialConnectors')
->willReturn([$provider]);

$this->socialProvider
->method('getSocialConnector')
->willReturn($provider);

$response = $this->createMock(IResponse::class);
$response
->method('getBody')
->willReturn($body);
$response
->method('getHeader')
->willReturn($imageType);
$client = $this->createMock(IClient::class);
$client
->method('get')
->willReturn($response);
$this->clientService
->method('newClient')
->willReturn($client);

$changes = [
'URI' => $contact['URI'],
'VERSION' => $contact['VERSION'],
'PHOTO' => 'data:' . $imageType . ';base64,' . base64_encode($body)
];

$this->socialProvider
->expects($this->once())->method('getSocialConnector')->with($network);
$provider->expects($this->once())->method('supportsContact')->with($contact);
$addressbook->expects($this->never())->method('createOrUpdate');

$result = $this->service
->updateContact(
$addressBookId,
$contactId,
$network);

$this->assertEquals(Http::STATUS_UNSUPPORTED_MEDIA_TYPE, $result->getStatus());
}

protected function setupAddressbooks() {
$validContact1 = [
'UID' => '11111111-1111-1111-1111-111111111111',
Expand All @@ -337,7 +405,7 @@ protected function setupAddressbooks() {
'UID' => '22222222-2222-2222-2222-222222222222',
'FN' => 'Valid Contact Two',
'VERSION' => '4.0',
'PHOTO' => 'data:someHeader;base64,' . base64_encode('someBody'),
'PHOTO' => 'data:image/jpeg;base64,' . base64_encode('someBody'),
'X-SOCIALPROFILE' => [['type' => 'someNetwork', 'value' => 'someId2']],
];
$emptyContact = [
Expand All @@ -356,13 +424,6 @@ protected function setupAddressbooks() {
$addressbook1->method('getUri')->willReturn('contacts1');
$addressbook2 = $this->createMock(IAddressBook::class);
$addressbook2->method('getUri')->willReturn('contacts2');
if (Util::getVersion()[0] >= 20) {
// TODO: check can be removed as soon as min-dependency of contacts is NCv20
$addressbook1->method('isShared')->willReturn(false);
$addressbook1->method('isSystemAddressBook')->willReturn(false);
$addressbook2->method('isShared')->willReturn(false);
$addressbook2->method('isSystemAddressBook')->willReturn(false);
}

$searchMap1 = [
['', ['UID'], ['types' => true], [$validContact1, $invalidContact]],
Expand Down Expand Up @@ -420,7 +481,7 @@ protected function setupAddressbooks() {
->willReturn('someBody');
$validResponse
->method('getHeader')
->willReturn('someHeader');
->willReturn('image/jpeg');

$client = $this->createMock(IClient::class);
$client
Expand Down