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 3355ec49e8326faacd21a6cf612133afe8a43bdd..402e8b8deca2c26922e75f8c6dd2b78c9cf5e64e 100644 (file)
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -3,8 +3,11 @@
 
        require_once "config.php";
        require_once "db.php";
+       require_once "lib/accept-to-gettext.php";
+       require_once "lib/gettext/gettext.inc";
+       require_once "version.php";
 
-       $session_expire = SESSION_EXPIRE_TIME; //seconds
+       $session_expire = max(SESSION_COOKIE_LIFETIME, 86400);
        $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
 
        if (@$_SERVER['HTTPS'] == "on") {
@@ -12,13 +15,90 @@
                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_TIME);
+       ini_set("session.gc_maxlifetime", $session_expire);
+       ini_set("session.cookie_lifetime", min(0, SESSION_COOKIE_LIFETIME));
 
-       function ttrss_open ($s, $n) {
+       global $session_connection;
+
+       function session_get_schema_version($link, $nocache = false) {
+               global $schema_version;
+
+               if (!$schema_version) {
+                       $result = db_query($link, "SELECT schema_version FROM ttrss_version");
+                       $version = db_fetch_result($result, 0, "schema_version");
+                       $schema_version = $version;
+                       return $version;
+               } else {
+                       return $schema_version;
+               }
+       }
+
+       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'];
+
+               switch (SESSION_CHECK_ADDRESS) {
+               case 0:
+                       $check_ip = '';
+                       break;
+               case 1:
+                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
+                       break;
+               case 2:
+                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.'));
+                       $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
+                       break;
+               };
+
+               if ($check_ip && strpos($_SERVER['REMOTE_ADDR'], $check_ip) !== 0) {
+                       $_SESSION["login_error_msg"] =
+                               __("Session failed to validate (incorrect IP)");
+                       return false;
+               }
+
+               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"]."'");
 
+                       // user not found
+                       if (db_num_rows($result) == 0) {
+                               return false;
+                       } else {
+                               $pwd_hash = db_fetch_result($result, 0, "pwd_hash");
+
+                               if ($pwd_hash != $_SESSION["pwd_hash"]) {
+                                       return false;
+                               }
+                       }
+               }
+
+/*             if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) {
+
+                       //print_r($_SESSION);
+
+                       if (time() > $_SESSION["cookie_lifetime"]) {
+                               return false;
+                       }
+               } */
+
+               return true;
+       }
+
+
+       function ttrss_open ($s, $n) {
                global $session_connection;
 
                $session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
@@ -102,9 +182,9 @@
                        "ttrss_destroy", "ttrss_gc");
        }
 
-       session_set_cookie_params(SESSION_COOKIE_LIFETIME);
-
-       if (!defined('TTRSS_SESSION_NAME') || TTRSS_SESSION_NAME != 'ttrss_api_sid') {
-               @session_start();
+       if (!defined('NO_SESSION_AUTOSTART')) {
+               if (isset($_COOKIE[session_name()])) {
+                       @session_start();
+               }
        }
 ?>