summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--app/Console/BaseCommand.php (renamed from app/Console/Base.php)4
-rw-r--r--app/Console/CronjobCommand.php (renamed from app/Console/Cronjob.php)2
-rw-r--r--app/Console/LocaleComparatorCommand.php (renamed from app/Console/LocaleComparator.php)2
-rw-r--r--app/Console/LocaleSyncCommand.php (renamed from app/Console/LocaleSync.php)2
-rw-r--r--app/Console/ProjectDailyColumnStatsExportCommand.php (renamed from app/Console/ProjectDailyColumnStatsExport.php)2
-rw-r--r--app/Console/ProjectDailyStatsCalculationCommand.php (renamed from app/Console/ProjectDailyStatsCalculation.php)2
-rw-r--r--app/Console/ResetPasswordCommand.php79
-rw-r--r--app/Console/ResetTwoFactorCommand.php38
-rw-r--r--app/Console/SubtaskExportCommand.php (renamed from app/Console/SubtaskExport.php)2
-rw-r--r--app/Console/TaskExportCommand.php (renamed from app/Console/TaskExport.php)2
-rw-r--r--app/Console/TaskOverdueNotificationCommand.php (renamed from app/Console/TaskOverdueNotification.php)2
-rw-r--r--app/Console/TaskTriggerCommand.php (renamed from app/Console/TaskTrigger.php)2
-rw-r--r--app/Console/TransitionExportCommand.php (renamed from app/Console/TransitionExport.php)2
-rw-r--r--doc/cli.markdown17
-rwxr-xr-xkanboard44
16 files changed, 172 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 6282ecee..398ec499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ New features:
* Search in activity stream
* Search in comments
* Search by task creator
+* Added command line utility to reset user password and to disable 2FA
Improvements:
diff --git a/app/Console/Base.php b/app/Console/BaseCommand.php
index 25d48e44..23cdcc9c 100644
--- a/app/Console/Base.php
+++ b/app/Console/BaseCommand.php
@@ -11,6 +11,7 @@ use Symfony\Component\Console\Command\Command;
* @package console
* @author Frederic Guillot
*
+ * @property \Kanboard\Validator\PasswordResetValidator $passwordResetValidator
* @property \Kanboard\Export\SubtaskExport $subtaskExport
* @property \Kanboard\Export\TaskExport $taskExport
* @property \Kanboard\Export\TransitionExport $transitionExport
@@ -21,11 +22,12 @@ use Symfony\Component\Console\Command\Command;
* @property \Kanboard\Model\ProjectDailyStats $projectDailyStats
* @property \Kanboard\Model\Task $task
* @property \Kanboard\Model\TaskFinder $taskFinder
+ * @property \Kanboard\Model\User $user
* @property \Kanboard\Model\UserNotification $userNotification
* @property \Kanboard\Model\UserNotificationFilter $userNotificationFilter
* @property \Symfony\Component\EventDispatcher\EventDispatcher $dispatcher
*/
-abstract class Base extends Command
+abstract class BaseCommand extends Command
{
/**
* Container instance
diff --git a/app/Console/Cronjob.php b/app/Console/CronjobCommand.php
index 3a5c5596..dae13af9 100644
--- a/app/Console/Cronjob.php
+++ b/app/Console/CronjobCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\NullOutput;
-class Cronjob extends Base
+class CronjobCommand extends BaseCommand
{
private $commands = array(
'projects:daily-stats',
diff --git a/app/Console/LocaleComparator.php b/app/Console/LocaleComparatorCommand.php
index 8e5e0904..de83714f 100644
--- a/app/Console/LocaleComparator.php
+++ b/app/Console/LocaleComparatorCommand.php
@@ -7,7 +7,7 @@ use RecursiveDirectoryIterator;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-class LocaleComparator extends Base
+class LocaleComparatorCommand extends BaseCommand
{
const REF_LOCALE = 'fr_FR';
diff --git a/app/Console/LocaleSync.php b/app/Console/LocaleSyncCommand.php
index d62b40b5..11cfbde0 100644
--- a/app/Console/LocaleSync.php
+++ b/app/Console/LocaleSyncCommand.php
@@ -6,7 +6,7 @@ use DirectoryIterator;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-class LocaleSync extends Base
+class LocaleSyncCommand extends BaseCommand
{
const REF_LOCALE = 'fr_FR';
diff --git a/app/Console/ProjectDailyColumnStatsExport.php b/app/Console/ProjectDailyColumnStatsExportCommand.php
index 2513fbf1..ced1a374 100644
--- a/app/Console/ProjectDailyColumnStatsExport.php
+++ b/app/Console/ProjectDailyColumnStatsExportCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-class ProjectDailyColumnStatsExport extends Base
+class ProjectDailyColumnStatsExportCommand extends BaseCommand
{
protected function configure()
{
diff --git a/app/Console/ProjectDailyStatsCalculation.php b/app/Console/ProjectDailyStatsCalculationCommand.php
index 9884cc1c..5b898f02 100644
--- a/app/Console/ProjectDailyStatsCalculation.php
+++ b/app/Console/ProjectDailyStatsCalculationCommand.php
@@ -6,7 +6,7 @@ use Kanboard\Model\Project;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-class ProjectDailyStatsCalculation extends Base
+class ProjectDailyStatsCalculationCommand extends BaseCommand
{
protected function configure()
{
diff --git a/app/Console/ResetPasswordCommand.php b/app/Console/ResetPasswordCommand.php
new file mode 100644
index 00000000..93dc3761
--- /dev/null
+++ b/app/Console/ResetPasswordCommand.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Kanboard\Console;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+
+class ResetPasswordCommand extends BaseCommand
+{
+ protected function configure()
+ {
+ $this
+ ->setName('user:reset-password')
+ ->setDescription('Change user password')
+ ->addArgument('username', InputArgument::REQUIRED, 'Username')
+ ;
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output)
+ {
+ $helper = $this->getHelper('question');
+ $username = $input->getArgument('username');
+
+ $passwordQuestion = new Question('What is the new password for '.$username.'? (characters are not printed)'.PHP_EOL);
+ $passwordQuestion->setHidden(true);
+ $passwordQuestion->setHiddenFallback(false);
+
+ $password = $helper->ask($input, $output, $passwordQuestion);
+
+ $confirmationQuestion = new Question('Confirmation:'.PHP_EOL);
+ $confirmationQuestion->setHidden(true);
+ $confirmationQuestion->setHiddenFallback(false);
+
+ $confirmation = $helper->ask($input, $output, $confirmationQuestion);
+
+ if ($this->validatePassword($output, $password, $confirmation)) {
+ $this->resetPassword($output, $username, $password);
+ }
+ }
+
+ private function validatePassword(OutputInterface $output, $password, $confirmation)
+ {
+ list($valid, $errors) = $this->passwordResetValidator->validateModification(array(
+ 'password' => $password,
+ 'confirmation' => $confirmation,
+ ));
+
+ if (!$valid) {
+ foreach ($errors as $error_list) {
+ foreach ($error_list as $error) {
+ $output->writeln('<error>'.$error.'</error>');
+ }
+ }
+ }
+
+ return $valid;
+ }
+
+ private function resetPassword(OutputInterface $output, $username, $password)
+ {
+ $userId = $this->user->getIdByUsername($username);
+
+ if (empty($userId)) {
+ $output->writeln('<error>User not found</error>');
+ return false;
+ }
+
+ if (!$this->user->update(array('id' => $userId, 'password' => $password))) {
+ $output->writeln('<error>Unable to update password</error>');
+ return false;
+ }
+
+ $output->writeln('<info>Password updated successfully</info>');
+
+ return true;
+ }
+}
diff --git a/app/Console/ResetTwoFactorCommand.php b/app/Console/ResetTwoFactorCommand.php
new file mode 100644
index 00000000..3bf01e81
--- /dev/null
+++ b/app/Console/ResetTwoFactorCommand.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Kanboard\Console;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ResetTwoFactorCommand extends BaseCommand
+{
+ protected function configure()
+ {
+ $this
+ ->setName('user:reset-2fa')
+ ->setDescription('Remove two-factor authentication for a user')
+ ->addArgument('username', InputArgument::REQUIRED, 'Username');
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output)
+ {
+ $username = $input->getArgument('username');
+ $userId = $this->user->getIdByUsername($username);
+
+ if (empty($userId)) {
+ $output->writeln('<error>User not found</error>');
+ return false;
+ }
+
+ if (!$this->user->update(array('id' => $userId, 'twofactor_activated' => 0, 'twofactor_secret' => ''))) {
+ $output->writeln('<error>Unable to update user profile</error>');
+ return false;
+ }
+
+ $output->writeln('<info>Two-factor authentication disabled</info>');
+
+ return true;
+ }
+}
diff --git a/app/Console/SubtaskExport.php b/app/Console/SubtaskExportCommand.php
index aaa95276..986af1a4 100644
--- a/app/Console/SubtaskExport.php
+++ b/app/Console/SubtaskExportCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-class SubtaskExport extends Base
+class SubtaskExportCommand extends BaseCommand
{
protected function configure()
{
diff --git a/app/Console/TaskExport.php b/app/Console/TaskExportCommand.php
index 4515bf95..789245bc 100644
--- a/app/Console/TaskExport.php
+++ b/app/Console/TaskExportCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-class TaskExport extends Base
+class TaskExportCommand extends BaseCommand
{
protected function configure()
{
diff --git a/app/Console/TaskOverdueNotification.php b/app/Console/TaskOverdueNotificationCommand.php
index 43be4df8..7d176ab1 100644
--- a/app/Console/TaskOverdueNotification.php
+++ b/app/Console/TaskOverdueNotificationCommand.php
@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
-class TaskOverdueNotification extends Base
+class TaskOverdueNotificationCommand extends BaseCommand
{
protected function configure()
{
diff --git a/app/Console/TaskTrigger.php b/app/Console/TaskTriggerCommand.php
index 8d707211..9e9554f9 100644
--- a/app/Console/TaskTrigger.php
+++ b/app/Console/TaskTriggerCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Output\OutputInterface;
use Kanboard\Model\Task;
use Kanboard\Event\TaskListEvent;
-class TaskTrigger extends Base
+class TaskTriggerCommand extends BaseCommand
{
protected function configure()
{
diff --git a/app/Console/TransitionExport.php b/app/Console/TransitionExportCommand.php
index d9f805a4..265757b3 100644
--- a/app/Console/TransitionExport.php
+++ b/app/Console/TransitionExportCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-class TransitionExport extends Base
+class TransitionExportCommand extends BaseCommand
{
protected function configure()
{
diff --git a/doc/cli.markdown b/doc/cli.markdown
index 9334d84b..d38d8b53 100644
--- a/doc/cli.markdown
+++ b/doc/cli.markdown
@@ -45,6 +45,9 @@ Available commands:
projects:daily-stats Calculate daily statistics for all projects
trigger
trigger:tasks Trigger scheduler event for all tasks
+ user
+ user:reset-2fa Remove two-factor authentication for a user
+ user:reset-password Change user password
```
Available commands
@@ -147,3 +150,17 @@ This command send a "daily cronjob event" to all open tasks of each project.
./kanboard trigger:tasks
Trigger task event: project_id=2, nb_tasks=1
```
+
+### Reset user password
+
+```bash
+./kanboard user:reset-password my_user
+```
+
+You will be prompted for a password and confirmation. Characters are not printed to the screen.
+
+### Remove two-factor authentication for a user
+
+```bash
+./kanboard user:reset-2fa my_user
+```
diff --git a/kanboard b/kanboard
index 5046181d..6a51c937 100755
--- a/kanboard
+++ b/kanboard
@@ -3,30 +3,34 @@
require __DIR__.'/app/common.php';
+use Kanboard\Console\ResetPasswordCommand;
+use Kanboard\Console\ResetTwoFactorCommand;
use Symfony\Component\Console\Application;
use Symfony\Component\EventDispatcher\Event;
-use Kanboard\Console\TaskOverdueNotification;
-use Kanboard\Console\SubtaskExport;
-use Kanboard\Console\TaskExport;
-use Kanboard\Console\ProjectDailyStatsCalculation;
-use Kanboard\Console\ProjectDailyColumnStatsExport;
-use Kanboard\Console\TransitionExport;
-use Kanboard\Console\LocaleSync;
-use Kanboard\Console\LocaleComparator;
-use Kanboard\Console\TaskTrigger;
-use Kanboard\Console\Cronjob;
+use Kanboard\Console\TaskOverdueNotificationCommand;
+use Kanboard\Console\SubtaskExportCommand;
+use Kanboard\Console\TaskExportCommand;
+use Kanboard\Console\ProjectDailyStatsCalculationCommand;
+use Kanboard\Console\ProjectDailyColumnStatsExportCommand;
+use Kanboard\Console\TransitionExportCommand;
+use Kanboard\Console\LocaleSyncCommand;
+use Kanboard\Console\LocaleComparatorCommand;
+use Kanboard\Console\TaskTriggerCommand;
+use Kanboard\Console\CronjobCommand;
$container['dispatcher']->dispatch('app.bootstrap', new Event);
$application = new Application('Kanboard', APP_VERSION);
-$application->add(new TaskOverdueNotification($container));
-$application->add(new SubtaskExport($container));
-$application->add(new TaskExport($container));
-$application->add(new ProjectDailyStatsCalculation($container));
-$application->add(new ProjectDailyColumnStatsExport($container));
-$application->add(new TransitionExport($container));
-$application->add(new LocaleSync($container));
-$application->add(new LocaleComparator($container));
-$application->add(new TaskTrigger($container));
-$application->add(new Cronjob($container));
+$application->add(new TaskOverdueNotificationCommand($container));
+$application->add(new SubtaskExportCommand($container));
+$application->add(new TaskExportCommand($container));
+$application->add(new ProjectDailyStatsCalculationCommand($container));
+$application->add(new ProjectDailyColumnStatsExportCommand($container));
+$application->add(new TransitionExportCommand($container));
+$application->add(new LocaleSyncCommand($container));
+$application->add(new LocaleComparatorCommand($container));
+$application->add(new TaskTriggerCommand($container));
+$application->add(new CronjobCommand($container));
+$application->add(new ResetPasswordCommand($container));
+$application->add(new ResetTwoFactorCommand($container));
$application->run();