A free, self-hostable news aggregator…
Rotate session ID on all authenticated transitions (CWE-384) (#9333)
Gigi5a270c02b068
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.phpindex db9633dc1..916c14e3f 100644--- a/app/Controllers/userController.php+++ b/app/Controllers/userController.php@@ -508,6 +508,13 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController {if ($ok && !FreshRSS_Auth::hasAccess('admin')) {$user_conf = FreshRSS_UserConfiguration::getForUser($new_user_name);if ($user_conf !== null) {+ // Rotate the session ID on this unauthenticated->authenticated+ // transition to prevent session fixation, as on form login.+ try {+ Minz_Session::regenerateID('FreshRSS');+ } catch (RuntimeException $e) {+ Minz_Log::error('Session could not be regenerated during self-registration auto-login! ' . $e->getMessage());+ }Minz_Session::_params([Minz_User::CURRENT_USER => $new_user_name,'passwordHash' => $user_conf->passwordHash,diff --git a/app/Models/Auth.php b/app/Models/Auth.phpindex 2c3cad01e..2699e0641 100644--- a/app/Models/Auth.php+++ b/app/Models/Auth.php@@ -34,9 +34,19 @@ class FreshRSS_Auth {if (self::$login_ok && self::giveAccess()) {return self::$login_ok;}- if (self::accessControl() && self::giveAccess()) {- FreshRSS_UserDAO::touch();- return self::$login_ok;+ if (self::accessControl()) {+ // Rotate the PHP session ID on the unauthenticated->authenticated transition+ if (FreshRSS_Context::systemConf()->auth_type !== 'none') {+ try {+ Minz_Session::regenerateID('FreshRSS');+ } catch (RuntimeException $e) {+ Minz_Log::error('Session could not be regenerated during access restoration: ' . $e->getMessage());+ }+ }+ if (self::giveAccess()) {+ FreshRSS_UserDAO::touch();+ return self::$login_ok;+ }}// Be sure all accesses are removed!self::removeAccess();diff --git a/lib/Minz/Session.php b/lib/Minz/Session.phpindex a24b7a01a..c8875e19e 100644--- a/lib/Minz/Session.php+++ b/lib/Minz/Session.php@@ -54,6 +54,9 @@ class Minz_Session {session_name($name);+ // Reject an uninitialized (e.g. attacker-supplied) session ID+ ini_set('session.use_strict_mode', '1');+// When using cookies (default value), session_start() sends HTTP headerssession_start();session_write_close();@@ -234,6 +237,25 @@ class Minz_Session {$params = session_get_cookie_params();$params['expires'] = $params['lifetime'] > 0 ? time() + $params['lifetime'] : 0;unset($params['lifetime']);++ // session_start() may already have queued a cookie when there was no session+ // cookie in the request (e.g. during remember-me auto-login).+ $setCookieHeaders = [];+ foreach (headers_list() as $header) {+ if (stripos($header, 'Set-Cookie:') === 0) {+ $setCookieHeaders[] = $header;+ }+ }+ if ($setCookieHeaders !== []) {+ header_remove('Set-Cookie');+ $prefixLength = strlen('Set-Cookie:');+ foreach ($setCookieHeaders as $header) {+ $cookie = ltrim(substr($header, $prefixLength));+ if (!str_starts_with($cookie, $name . '=')) {+ header($header, replace: false);+ }+ }+ }if (!setcookie($name, $newId, $params)) {throw new RuntimeException('Failed to set session cookie!');}