X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Fsessions.php;h=b79988d987d2d033b6016694a6c9b49adb836923;hb=5feed36a3cfab485dc56299b3c0e5721378453ea;hp=539b81a0619f1770779dea3b42e0f5721f475ea3;hpb=58a2577d48790c79adfd44bcfd662c980ce6cfe4;p=tt-rss.git

diff --git a/include/sessions.php b/include/sessions.php
index 539b81a0..b79988d9 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -2,31 +2,34 @@
 	// Original from http://www.daniweb.com/code/snippet43.html
 
 	require_once "config.php";
-	require_once "db.php";
+	require_once "classes/db.php";
+	require_once "autoload.php";
+	require_once "errorhandler.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_expire = min(2147483647 - time() - 1, max(SESSION_COOKIE_LIFETIME, 86400));
 	$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
 
-	if (@$_SERVER['HTTPS'] == "on") {
-		$session_name .= "_ssl";
+	if (is_server_https()) {
 		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) {
+	function session_get_schema_version() {
 		global $schema_version;
 
 		if (!$schema_version) {
-			$result = db_query($link, "SELECT schema_version FROM ttrss_version");
-			$version = db_fetch_result($result, 0, "schema_version");
+			$row = Db::pdo()->query("SELECT schema_version FROM ttrss_version")->fetch();
+
+			$version = $row["schema_version"];
+
 			$schema_version = $version;
 			return $version;
 		} else {
@@ -34,158 +37,127 @@
 		}
 	}
 
-	function validate_session($link) {
+	function validate_session() {
 		if (SINGLE_USER_MODE) return true;
-		if (!$link) 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) {
+
+		if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
 			$_SESSION["login_error_msg"] =
-				__("Session failed to validate (incorrect IP)");
+				__("Session failed to validate (schema version changed)");
 			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;
+        $pdo = Db::pdo();
 
 		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"]) {
+			if (!defined('_SKIP_SESSION_ADDRESS_CHECKS') || !_SKIP_SESSION_ADDRESS_CHECKS) {
+				if ($_SESSION["ip_address"] != $_SERVER["REMOTE_ADDR"]) {
+					$_SESSION["login_error_msg"] = __("Session failed to validate.");
 					return false;
 				}
 			}
-		}
 
-/*		if ($_SESSION["cookie_lifetime"] && $_SESSION["uid"]) {
+			if ($_SESSION["user_agent"] != sha1($_SERVER['HTTP_USER_AGENT'])) {
+				$_SESSION["login_error_msg"] = __("Session failed to validate.");
+				return false;
+			}
 
-			//print_r($_SESSION);
+			$sth = $pdo->prepare("SELECT pwd_hash FROM ttrss_users WHERE id = ?");
+			$sth->execute([$_SESSION['uid']]);
+
+			// user not found
+			if ($row = $sth->fetch()) {
+                $pwd_hash = $row["pwd_hash"];
+
+                if ($pwd_hash != $_SESSION["pwd_hash"]) {
+
+                    $_SESSION["login_error_msg"] =
+                        __("Session failed to validate (password changed)");
+
+                    return false;
+                }
+			} else {
+
+                $_SESSION["login_error_msg"] =
+                    __("Session failed to validate (user not found)");
+
+                return false;
 
-			if (time() > $_SESSION["cookie_lifetime"]) {
-				return false;
 			}
-		} */
+		}
 
 		return true;
 	}
 
-
+	/**
+	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+	 */
 	function ttrss_open ($s, $n) {
-		global $session_connection;
-
-		$session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
 		return true;
 	}
 
 	function ttrss_read ($id){
+		global $session_expire;
 
-		global $session_connection,$session_read;
+		$sth = Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?");
+		$sth->execute([$id]);
 
-		$query = "SELECT data FROM ttrss_sessions WHERE id='$id'";
+		if ($row = $sth->fetch()) {
+            return base64_decode($row["data"]);
 
-		$res = db_query($session_connection, $query);
-
-		if (db_num_rows($res) != 1) {
-		 	return "";
 		} else {
-			$session_read = db_fetch_assoc($res);
-			$session_read["data"] = base64_decode($session_read["data"]);
-			return $session_read["data"];
-		}
-	}
+            $expire = time() + $session_expire;
 
-	function ttrss_write ($id, $data) {
+            $sth = Db::pdo()->prepare("INSERT INTO ttrss_sessions (id, data, expire)
+					VALUES (?, '', ?)");
+            $sth->execute([$id, $expire]);
+
+            return "";
 
-		if (! $data) {
-			return false;
 		}
 
-		global $session_connection, $session_read, $session_expire;
+	}
+
+	function ttrss_write ($id, $data) {
+		global $session_expire;
 
+		$data = base64_encode($data);
 		$expire = time() + $session_expire;
 
-		$data = db_escape_string($session_connection, base64_encode($data), false);
+        $sth = Db::pdo()->prepare("UPDATE ttrss_sessions SET data=?, expire=? WHERE id=?");
+        $sth->execute([$data, $expire, $id]);
 
-		if ($session_read) {
-		 	$query = "UPDATE ttrss_sessions SET data='$data',
-					expire='$expire' WHERE id='$id'";
-		} else {
-		 	$query = "INSERT INTO ttrss_sessions (id, data, expire)
-					VALUES ('$id', '$data', '$expire')";
-		}
-
-		db_query($session_connection, $query);
 		return true;
 	}
 
 	function ttrss_close () {
-
-		global $session_connection;
-
-		//db_close($session_connection);
-
 		return true;
 	}
 
-	function ttrss_destroy ($id) {
-
-		global $session_connection;
-
-		$query = "DELETE FROM ttrss_sessions WHERE id = '$id'";
-
-		db_query($session_connection, $query);
+	function ttrss_destroy($id) {
+		$sth = Db::pdo()->prepare("DELETE FROM ttrss_sessions WHERE id = ?");
+		$sth->execute([$id]);
 
 		return true;
 	}
 
+	/**
+	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+	 */
 	function ttrss_gc ($expire) {
+		Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
 
-		global $session_connection;
-
-		$query = "DELETE FROM ttrss_sessions WHERE expire < " . time();
-
-		db_query($session_connection, $query);
+		return true;
 	}
 
 	if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) {
 		session_set_save_handler("ttrss_open",
 			"ttrss_close", "ttrss_read", "ttrss_write",
 			"ttrss_destroy", "ttrss_gc");
+		register_shutdown_function('session_write_close');
 	}
 
-	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, '/');
-			}
 		}
 	}
-?>