mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23233 from nextcloud/notify-saved-login-auth-19 

[19] allow using saved login credentials for notify
This commit is contained in:
blizzz 2020-10-13 19:41:06 +02:00 committed by GitHub
parent ac465f2c87 683142e1f3
commit 0e64bde969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
apps/files_external/lib/Command/Notify.php
View File

@ -40,6 +40,7 @@ use OCP\Files\Storage\IStorage;
use OCP\Files\StorageNotAvailableException; use OCP\Files\StorageNotAvailableException;
use OCP\IDBConnection; use OCP\IDBConnection;
use OCP\ILogger; use OCP\ILogger;
use OCP\IUserManager;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
@ -52,12 +53,20 @@ class Notify extends Base {
private $connection; private $connection;
/** @var ILogger */ /** @var ILogger */
private $logger; private $logger;
/** @var IUserManager */
private $userManager;
public function __construct(GlobalStoragesService $globalService, IDBConnection $connection, ILogger $logger) { public function __construct(
GlobalStoragesService $globalService,
IDBConnection $connection,
ILogger $logger,
IUserManager $userManager
) {
parent::__construct(); parent::__construct();
$this->globalService = $globalService; $this->globalService = $globalService;
$this->connection = $connection; $this->connection = $connection;
$this->logger = $logger; $this->logger = $logger;
$this->userManager = $userManager;
} }
protected function configure() { protected function configure() {
@ -88,6 +97,30 @@ class Notify extends Base {
parent::configure(); parent::configure();
} }
private function getUserOption(InputInterface $input): ?string {
if ($input->getOption('user')) {
return (string)$input->getOption('user');
} elseif (isset($_ENV['NOTIFY_USER'])) {
return (string)$_ENV['NOTIFY_USER'];
} elseif (isset($_SERVER['NOTIFY_USER'])) {
return (string)$_SERVER['NOTIFY_USER'];
} else {
return null;
}
}
private function getPasswordOption(InputInterface $input): ?string {
if ($input->getOption('password')) {
return (string)$input->getOption('password');
} elseif (isset($_ENV['NOTIFY_PASSWORD'])) {
return (string)$_ENV['NOTIFY_PASSWORD'];
} elseif (isset($_SERVER['NOTIFY_PASSWORD'])) {
return (string)$_SERVER['NOTIFY_PASSWORD'];
} else {
return null;
}
}
protected function execute(InputInterface $input, OutputInterface $output) { protected function execute(InputInterface $input, OutputInterface $output) {
$mount = $this->globalService->getStorage($input->getArgument('mount_id')); $mount = $this->globalService->getStorage($input->getArgument('mount_id'));
if (is_null($mount)) { if (is_null($mount)) {
@ -95,28 +128,37 @@ class Notify extends Base {
return 1; return 1;
} }
$noAuth = false; $noAuth = false;
$userOption = $this->getUserOption($input);
$passwordOption = $this->getPasswordOption($input);
// if only the user is provided, we get the user object to pass along to the auth backend
// this allows using saved user credentials
$user = ($userOption && !$passwordOption) ? $this->userManager->get($userOption) : null;
try { try {
$authBackend = $mount->getAuthMechanism(); $authBackend = $mount->getAuthMechanism();
$authBackend->manipulateStorageConfig($mount); $authBackend->manipulateStorageConfig($mount, $user);
} catch (InsufficientDataForMeaningfulAnswerException $e) { } catch (InsufficientDataForMeaningfulAnswerException $e) {
$noAuth = true; $noAuth = true;
} catch (StorageNotAvailableException $e) { } catch (StorageNotAvailableException $e) {
$noAuth = true; $noAuth = true;
} }
if ($input->getOption('user')) { if ($userOption) {
$mount->setBackendOption('user', $input->getOption('user')); $mount->setBackendOption('user', $userOption);
} elseif (isset($_ENV['NOTIFY_USER'])) {
$mount->setBackendOption('user', $_ENV['NOTIFY_USER']);
} elseif (isset($_SERVER['NOTIFY_USER'])) {
$mount->setBackendOption('user', $_SERVER['NOTIFY_USER']);
} }
if ($input->getOption('password')) { if ($passwordOption) {
$mount->setBackendOption('password', $input->getOption('password')); $mount->setBackendOption('password', $passwordOption);
} elseif (isset($_ENV['NOTIFY_PASSWORD'])) { }
$mount->setBackendOption('password', $_ENV['NOTIFY_PASSWORD']);
} elseif (isset($_SERVER['NOTIFY_PASSWORD'])) { try {
$mount->setBackendOption('password', $_SERVER['NOTIFY_PASSWORD']); $backend = $mount->getBackend();
$backend->manipulateStorageConfig($mount, $user);
} catch (InsufficientDataForMeaningfulAnswerException $e) {
$noAuth = true;
} catch (StorageNotAvailableException $e) {
$noAuth = true;
} }
try { try {