Skip to content

A free, self-hostable news aggregator…

Require POST+CSRF for self-update mutations; guard post-config step (CWE-352) (#9335)

Gigia6253486c04d
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 15d83235b..ecd5aacb2 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -133,8 +133,7 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController {
Minz_Error::error(403);
}
- if (!(Minz_Request::actionName() === 'apply' && Minz_Request::paramBoolean('post_conf')) &&
- FreshRSS_Auth::requestReauth()) {
+ if (FreshRSS_Auth::requestReauth()) {
return;
}
@@ -187,6 +186,11 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController {
Else via system configuration auto_update_url
*/
public function checkAction(): void {
+ if (!Minz_Request::isPost()) {
+ Minz_Request::forward(['c' => 'update', 'a' => 'index'], true);
+ return;
+ }
+
FreshRSS_View::prependTitle(_t('admin.update.title') . ' · ');
$this->view->_path('update/index.phtml');
@@ -298,6 +302,12 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController {
}
if (Minz_Request::paramBoolean('post_conf')) {
+ if (!Minz_Session::paramBoolean('update_post_conf_ok')) {
+ Minz_Request::forward(['c' => 'update', 'a' => 'index'], true);
+ return;
+ }
+ Minz_Session::_param('update_post_conf_ok', false);
+
if (self::isGit()) {
$res = !self::hasGitUpdate();
} else {
@@ -321,16 +331,19 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController {
Minz_Request::bad(_t('feedback.update.error', is_string($res) ? $res : 'unknown'), [ 'c' => 'update', 'a' => 'index' ]);
}
} else {
+ if (!Minz_Request::isPost()) {
+ Minz_Request::forward(['c' => 'update', 'a' => 'index'], true);
+ return;
+ }
+
$res = false;
if (self::isGit()) {
$res = self::gitPull();
} else {
require UPDATE_FILENAME;
- if (Minz_Request::isPost()) {
- // @phpstan-ignore function.notFound
- save_info_update();
- }
+ // @phpstan-ignore function.notFound
+ save_info_update();
// @phpstan-ignore function.notFound
if (!need_info_update()) {
// @phpstan-ignore function.notFound
@@ -345,6 +358,8 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController {
}
if ($res === true) {
+ // Authorise the single internal post-configuration redirect that follows.
+ Minz_Session::_param('update_post_conf_ok', true);
Minz_Request::forward([
'c' => 'update',
'a' => 'apply',
diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml
index 3bebb2a79..92fad9027 100644
--- a/app/views/update/index.phtml
+++ b/app/views/update/index.phtml
@@ -61,7 +61,10 @@
?>
<div class="form-group form-actions">
<div class="group-controls">
- <a href="<?= _url('update', 'check') ?>" class="btn btn-important"><?= _t('admin.update.check') ?></a>
+ <form method="post" action="<?= _url('update', 'check') ?>">
+ <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+ <button type="submit" class="btn btn-important"><?= _t('admin.update.check') ?></button>
+ </form>
</div>
</div>
<?php } ?>
@@ -69,8 +72,11 @@
<?php if ($this->update_to_apply) { ?>
<div class="form-group form-actions">
<div class="group-controls">
- <a class="btn btn-attention btn-state1" href="<?= _url('update', 'apply') ?>" data-state2-id="button-update-loading"><?= _t('admin.update.apply') ?></a>
- <span class="btn btn-state2" id="button-update-loading"><?= _t('admin.update.loading') ?></span>
+ <form method="post" action="<?= _url('update', 'apply') ?>">
+ <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+ <button type="submit" class="btn btn-attention btn-state1" data-state2-id="button-update-loading"><?= _t('admin.update.apply') ?></button>
+ <span class="btn btn-state2" id="button-update-loading"><?= _t('admin.update.loading') ?></span>
+ </form>
</div>
</div>
<?php } ?>