Skip to content

[stable20] allow using saved login credentials for notify #23426

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
Oct 19, 2020
Merged

[stable20] allow using saved login credentials for notify #23426

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b750503
allow using saved login credentials for notify
icewind1991 Sep 23, 2020
d5e7768
also give storage backend it's change to manipulate the config
icewind1991 Oct 7, 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
70 changes: 56 additions & 14 deletions apps/files_external/lib/Command/Notify.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
use OCP\Files\StorageNotAvailableException;
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\IUserManager;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
Expand All @@ -53,12 +54,20 @@ class Notify extends Base {
private $connection;
/** @var ILogger */
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();
$this->globalService = $globalService;
$this->connection = $connection;
$this->logger = $logger;
$this->userManager = $userManager;
}

protected function configure() {
Expand Down Expand Up @@ -89,35 +98,68 @@ protected function 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): int {
$mount = $this->globalService->getStorage($input->getArgument('mount_id'));
if (is_null($mount)) {
$output->writeln('<error>Mount not found</error>');
return 1;
}
$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 {
$authBackend = $mount->getAuthMechanism();
$authBackend->manipulateStorageConfig($mount);
$authBackend->manipulateStorageConfig($mount, $user);
} catch (InsufficientDataForMeaningfulAnswerException $e) {
$noAuth = true;
} catch (StorageNotAvailableException $e) {
$noAuth = true;
}

if ($input->getOption('user')) {
$mount->setBackendOption('user', $input->getOption('user'));
} elseif (isset($_ENV['NOTIFY_USER'])) {
$mount->setBackendOption('user', $_ENV['NOTIFY_USER']);
} elseif (isset($_SERVER['NOTIFY_USER'])) {
$mount->setBackendOption('user', $_SERVER['NOTIFY_USER']);
if ($userOption) {
$mount->setBackendOption('user', $userOption);
}
if ($input->getOption('password')) {
$mount->setBackendOption('password', $input->getOption('password'));
} elseif (isset($_ENV['NOTIFY_PASSWORD'])) {
$mount->setBackendOption('password', $_ENV['NOTIFY_PASSWORD']);
} elseif (isset($_SERVER['NOTIFY_PASSWORD'])) {
$mount->setBackendOption('password', $_SERVER['NOTIFY_PASSWORD']);
if ($passwordOption) {
$mount->setBackendOption('password', $passwordOption);
}

try {
$backend = $mount->getBackend();
$backend->manipulateStorageConfig($mount, $user);
} catch (InsufficientDataForMeaningfulAnswerException $e) {
$noAuth = true;
} catch (StorageNotAvailableException $e) {
$noAuth = true;
}

try {
Expand Down