From e046791c9330ee80580494b8fce3f5fc0bf08f98 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 22 Jul 2017 20:05:36 +0200 Subject: CLI update user https://github.com/FreshRSS/FreshRSS/issues/1600 Not tested --- app/Controllers/userController.php | 50 +++++++++++++++++++++-------------- cli/README.md | 2 ++ cli/create-user.php | 1 + cli/update-user.php | 54 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 20 deletions(-) create mode 100644 cli/update-user.php diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index 3cbbd8633..a58501186 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -44,6 +44,29 @@ class FreshRSS_user_Controller extends Minz_ActionController { return preg_match('/^' . self::USERNAME_PATTERN . '$/', $username) === 1; } + public static function updateContextUser($passwordPlain, $apiPasswordPlain, $userConfigUpdated = array()) { + if ($passwordPlain != '') { + $passwordHash = self::hashPassword($passwordPlain); + FreshRSS_Context::$user_conf->passwordHash = $passwordHash; + } + + if ($apiPasswordPlain != '') { + $apiPasswordHash = self::hashPassword($apiPasswordPlain); + FreshRSS_Context::$user_conf->apiPasswordHash = $apiPasswordHash; + } + + if (is_array($userConfigUpdated)) { + foreach ($userConfigUpdated as $configName => $configValue) { + if ($configValue !== null) { + FreshRSS_Context::$user_conf->_param($configName, $configValue); + } + } + } + + $ok = FreshRSS_Context::$user_conf->save(); + return $ok; + } + /** * This action displays the user profile page. */ @@ -55,30 +78,17 @@ class FreshRSS_user_Controller extends Minz_ActionController { )); if (Minz_Request::isPost()) { - $ok = true; - $passwordPlain = Minz_Request::param('newPasswordPlain', '', true); - if ($passwordPlain != '') { - Minz_Request::_param('newPasswordPlain'); //Discard plain-text password ASAP - $_POST['newPasswordPlain'] = ''; - $passwordHash = self::hashPassword($passwordPlain); - $ok &= ($passwordHash != ''); - FreshRSS_Context::$user_conf->passwordHash = $passwordHash; - } - Minz_Session::_param('passwordHash', FreshRSS_Context::$user_conf->passwordHash); + Minz_Request::_param('newPasswordPlain'); //Discard plain-text password ASAP + $_POST['newPasswordPlain'] = ''; - $passwordPlain = Minz_Request::param('apiPasswordPlain', '', true); - if ($passwordPlain != '') { - $passwordHash = self::hashPassword($passwordPlain); - $ok &= ($passwordHash != ''); - FreshRSS_Context::$user_conf->apiPasswordHash = $passwordHash; - } + $apiPasswordPlain = Minz_Request::param('apiPasswordPlain', '', true); - $current_token = FreshRSS_Context::$user_conf->token; - $token = Minz_Request::param('token', $current_token); - FreshRSS_Context::$user_conf->token = $token; + $ok = self::updateContextUser($passwordPlain, $apiPasswordPlain, array( + 'token' => Minz_Request::param('token', null), + )); - $ok &= FreshRSS_Context::$user_conf->save(); + Minz_Session::_param('passwordHash', FreshRSS_Context::$user_conf->passwordHash); if ($ok) { Minz_Request::good(_t('feedback.profile.updated'), diff --git a/cli/README.md b/cli/README.md index 1ac8c95ce..6e120babe 100644 --- a/cli/README.md +++ b/cli/README.md @@ -46,6 +46,8 @@ cd /usr/share/FreshRSS ./cli/create-user.php --user username ( --password 'password' --api-password 'api_password' --language en --email user@example.net --token 'longRandomString' --no-default-feeds ) # --language can be: 'en' (default), 'fr', or one of the [supported languages](../app/i18n/) +./cli/update-user.php --user username ( --password 'password' --api-password 'api_password' --language en --email user@example.net --token 'longRandomString' --purge_after_months 3 --feed_min_articles_default 50 --feed_ttl_default 3600 --since_hours_posts_per_rss 168 --min_posts_per_rss 2 --max_posts_per_rss 400 ) + ./cli/delete-user.php --user username ./cli/list-users.php diff --git a/cli/create-user.php b/cli/create-user.php index c9e350c14..0b131ac35 100755 --- a/cli/create-user.php +++ b/cli/create-user.php @@ -33,6 +33,7 @@ $ok = FreshRSS_user_Controller::createUser($username, empty($options['api-password']) ? '' : $options['api-password'], array( 'language' => empty($options['language']) ? '' : $options['language'], + 'mail_login' => empty($options['email']) ? '' : $options['email'], 'token' => empty($options['token']) ? '' : $options['token'], ), !isset($options['no-default-feeds'])); diff --git a/cli/update-user.php b/cli/update-user.php new file mode 100644 index 000000000..5f3335f2e --- /dev/null +++ b/cli/update-user.php @@ -0,0 +1,54 @@ +#!/usr/bin/php + isset($options['language']) ? $options['language'] : null, + 'mail_login' => isset($options['email']) ? $options['email'] : null, + 'token' => isset($options['token']) ? $options['token'] : null, + 'old_entries' => intParam('purge_after_months'), + 'keep_history_default' => intParam('feed_min_articles_default'), + 'ttl_default' => intParam('feed_ttl_default'), + 'since_hours_posts_per_rss' => intParam('since_hours_posts_per_rss'), + 'min_posts_per_rss' => intParam('min_posts_per_rss'), + 'max_posts_per_rss' => intParam('max_posts_per_rss'), + )); + +if (!$ok) { + fail('FreshRSS could not update user!'); +} + +invalidateHttpCache($username); + +done($ok); -- cgit v1.2.3 From e6fadbe58094dec2d085564dd67505c2cc2cd184 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 22 Jul 2017 20:23:53 +0200 Subject: +x execution rights update-user --- cli/update-user.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 cli/update-user.php diff --git a/cli/update-user.php b/cli/update-user.php old mode 100644 new mode 100755 -- cgit v1.2.3 From a11517dc9a028d7f8be56680d07d49e0a6b4c551 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 22 Jul 2017 20:37:50 +0200 Subject: updateContextUser typo --- cli/update-user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/update-user.php b/cli/update-user.php index 5f3335f2e..6b54f4038 100755 --- a/cli/update-user.php +++ b/cli/update-user.php @@ -30,7 +30,7 @@ function intParam($name) { return isset($options[$name]) && ctype_digit($options[$name]) ? intval($options[$name]) : null; } -$ok = FreshRSS_user_Controller::updateContextUser($username, +$ok = FreshRSS_user_Controller::updateContextUser( empty($options['password']) ? '' : $options['password'], empty($options['api-password']) ? '' : $options['api-password'], array( -- cgit v1.2.3 From e5b7586a3d354e388e11972ab3d9c4a6328f6ac4 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 23 Jul 2017 00:14:01 +0200 Subject: CLI update-user usage --- cli/update-user.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cli/update-user.php b/cli/update-user.php index 6b54f4038..f8ed26c8f 100755 --- a/cli/update-user.php +++ b/cli/update-user.php @@ -19,7 +19,8 @@ $options = getopt('', array( if (empty($options['user'])) { fail('Usage: ' . basename(__FILE__) . " --user username ( --password 'password' --api-password 'api_password'" . - " --language en --email user@example.net --token 'longRandomString' )"); + " --language en --email user@example.net --token 'longRandomString' --purge_after_months 3 " . + " --feed_min_articles_default 50 --feed_ttl_default 3600 --since_hours_posts_per_rss 168 --min_posts_per_rss 2 --max_posts_per_rss 400 )"); } $username = cliInitUser($options['user']); @@ -51,4 +52,6 @@ if (!$ok) { invalidateHttpCache($username); +accessRights(); + done($ok); -- cgit v1.2.3 From 1138c8a63b1ff54eb96821d4f4ff829f5dc67a02 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 27 Jul 2017 09:40:47 +0200 Subject: CLI usage typo https://github.com/FreshRSS/FreshRSS/pull/1602#issuecomment-318188437 --- cli/create-user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/create-user.php b/cli/create-user.php index 0b131ac35..c3a45cad8 100755 --- a/cli/create-user.php +++ b/cli/create-user.php @@ -14,7 +14,7 @@ $options = getopt('', array( if (empty($options['user'])) { fail('Usage: ' . basename(__FILE__) . " --user username ( --password 'password' --api-password 'api_password'" . - " --language en --email user@example.net --token 'longRandomString --no-default-feeds' )"); + " --language en --email user@example.net --token 'longRandomString' --no-default-feeds )"); } $username = $options['user']; if (!FreshRSS_user_Controller::checkUsername($username)) { -- cgit v1.2.3 From 673b6e48b0af5f2f6f92c501f82fe10281dbf20f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 5 Aug 2017 18:27:47 +0200 Subject: Mutualise create-user and update-user --- cli/README.md | 5 +++-- cli/_update-or-create-user.php | 51 ++++++++++++++++++++++++++++++++++++++++++ cli/create-user.php | 27 +++++----------------- cli/update-user.php | 42 ++++------------------------------ 4 files changed, 63 insertions(+), 62 deletions(-) create mode 100644 cli/_update-or-create-user.php diff --git a/cli/README.md b/cli/README.md index 6e120babe..ce1be10a7 100644 --- a/cli/README.md +++ b/cli/README.md @@ -43,10 +43,11 @@ cd /usr/share/FreshRSS ./cli/reconfigure.php # Same parameters as for do-install.php. Used to update an existing installation. -./cli/create-user.php --user username ( --password 'password' --api-password 'api_password' --language en --email user@example.net --token 'longRandomString' --no-default-feeds ) +./cli/create-user.php --user username ( --password 'password' --api_password 'api_password' --language en --email user@example.net --token 'longRandomString' --no_default_feeds --purge_after_months 3 --feed_min_articles_default 50 --feed_ttl_default 3600 --since_hours_posts_per_rss 168 --min_posts_per_rss 2 --max_posts_per_rss 400 ) # --language can be: 'en' (default), 'fr', or one of the [supported languages](../app/i18n/) -./cli/update-user.php --user username ( --password 'password' --api-password 'api_password' --language en --email user@example.net --token 'longRandomString' --purge_after_months 3 --feed_min_articles_default 50 --feed_ttl_default 3600 --since_hours_posts_per_rss 168 --min_posts_per_rss 2 --max_posts_per_rss 400 ) +./cli/update-user.php --user username ( ... ) +# Same options as create-user.php, except --no_default_feeds which is only available for create-user.php ./cli/delete-user.php --user username diff --git a/cli/_update-or-create-user.php b/cli/_update-or-create-user.php new file mode 100644 index 000000000..951e28fa2 --- /dev/null +++ b/cli/_update-or-create-user.php @@ -0,0 +1,51 @@ + strParam('language'), + 'mail_login' => strParam('email'), + 'token' => strParam('token'), + 'old_entries' => intParam('purge_after_months'), + 'keep_history_default' => intParam('feed_min_articles_default'), + 'ttl_default' => intParam('feed_ttl_default'), + 'since_hours_posts_per_rss' => intParam('since_hours_posts_per_rss'), + 'min_posts_per_rss' => intParam('min_posts_per_rss'), + 'max_posts_per_rss' => intParam('max_posts_per_rss'), + ); diff --git a/cli/create-user.php b/cli/create-user.php index f710e8d66..add9c1b13 100755 --- a/cli/create-user.php +++ b/cli/create-user.php @@ -1,21 +1,8 @@ #!/usr/bin/php empty($options['language']) ? '' : $options['language'], - 'mail_login' => empty($options['email']) ? '' : $options['email'], - 'token' => empty($options['token']) ? '' : $options['token'], - ), + empty($options['api_password']) ? '' : $options['api_password'], + $values, !isset($options['no-default-feeds'])); if (!$ok) { diff --git a/cli/update-user.php b/cli/update-user.php index f8ed26c8f..ac674484c 100755 --- a/cli/update-user.php +++ b/cli/update-user.php @@ -1,50 +1,16 @@ #!/usr/bin/php isset($options['language']) ? $options['language'] : null, - 'mail_login' => isset($options['email']) ? $options['email'] : null, - 'token' => isset($options['token']) ? $options['token'] : null, - 'old_entries' => intParam('purge_after_months'), - 'keep_history_default' => intParam('feed_min_articles_default'), - 'ttl_default' => intParam('feed_ttl_default'), - 'since_hours_posts_per_rss' => intParam('since_hours_posts_per_rss'), - 'min_posts_per_rss' => intParam('min_posts_per_rss'), - 'max_posts_per_rss' => intParam('max_posts_per_rss'), - )); + empty($options['api_password']) ? '' : $options['api_password'], + $values); if (!$ok) { fail('FreshRSS could not update user!'); -- cgit v1.2.3 From 5d4e4a8dd0702e42088bd93dca2158a3cb05b7a4 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 5 Aug 2017 23:10:02 +0200 Subject: Fix script name in usage --- cli/_update-or-create-user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/_update-or-create-user.php b/cli/_update-or-create-user.php index 951e28fa2..45bfee2cf 100644 --- a/cli/_update-or-create-user.php +++ b/cli/_update-or-create-user.php @@ -23,7 +23,7 @@ if (!$isUpdate) { $options = getopt('', $params); if (empty($options['user'])) { - fail('Usage: ' . basename(__FILE__) . " --user username ( --password 'password' --api_password 'api_password'" . + fail('Usage: ' . basename($_SERVER['SCRIPT_FILENAME']) . " --user username ( --password 'password' --api_password 'api_password'" . " --language en --email user@example.net --token 'longRandomString'" . ($isUpdate ? '' : '--no_default_feeds') . " --purge_after_months 3 --feed_min_articles_default 50 --feed_ttl_default 3600" . -- cgit v1.2.3 From d0281a9f35fa5d4c607bac26ebabd43da6eb2ce2 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 19 Aug 2017 16:19:03 +0200 Subject: typo update-or-create-user --- cli/_update-or-create-user.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cli/_update-or-create-user.php b/cli/_update-or-create-user.php index 45bfee2cf..c7f1008cd 100644 --- a/cli/_update-or-create-user.php +++ b/cli/_update-or-create-user.php @@ -31,10 +31,12 @@ if (empty($options['user'])) { } function strParam($name) { + global $options; return isset($options[$name]) ? strval($options[$name]) : null; } function intParam($name) { + global $options; return isset($options[$name]) && ctype_digit($options[$name]) ? intval($options[$name]) : null; } @@ -49,3 +51,5 @@ $values = array( 'min_posts_per_rss' => intParam('min_posts_per_rss'), 'max_posts_per_rss' => intParam('max_posts_per_rss'), ); + +$values = array_filter($values); -- cgit v1.2.3 From 4a813ff06fc06d1ce6c9cda2d66ff9895152be89 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 19 Aug 2017 16:24:44 +0200 Subject: Changelog 1600 https://github.com/FreshRSS/FreshRSS/issues/1600 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3caf39d3a..8d2060d8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ * UI * New page for subscription tools [#1534](https://github.com/FreshRSS/FreshRSS/issues/1354) +* CLI + * New command `./cli/update-user` to update user settings [#1600](https://github.com/FreshRSS/FreshRSS/issues/1600) * I18n * Korean [#1578](https://github.com/FreshRSS/FreshRSS/pull/1578) * Bug fixing -- cgit v1.2.3