X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Fsessions.php;h=f6e8bfe615067595371724671c7b42bd08a5a8ad;hb=404e2e3603c852a3f82a21c14b8888005e2b3f99;hp=a83daea82489d77ba561f4f4e2b37513eb56bd48;hpb=5160620c8a3c940688f60cc32abb2387a87139dd;p=tt-rss.git

diff --git a/include/sessions.php b/include/sessions.php
index a83daea8..f6e8bfe6 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -2,9 +2,14 @@
 	// Original from http://www.daniweb.com/code/snippet43.html
 
 	require_once "config.php";
-	require_once "db.php";
-
-	$session_expire = SESSION_EXPIRE_TIME; //seconds
+	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_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
 
 	if (@$_SERVER['HTTPS'] == "on") {
@@ -12,100 +17,134 @@
 		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) {
+	function session_get_schema_version($nocache = false) {
+		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");
+			$schema_version = $version;
+			return $version;
+		} else {
+			return $schema_version;
+		}
+	}
+
+	function validate_session($link) {
+		if (SINGLE_USER_MODE) return true;
+
+		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(true))
+			return false;
+
+		if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"])
+			return false;
+
+		if ($_SESSION["uid"]) {
+			$result = Db::get()->query(
+				"SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");
+
+			// user not found
+			if (Db::get()->num_rows($result) == 0) {
+				return false;
+			} else {
+				$pwd_hash = Db::get()->fetch_result($result, 0, "pwd_hash");
 
-		global $session_connection;
+				if ($pwd_hash != $_SESSION["pwd_hash"]) {
+					return false;
+				}
+			}
+		}
 
-		$session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+		return true;
+	}
 
+
+	function ttrss_open ($s, $n) {
 		return true;
 	}
 
 	function ttrss_read ($id){
+		global $session_expire;
 
-		global $session_connection,$session_read;
+		$res = Db::get()->query("SELECT data FROM ttrss_sessions WHERE id='$id'");
 
-		$query = "SELECT data FROM ttrss_sessions WHERE id='$id'";
+		if (Db::get()->num_rows($res) != 1) {
 
-		$res = db_query($session_connection, $query);
+			$expire = time() + $session_expire;
+
+			Db::get()->query("INSERT INTO ttrss_sessions (id, data, expire)
+					VALUES ('$id', '', '$expire')");
 
-		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"];
+			return base64_decode(Db::get()->fetch_result($res, 0, "data"));
 		}
+
 	}
 
 	function ttrss_write ($id, $data) {
+		global $session_expire;
 
-		if (! $data) {
-			return false;
-		}
-
-		global $session_connection, $session_read, $session_expire;
-
+		$data = base64_encode($data);
 		$expire = time() + $session_expire;
 
-		$data = db_escape_string($session_connection, base64_encode($data), false);
+		Db::get()->query("UPDATE ttrss_sessions SET data='$data', expire='$expire' WHERE id='$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) {
+		Db::get()->query("DELETE FROM ttrss_sessions WHERE id = '$id'");
 
 		return true;
 	}
 
 	function ttrss_gc ($expire) {
-
-		global $session_connection;
-
-		$query = "DELETE FROM ttrss_sessions WHERE expire < " . time();
-
-		db_query($session_connection, $query);
+		Db::get()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
 	}
 
 	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');
 	}
 
-	session_set_cookie_params(SESSION_COOKIE_LIFETIME);
-
-	if (!defined('TTRSS_SESSION_NAME') || TTRSS_SESSION_NAME != 'ttrss_api_sid') {
-		if ($_COOKIE[$session_name]) {
+	if (!defined('NO_SESSION_AUTOSTART')) {
+		if (isset($_COOKIE[session_name()])) {
 			@session_start();
 		}
 	}