X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=f220e1685b649878459a64e459414c6ab5f3b31d;hb=a492a13aeb53891d4f0b8601f66720531b92af45;hp=d1917b8b30903138f18a8cd17203588c8c8f1361;hpb=e2f8673076165c402782332b42ee744b1ffc7969;p=friendica.git

diff --git a/include/auth.php b/include/auth.php
index d1917b8b30..f220e1685b 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,4 +1,9 @@
 <?php
+
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Core\Config;
+
 require_once('include/security.php');
 require_once('include/datetime.php');
 
@@ -15,14 +20,17 @@ if (isset($_COOKIE["Friendica"])) {
 			if ($data->hash != cookie_hash($r[0])) {
 				logger("Hash for user ".$data->uid." doesn't fit.");
 				nuke_session();
-				goaway(z_root());
+				goaway(System::baseUrl());
 			}
 
 			// Renew the cookie
-			new_cookie(604800, $r[0]);
+			// Expires after 7 days by default,
+			// can be set via system.auth_cookie_lifetime
+			$authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7);
+			new_cookie($authcookiedays*24*60*60, $r[0]);
 
 			// Do the authentification if not done by now
-			if (!isset($_SESSION) OR !isset($_SESSION['authenticated'])) {
+			if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
 				authenticate_success($r[0]);
 
 				if (get_config('system','paranoia'))
@@ -43,14 +51,14 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 		call_hooks("logging_out");
 		nuke_session();
 		info(t('Logged out.').EOL);
-		goaway(z_root());
+		goaway(System::baseUrl());
 	}
 
 	if (x($_SESSION,'visitor_id') && !x($_SESSION,'uid')) {
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($_SESSION['visitor_id'])
 		);
-		if (count($r)) {
+		if (dbm::is_result($r)) {
 			$a->contact = $r[0];
 		}
 	}
@@ -65,7 +73,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 			logger('Session address changed. Paranoid setting in effect, blocking session. '.
 				$_SESSION['addr'].' != '.$_SERVER['REMOTE_ADDR']);
 			nuke_session();
-			goaway(z_root());
+			goaway(System::baseUrl());
 		}
 
 		$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
@@ -73,9 +81,9 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 			intval($_SESSION['uid'])
 		);
 
-		if (!count($r)) {
+		if (!dbm::is_result($r)) {
 			nuke_session();
-			goaway(z_root());
+			goaway(System::baseUrl());
 		}
 
 		// Make sure to refresh the last login time for the user if the user
@@ -114,7 +122,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 			if ($noid || strpos($temp_string,'@') || !validate_url($temp_string)) {
 				$a = get_app();
 				notice(t('Login failed.').EOL);
-				goaway(z_root());
+				goaway(System::baseUrl());
 				// NOTREACHED
 			}
 
@@ -125,8 +133,8 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 				$openid = new LightOpenID;
 				$openid->identity = $openid_url;
 				$_SESSION['openid'] = $openid_url;
-				$a = get_app();
-				$openid->returnUrl = $a->get_baseurl(true).'/openid';
+				$_SESSION['remember'] = $_POST['remember'];
+				$openid->returnUrl = System::baseUrl(true).'/openid';
 				goaway($openid->authUrl());
 			} catch (Exception $e) {
 				notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'.t('The error message was:').' '.$e->getMessage());
@@ -169,27 +177,22 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 				dbesc(trim($_POST['username'])),
 				dbesc($encrypted)
 			);
-			if (count($r))
+			if (dbm::is_result($r))
 				$record = $r[0];
 		}
 
 		if (!$record || !count($record)) {
 			logger('authenticate: failed login attempt: '.notags(trim($_POST['username'])).' from IP '.$_SERVER['REMOTE_ADDR']);
 			notice(t('Login failed.').EOL);
-			goaway(z_root());
+			goaway(System::baseUrl());
 		}
 
-		// If the user specified to remember the authentication, then set a cookie
-		// that expires after one week (the default is when the browser is closed).
-		// The cookie will be renewed automatically.
-		// The week ensures that sessions will expire after some inactivity.
-		if ($_POST['remember'])
-			new_cookie(604800, $r[0]);
-		else
+		if (! $_POST['remember']) {
 			new_cookie(0); // 0 means delete on browser exit
+		}
 
 		// if we haven't failed up this point, log them in.
-
+		$_SESSION['remember'] = $_POST['remember'];
 		$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
 		authenticate_success($record, true, true);
 	}
@@ -204,39 +207,3 @@ function nuke_session() {
 	session_unset();
 	session_destroy();
 }
-
-/**
- * @brief Calculate the hash that is needed for the "Friendica" cookie
- *
- * @param array $user Record from "user" table
- *
- * @return string Hashed data
- */
-function cookie_hash($user) {
-	return(hash("sha256", get_config("system", "site_prvkey").
-				$user["uprvkey"].
-				$user["password"]));
-}
-
-/**
- * @brief Set the "Friendica" cookie
- *
- * @param int $time
- * @param array $user Record from "user" table
- */
-function new_cookie($time, $user = array()) {
-
-	if ($time != 0)
-		$time = $time + time();
-
-	if ($user)
-		$value = json_encode(array("uid" => $user["uid"],
-					"hash" => cookie_hash($user),
-					"ip" => $_SERVER['REMOTE_ADDR']));
-	else
-		$value = "";
-
-	setcookie("Friendica", $value, $time, "/", "",
-		(get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true);
-
-}