X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Fsessions.php;h=2d17bfd8e388363edef677662e8ac4db944649f2;hb=74736fce0f89efbaa971e6817303e8840c4aed8f;hp=12925a511641396b7d7762ffc85f56402b614702;hpb=3192fb43bc18263d000fa985c4a469630fe1da74;p=tt-rss.git

diff --git a/include/sessions.php b/include/sessions.php
index 12925a51..2d17bfd8 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -9,10 +9,10 @@
 	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") {
+	if (is_server_https()) {
 		$session_name .= "_ssl";
 		ini_set("session.cookie_secure", true);
 	}
@@ -23,12 +23,14 @@
 	ini_set("session.gc_maxlifetime", $session_expire);
 	ini_set("session.cookie_lifetime", min(0, SESSION_COOKIE_LIFETIME));
 
-	function session_get_schema_version($nocache = false) {
+	function session_get_schema_version() {
 		global $schema_version;
 
 		if (!$schema_version) {
-			$result = Db::get()->query("SELECT schema_version FROM ttrss_version");
-			$version = Db::get()->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 {
@@ -39,69 +41,57 @@
 	function validate_session() {
 		if (SINGLE_USER_MODE) return true;
 
-		//if (VERSION_STATIC != $_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(true)) {
+		if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
 			$_SESSION["login_error_msg"] =
 				__("Session failed to validate (schema version changed)");
 			return false;
 		}
-
-		/* if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"]) {
-			$_SESSION["login_error_msg"] =
-				__("Session failed to validate (user agent changed)");
-			return false;
-		} */
+        $pdo = Db::pdo();
 
 		if ($_SESSION["uid"]) {
-			$result = Db::get()->query(
-				"SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");
+
+			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["user_agent"] != sha1($_SERVER['HTTP_USER_AGENT'])) {
+				$_SESSION["login_error_msg"] = __("Session failed to validate.");
+				return false;
+			}
+
+			$sth = $pdo->prepare("SELECT pwd_hash FROM ttrss_users WHERE id = ?");
+			$sth->execute([$_SESSION['uid']]);
 
 			// user not found
-			if (Db::get()->num_rows($result) == 0) {
+			if ($row = $sth->fetch()) {
+                $pwd_hash = $row["pwd_hash"];
 
-				$_SESSION["login_error_msg"] =
-					__("Session failed to validate (user not found)");
+                if ($pwd_hash != $_SESSION["pwd_hash"]) {
 
-				return false;
+                    $_SESSION["login_error_msg"] =
+                        __("Session failed to validate (password changed)");
+
+                    return false;
+                }
 			} else {
-				$pwd_hash = Db::get()->fetch_result($result, 0, "pwd_hash");
 
-				if ($pwd_hash != $_SESSION["pwd_hash"]) {
+                $_SESSION["login_error_msg"] =
+                    __("Session failed to validate (user not found)");
 
-					$_SESSION["login_error_msg"] =
-						__("Session failed to validate (password changed)");
+                return false;
 
-					return false;
-				}
 			}
 		}
 
 		return true;
 	}
 
-
+	/**
+	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+	 */
 	function ttrss_open ($s, $n) {
 		return true;
 	}
@@ -109,18 +99,21 @@
 	function ttrss_read ($id){
 		global $session_expire;
 
-		$res = Db::get()->query("SELECT data FROM ttrss_sessions WHERE id='$id'");
+		$sth = Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?");
+		$sth->execute([$id]);
+
+		if ($row = $sth->fetch()) {
+            return base64_decode($row["data"]);
 
-		if (Db::get()->num_rows($res) != 1) {
+		} else {
+            $expire = time() + $session_expire;
 
-			$expire = time() + $session_expire;
+            $sth = Db::pdo()->prepare("INSERT INTO ttrss_sessions (id, data, expire)
+					VALUES (?, '', ?)");
+            $sth->execute([$id, $expire]);
 
-			Db::get()->query("INSERT INTO ttrss_sessions (id, data, expire)
-					VALUES ('$id', '', '$expire')");
+            return "";
 
-		 	return "";
-		} else {
-			return base64_decode(Db::get()->fetch_result($res, 0, "data"));
 		}
 
 	}
@@ -131,7 +124,8 @@
 		$data = base64_encode($data);
 		$expire = time() + $session_expire;
 
-		Db::get()->query("UPDATE ttrss_sessions SET data='$data', expire='$expire' WHERE id='$id'");
+        $sth = Db::pdo()->prepare("UPDATE ttrss_sessions SET data=?, expire=? WHERE id=?");
+        $sth->execute([$data, $expire, $id]);
 
 		return true;
 	}
@@ -141,13 +135,19 @@
 	}
 
 	function ttrss_destroy($id) {
-		Db::get()->query("DELETE FROM ttrss_sessions WHERE id = '$id'");
+		$sth = Db::pdo()->prepare("DELETE FROM ttrss_sessions WHERE id = ?");
+		$sth->execute([$id]);
 
 		return true;
 	}
 
+	/**
+	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+	 */
 	function ttrss_gc ($expire) {
-		Db::get()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
+		Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
+
+		return true;
 	}
 
 	if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) {
@@ -160,6 +160,9 @@
 	if (!defined('NO_SESSION_AUTOSTART')) {
 		if (isset($_COOKIE[session_name()])) {
 			@session_start();
+
+			if (!$_SESSION['uid']) {
+				logout_user();
+			}
 		}
 	}
-?>