upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

gs.federation.auto_accept_shares

Browse source 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
Maxence Lange 2023-11-24 17:56:50 -01:00
parent 3b9c24022c
commit f6ec17eb7e
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php
View file

@ -33,7 +33,7 @@ use OC\Files\Filesystem;
use OCA\FederatedFileSharing\AddressHandler;
use OCA\FederatedFileSharing\FederatedShareProvider;
use OCA\Files_Sharing\Activity\Providers\RemoteShares;
use OCA\Files_Sharing\External\Manager;
use OCA\Files_Sharing\External\Manager as ExternalManager;
use OCP\Activity\IManager as IActivityManager;
use OCP\App\IAppManager;
use OCP\Constants;
@ -62,6 +62,8 @@ use OCP\Util;
use Psr\Log\LoggerInterface;
class CloudFederationProviderFiles implements ICloudFederationProvider {
const AUTO_ACCEPT_SHARES = 'gs.federation.auto_accept_shares';
/**
* CloudFederationProvider constructor.
*/
@ -80,7 +82,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
private IDBConnection $connection,
private IGroupManager $groupManager,
private IConfig $config,
private Manager $externalShareManager,
private ExternalManager $externalShareManager,
private LoggerInterface $logger,
) {
}
@ -166,6 +168,10 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
try {
$this->externalShareManager->addShare($remote, $token, '', $name, $owner, $shareType, false, $shareWith, $remoteId);
$shareId = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share_external');
if ($this->config->getSystemValueBool(self::AUTO_ACCEPT_SHARES)) {
$this->externalShareManager->initUserId($shareWith);
$this->externalShareManager->acceptShare($shareId);
}
// get DisplayName about the owner of the share
$ownerDisplayName = $this->getUserDisplayName($ownerFederatedId);
@ -255,6 +261,10 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
}
private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $displayName): void {
if ($this->config->getSystemValueBool(self::AUTO_ACCEPT_SHARES)) {
return;
}
$notification = $this->notificationManager->createNotification();
$notification->setApp('files_sharing')
->setUser($shareWith)

4
apps/files_sharing/lib/External/Manager.php vendored
View file

@ -301,6 +301,10 @@ class Manager {
$updateResult->closeCursor();
}
public function initUserId(string $userId): void {
$this->uid = $userId;
}
/**
* accept server-to-server share
*