implement some tweaks to session handling; properly remove session cookie if invalid...

[tt-rss.git] / include / sessions.php

diff --git a/include/sessions.php b/include/sessions.php
index ff9d28a30a7172723c4068bcf5227a63674226d4..402e8b8deca2c26922e75f8c6dd2b78c9cf5e64e 100644 (file)
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -5,6 +5,7 @@
        require_once "db.php";
        require_once "lib/accept-to-gettext.php";
        require_once "lib/gettext/gettext.inc";
+       require_once "version.php";
 
        $session_expire = max(SESSION_COOKIE_LIFETIME, 86400);
        $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
@@ -14,10 +15,13 @@
                ini_set("session.cookie_secure", true);
        }
 
-       ini_set("session.gc_probability", 50);
+       ini_set("session.gc_probability", 75);
        ini_set("session.name", $session_name);
        ini_set("session.use_only_cookies", true);
        ini_set("session.gc_maxlifetime", $session_expire);
+       ini_set("session.cookie_lifetime", min(0, SESSION_COOKIE_LIFETIME));
+
+       global $session_connection;
 
        function session_get_schema_version($link, $nocache = false) {
                global $schema_version;
@@ -34,6 +38,9 @@
 
        function validate_session($link) {
                if (SINGLE_USER_MODE) return true;
+               if (!$link) return false;
+
+               if (VERSION != $_SESSION["version"]) return false;
 
                $check_ip = $_SESSION['ip_address'];
 
@@ -59,6 +66,9 @@
                if ($_SESSION["ref_schema_version"] != session_get_schema_version($link, true))
                        return false;
 
+               if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"])
+                       return false;
+
                if ($_SESSION["uid"]) {
                        $result = db_query($link,
                                "SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");
@@ -89,7 +99,6 @@
 
 
        function ttrss_open ($s, $n) {
-
                global $session_connection;
 
                $session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
@@ -173,14 +182,9 @@
                        "ttrss_destroy", "ttrss_gc");
        }
 
-       if (!defined('TTRSS_SESSION_NAME') || TTRSS_SESSION_NAME != 'ttrss_api_sid') {
-               if (isset($_COOKIE[$session_name])) {
+       if (!defined('NO_SESSION_AUTOSTART')) {
+               if (isset($_COOKIE[session_name()])) {
                        @session_start();
-
-                       if (!isset($_SESSION["uid"]) || !$_SESSION["uid"] || !validate_session($session_connection)) {
-                               session_destroy();
-                          setcookie(session_name(), '', time()-42000, '/');
-                       }
                }
        }
 ?>