diff options
author | Robin Appelman <icewind@owncloud.com> | 2014-06-25 15:22:49 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2014-06-25 15:22:49 +0200 |
commit | 9a2ed86672d5d7a162263448070ed1c562ef2515 (patch) | |
tree | 8853f416df6b80d7984263a641c7e649cc0edc9e /apps/files/command | |
parent | b1116880f861cf5b72d45a9edfabfdd7d48a9887 (diff) | |
download | nextcloud-server-9a2ed86672d5d7a162263448070ed1c562ef2515.tar.gz nextcloud-server-9a2ed86672d5d7a162263448070ed1c562ef2515.zip |
Prevent running the files:scan command as the wrong user
Diffstat (limited to 'apps/files/command')
-rw-r--r-- | apps/files/command/scan.php | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php index 25ab70af362..5927e413ceb 100644 --- a/apps/files/command/scan.php +++ b/apps/files/command/scan.php @@ -9,6 +9,7 @@ namespace OCA\Files\Command; +use OC\ForbiddenException; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -32,28 +33,32 @@ class Scan extends Command { ->setName('files:scan') ->setDescription('rescan filesystem') ->addArgument( - 'user_id', - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, - 'will rescan all files of the given user(s)' - ) + 'user_id', + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, + 'will rescan all files of the given user(s)' + ) ->addOption( - 'all', - null, - InputOption::VALUE_NONE, - 'will rescan all files of all known users' - ) - ; + 'all', + null, + InputOption::VALUE_NONE, + 'will rescan all files of all known users' + ); } protected function scanFiles($user, OutputInterface $output) { $scanner = new \OC\Files\Utils\Scanner($user); - $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) { + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output) { $output->writeln("Scanning <info>$path</info>"); }); - $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) { + $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output) { $output->writeln("Scanning <info>$path</info>"); }); - $scanner->scan(''); + try { + $scanner->scan(''); + } catch (ForbiddenException $e) { + $output->writeln("<error>Home storage for user $user not writable</error>"); + $output->writeln("Make sure you're running the scan command only as the user the web server runs as"); + } } protected function execute(InputInterface $input, OutputInterface $output) { |