A free, self-hostable news aggregator…
Mitigate some 404 situations (#9435)
Alexandre Alapetitef61708332867
diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.phpindex 81ce8768d..986932ff7 100644--- a/app/Controllers/errorController.php+++ b/app/Controllers/errorController.php@@ -10,12 +10,12 @@ class FreshRSS_error_Controller extends FreshRSS_ActionController {** It is called by Minz_Error::error() method.*- * Parameters are passed by Minz_Session to have a proper url:- * - error_code (default: 404)- * - error_logs (default: [])+ * Parameters:+ * - code: error code passed in the URL or Session (default: 404)+ * - error_logs: passed by Session (default: [])*/public function indexAction(): void {- $code_int = Minz_Session::paramInt('error_code') ?: 404;+ $code_int = Minz_Request::paramInt('code') ?: Minz_Session::paramInt('error_code') ?: 404;/** @var array<string> */$error_logs = Minz_Session::paramArray('error_logs');Minz_Session::_params([diff --git a/app/Models/Auth.php b/app/Models/Auth.phpindex 2699e0641..90be439cb 100644--- a/app/Models/Auth.php+++ b/app/Models/Auth.php@@ -35,10 +35,11 @@ class FreshRSS_Auth {return self::$login_ok;}if (self::accessControl()) {- // Rotate the PHP session ID on the unauthenticated->authenticated transition+ // Rotate the PHP session ID on the unauthenticated->authenticated transition.+ // Keep the old session (not authenticated) to not break concurrent in-flight requests.if (FreshRSS_Context::systemConf()->auth_type !== 'none') {try {- Minz_Session::regenerateID('FreshRSS');+ Minz_Session::regenerateID('FreshRSS', delete_old_session: false);} catch (RuntimeException $e) {Minz_Log::error('Session could not be regenerated during access restoration: ' . $e->getMessage());}@@ -116,6 +117,7 @@ class FreshRSS_Auth {FreshRSS_Context::initUser();if (!FreshRSS_Context::hasUserConf() || !FreshRSS_Context::userConf()->enabled) {self::$login_ok = false;+ Minz_Session::_param('loginOk', false);return false;}diff --git a/lib/Minz/Error.php b/lib/Minz/Error.phpindex 526836718..66ffbf5b4 100644--- a/lib/Minz/Error.php+++ b/lib/Minz/Error.php@@ -29,7 +29,8 @@ class Minz_Error {'error_logs' => $logs,]);- Minz_Request::forward(['c' => 'error'], $redirect);+ // Also pass the error code by URL, in case the session is lost (session ID rotation)+ Minz_Request::forward(['c' => 'error', 'params' => ['code' => $code]], $redirect);}/**diff --git a/lib/Minz/Session.php b/lib/Minz/Session.phpindex 8498e1c12..42c4bbeba 100644--- a/lib/Minz/Session.php+++ b/lib/Minz/Session.php@@ -212,9 +212,11 @@ class Minz_Session {/*** Regenerate a session id.*+ * @param bool $delete_old_session `true` to delete the old session file; set to `false` if it is known+ * not to contain authenticated data, to avoid breaking concurrent in-flight requests* @throws RuntimeException if the session could not be regenerated (e.g. unwritable session storage)*/- public static function regenerateID(string $name): void {+ public static function regenerateID(string $name, bool $delete_old_session = true): void {if (self::$volatile) {return;}@@ -226,7 +228,7 @@ class Minz_Session {if (session_name($name) === false || !@session_start()) {throw new RuntimeException("Session {$name} could not be started!");}- if (!session_regenerate_id(delete_old_session: true)) {+ if (!session_regenerate_id(delete_old_session: $delete_old_session)) {throw new RuntimeException('Session could not be regenerated!');}session_write_close();