Merge pull request #26243 from nextcloud/enh/noid/avatar-privacy-new-scope
Avatar privacy and new scopepull/26355/head
Joas Schilling
GitHub
commit
602de272c0
@ -0,0 +1,62 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2021 Vincent Petry <vincent@nextcloud.com>
|
||||
*
|
||||
* @author Vincent Petry <vincent@nextcloud.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OCA\Provisioning_API;
|
||||
|
||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||
use OCP\App\IAppManager;
|
||||
use OCP\Capabilities\ICapability;
|
||||
|
||||
class Capabilities implements ICapability {
|
||||
|
||||
/** @var IAppManager */
|
||||
private $appManager;
|
||||
|
||||
public function __construct(IAppManager $appManager) {
|
||||
$this->appManager = $appManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function an app uses to return the capabilities
|
||||
*
|
||||
* @return array Array containing the apps capabilities
|
||||
*/
|
||||
public function getCapabilities() {
|
||||
$federationScopesEnabled = false;
|
||||
|
||||
$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
|
||||
if ($federatedFileSharingEnabled) {
|
||||
/** @var FederatedShareProvider $shareProvider */
|
||||
$shareProvider = \OC::$server->query(FederatedShareProvider::class);
|
||||
$federationScopesEnabled = $shareProvider->isLookupServerUploadEnabled();
|
||||
}
|
||||
|
||||
return [
|
||||
'provisioning_api' => [
|
||||
'version' => $this->appManager->getAppVersion('provisioning_api'),
|
||||
'AccountPropertyScopesVersion' => 2,
|
||||
'AccountPropertyScopesFederationEnabled' => $federationScopesEnabled,
|
||||
]
|
||||
];
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,92 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2021 Vincent Petry <vincent@nextcloud.com>
|
||||
*
|
||||
* @author Vincent Petry <vincent@nextcloud.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OCA\Provisioning_API\Tests\unit;
|
||||
|
||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||
use OCA\Provisioning_API\Capabilities;
|
||||
use OCP\App\IAppManager;
|
||||
use PHPUnit\Framework\MockObject\MockObject;
|
||||
use Test\TestCase;
|
||||
|
||||
/**
|
||||
* Capabilities test for provisioning API.
|
||||
*
|
||||
* Note: group DB needed because of usage of overwriteService()
|
||||
*
|
||||
* @package OCA\Provisioning_API\Tests
|
||||
* @group DB
|
||||
*/
|
||||
class CapabilitiesTest extends TestCase {
|
||||
|
||||
/** @var Capabilities */
|
||||
protected $capabilities;
|
||||
|
||||
/** @var IAppManager|MockObject */
|
||||
protected $appManager;
|
||||
|
||||
public function setUp(): void {
|
||||
parent::setUp();
|
||||
$this->appManager = $this->createMock(IAppManager::class);
|
||||
$this->capabilities = new Capabilities($this->appManager);
|
||||
|
||||
$this->appManager->expects($this->once())
|
||||
->method('getAppVersion')
|
||||
->with('provisioning_api')
|
||||
->willReturn('1.12');
|
||||
}
|
||||
|
||||
public function getCapabilitiesProvider() {
|
||||
return [
|
||||
[false, false, false],
|
||||
[true, false, false],
|
||||
[true, true, true],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider getCapabilitiesProvider
|
||||
*/
|
||||
public function testGetCapabilities($federationAppEnabled, $lookupServerEnabled, $expectedFederationScopesEnabled) {
|
||||
$this->appManager->expects($this->once())
|
||||
->method('isEnabledForUser')
|
||||
->with('federatedfilesharing')
|
||||
->willReturn($federationAppEnabled);
|
||||
|
||||
$federatedShareProvider = $this->createMock(FederatedShareProvider::class);
|
||||
$this->overwriteService(FederatedShareProvider::class, $federatedShareProvider);
|
||||
|
||||
$federatedShareProvider->expects($this->any())
|
||||
->method('isLookupServerUploadEnabled')
|
||||
->willReturn($lookupServerEnabled);
|
||||
|
||||
$expected = [
|
||||
'provisioning_api' => [
|
||||
'version' => '1.12',
|
||||
'AccountPropertyScopesVersion' => 2,
|
||||
'AccountPropertyScopesFederationEnabled' => $expectedFederationScopesEnabled,
|
||||
],
|
||||
];
|
||||
$this->assertSame($expected, $this->capabilities->getCapabilities());
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,183 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* @copyright Copyright (c) 2018, Michael Weimann <mail@michael-weimann.eu>
|
||||
*
|
||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
||||
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
|
||||
* @author Joas Schilling <coding@schilljs.com>
|
||||
* @author Michael Weimann <mail@michael-weimann.eu>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Avatar;
|
||||
|
||||
use OC\NotSquareException;
|
||||
use OC\User\User;
|
||||
use OCP\Files\NotFoundException;
|
||||
use OCP\Files\NotPermittedException;
|
||||
use OCP\Files\SimpleFS\ISimpleFile;
|
||||
use OCP\Files\SimpleFS\ISimpleFolder;
|
||||
use OCP\IConfig;
|
||||
use OCP\IImage;
|
||||
use OCP\IL10N;
|
||||
use OCP\ILogger;
|
||||
|
||||
/**
|
||||
* This class represents a registered user's placeholder avatar.
|
||||
*
|
||||
* It generates an image based on the user's initials and caches it on storage
|
||||
* for faster retrieval, unlike the GuestAvatar.
|
||||
*/
|
||||
class PlaceholderAvatar extends Avatar {
|
||||
/** @var ISimpleFolder */
|
||||
private $folder;
|
||||
|
||||
/** @var User */
|
||||
private $user;
|
||||
|
||||
/**
|
||||
* UserAvatar constructor.
|
||||
*
|
||||
* @param IConfig $config The configuration
|
||||
* @param ISimpleFolder $folder The avatar files folder
|
||||
* @param IL10N $l The localization helper
|
||||
* @param User $user The user this class manages the avatar for
|
||||
* @param ILogger $logger The logger
|
||||
*/
|
||||
public function __construct(
|
||||
ISimpleFolder $folder,
|
||||
$user,
|
||||
ILogger $logger) {
|
||||
parent::__construct($logger);
|
||||
|
||||
$this->folder = $folder;
|
||||
$this->user = $user;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if an avatar exists for the user
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function exists() {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the users avatar.
|
||||
*
|
||||
* @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
|
||||
* @throws \Exception if the provided file is not a jpg or png image
|
||||
* @throws \Exception if the provided image is not valid
|
||||
* @throws NotSquareException if the image is not square
|
||||
* @return void
|
||||
*/
|
||||
public function set($data) {
|
||||
// unimplemented for placeholder avatars
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes the users avatar.
|
||||
*/
|
||||
public function remove(bool $silent = false) {
|
||||
$avatars = $this->folder->getDirectoryListing();
|
||||
|
||||
foreach ($avatars as $avatar) {
|
||||
$avatar->delete();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the avatar for an user.
|
||||
*
|
||||
* If there is no avatar file yet, one is generated.
|
||||
*
|
||||
* @param int $size
|
||||
* @return ISimpleFile
|
||||
* @throws NotFoundException
|
||||
* @throws \OCP\Files\NotPermittedException
|
||||
* @throws \OCP\PreConditionNotMetException
|
||||
*/
|
||||
public function getFile($size) {
|
||||
$size = (int) $size;
|
||||
|
||||
$ext = 'png';
|
||||
|
||||
if ($size === -1) {
|
||||
$path = 'avatar-placeholder.' . $ext;
|
||||
} else {
|
||||
$path = 'avatar-placeholder.' . $size . '.' . $ext;
|
||||
}
|
||||
|
||||
try {
|
||||
$file = $this->folder->getFile($path);
|
||||
} catch (NotFoundException $e) {
|
||||
if ($size <= 0) {
|
||||
throw new NotFoundException;
|
||||
}
|
||||
|
||||
if (!$data = $this->generateAvatarFromSvg($size)) {
|
||||
$data = $this->generateAvatar($this->getDisplayName(), $size);
|
||||
}
|
||||
|
||||
try {
|
||||
$file = $this->folder->newFile($path);
|
||||
$file->putContent($data);
|
||||
} catch (NotPermittedException $e) {
|
||||
$this->logger->error('Failed to save avatar placeholder for ' . $this->user->getUID());
|
||||
throw new NotFoundException();
|
||||
}
|
||||
}
|
||||
|
||||
return $file;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the user display name.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getDisplayName(): string {
|
||||
return $this->user->getDisplayName();
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles user changes.
|
||||
*
|
||||
* @param string $feature The changed feature
|
||||
* @param mixed $oldValue The previous value
|
||||
* @param mixed $newValue The new value
|
||||
* @throws NotPermittedException
|
||||
* @throws \OCP\PreConditionNotMetException
|
||||
*/
|
||||
public function userChanged($feature, $oldValue, $newValue) {
|
||||
$this->remove();
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the avatar of a user is a custom uploaded one
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isCustomAvatar(): bool {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue