Skip to content

A free, self-hostable news aggregator…

Fix reauth with legacy cookie (#8778)

Alexandre Alapetitebbb28b5edae3
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index 6cb26ce71..43678ab2c 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -54,6 +54,15 @@ class Minz_Session {
session_set_cookie_params($params);
session_name($name);
+
+ // Delete legacy cookie (before 1.29.0) if it exists
+ if (isset($_COOKIE[$name])) {
+ $legacyDir = self::getLegacyCookieDir();
+ if ($legacyDir !== '' && $legacyDir !== '/') {
+ setcookie($name, '', ['expires' => 1, 'path' => $legacyDir]);
+ }
+ }
+
// When using cookies (default value), session_start() sends HTTP headers
session_start();
session_write_close();
@@ -180,6 +189,22 @@ class Minz_Session {
}
}
+ /**
+ * Kept only to delete legacy cookies from before 1.29.0
+ */
+ protected static function getLegacyCookieDir(): string {
+ // Get the script_name (e.g. /p/i/index.php) and keep only the path.
+ $cookie_dir = '';
+ if (!empty($_SERVER['HTTP_X_FORWARDED_PREFIX']) && is_string($_SERVER['HTTP_X_FORWARDED_PREFIX'])) {
+ $cookie_dir .= rtrim($_SERVER['HTTP_X_FORWARDED_PREFIX'], '/ ');
+ }
+ $cookie_dir .= empty($_SERVER['REQUEST_URI']) || !is_string($_SERVER['REQUEST_URI']) ? '/' : $_SERVER['REQUEST_URI'];
+ if (substr($cookie_dir, -1) !== '/') {
+ $cookie_dir = dirname($cookie_dir) . '/';
+ }
+ return $cookie_dir;
+ }
+
/**
* Regenerate a session id.
*/