Skip to content

The privacy setting is only about syncing to other servers #22564

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
MorrisJobke merged 2 commits into from
Sep 9, 2020
Merged

The privacy setting is only about syncing to other servers #22564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4b2403
The privacy setting is only about syncing to other servers
nickvergessen Sep 3, 2020
c2bef52
Remove unused members and imports
nickvergessen Sep 8, 2020
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
22 changes: 1 addition & 21 deletions core/Controller/AvatarController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
namespace OC\Core\Controller;

use OC\AppFramework\Utility\TimeFactory;
use OCP\Accounts\IAccountManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataDisplayResponse;
Expand Down Expand Up @@ -80,8 +79,6 @@ class AvatarController extends Controller {

/** @var TimeFactory */
protected $timeFactory;
/** @var IAccountManager */
private $accountManager;

public function __construct($appName,
IRequest $request,
Expand All @@ -92,8 +89,7 @@ public function __construct($appName,
IRootFolder $rootFolder,
ILogger $logger,
$userId,
TimeFactory $timeFactory,
IAccountManager $accountManager) {
TimeFactory $timeFactory) {
parent::__construct($appName, $request);

$this->avatarManager = $avatarManager;
Expand All @@ -104,7 +100,6 @@ public function __construct($appName,
$this->logger = $logger;
$this->userId = $userId;
$this->timeFactory = $timeFactory;
$this->accountManager = $accountManager;
}


Expand All @@ -126,21 +121,6 @@ public function getAvatar($userId, $size) {
$size = 64;
}

$user = $this->userManager->get($userId);
if ($user === null) {
return new JSONResponse([], Http::STATUS_NOT_FOUND);
}

$account = $this->accountManager->getAccount($user);
$scope = $account->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope();

if ($scope !== IAccountManager::VISIBILITY_PUBLIC && $this->userId === null) {
// Public avatar access is not allowed
$response = new JSONResponse([], Http::STATUS_NOT_FOUND);
$response->cacheFor(1800);
return $response;
}

try {
$avatar = $this->avatarManager->getAvatar($userId);
$avatarFile = $avatar->getFile($size);
Expand Down
43 changes: 1 addition & 42 deletions tests/Core/Controller/AvatarControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ function is_uploaded_file($filename) {

use OC\AppFramework\Utility\TimeFactory;
use OC\Core\Controller\AvatarController;
use OCP\Accounts\IAccount;
use OCP\Accounts\IAccountManager;
use OCP\Accounts\IAccountProperty;
use OCP\AppFramework\Http;
use OCP\Files\File;
use OCP\Files\IRootFolder;
Expand All @@ -49,7 +46,6 @@ function is_uploaded_file($filename) {
use OCP\IRequest;
use OCP\IUser;
use OCP\IUserManager;
use PHPUnit\Framework\MockObject\MockObject;

/**
* Class AvatarControllerTest
Expand Down Expand Up @@ -82,8 +78,6 @@ class AvatarControllerTest extends \Test\TestCase {
private $request;
/** @var TimeFactory|\PHPUnit\Framework\MockObject\MockObject */
private $timeFactory;
/** @var IAccountManager|MockObject */
private $accountManager;

protected function setUp(): void {
parent::setUp();
Expand All @@ -98,7 +92,6 @@ protected function setUp(): void {
$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')->getMock();
$this->logger = $this->getMockBuilder(ILogger::class)->getMock();
$this->timeFactory = $this->getMockBuilder('OC\AppFramework\Utility\TimeFactory')->getMock();
$this->accountManager = $this->createMock(IAccountManager::class);

$this->avatarMock = $this->getMockBuilder('OCP\IAvatar')->getMock();
$this->userMock = $this->getMockBuilder(IUser::class)->getMock();
Expand All @@ -113,8 +106,7 @@ protected function setUp(): void {
$this->rootFolder,
$this->logger,
'userid',
$this->timeFactory,
$this->accountManager
$this->timeFactory
);

// Configure userMock
Expand Down Expand Up @@ -145,39 +137,6 @@ public function testGetAvatarNoAvatar() {
$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
}

public function testAvatarNotPublic() {
$account = $this->createMock(IAccount::class);
$this->accountManager->method('getAccount')
->with($this->userMock)
->willReturn($account);

$property = $this->createMock(IAccountProperty::class);
$account->method('getProperty')
->with(IAccountManager::PROPERTY_AVATAR)
->willReturn($property);

$property->method('getScope')
->willReturn(IAccountManager::VISIBILITY_PRIVATE);

$controller = new AvatarController(
'core',
$this->request,
$this->avatarManager,
$this->cache,
$this->l,
$this->userManager,
$this->rootFolder,
$this->logger,
null,
$this->timeFactory,
$this->accountManager
);

$result = $controller->getAvatar('userId', 128);

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

/**
* Fetch the user's avatar
*/
Expand Down