X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsecurity.php;h=ffab0e0953f8486fc89b427932e92b6cce2b0d32;hb=94f6f12ba3a5c1d506255803e709cb640147ebf4;hp=ac462d1df1171d21f9cb87302b451711fe90f0d1;hpb=635b26353cf263c6b5073d9bb4605b481b0e85ba;p=friendica.git

diff --git a/include/security.php b/include/security.php
index ac462d1df1..ffab0e0953 100644
--- a/include/security.php
+++ b/include/security.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 /**
  * @brief Calculate the hash that is needed for the "Friendica" cookie
@@ -50,8 +51,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	$_SESSION['mobile-theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme');
 	$_SESSION['authenticated'] = 1;
 	$_SESSION['page_flags'] = $user_record['page-flags'];
-	$_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $user_record['nickname'];
-	$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3);
+	$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname'];
+	$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3);
 	$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
 	$a->user = $user_record;
@@ -81,32 +82,30 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	$master_record = $a->user;
 
 	if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
-		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+		$r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1",
 			intval($_SESSION['submanage'])
 		);
 		if (dbm::is_result($r)) {
-			$master_record = $r[0];
+			$master_record = $r;
 		}
 	}
 
-	$r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0 ",
-		dbesc($master_record['password']),
-		dbesc($master_record['email'])
-	);
+	$r = dba::select('user', array('uid', 'username', 'nickname'),
+		array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false));
 	if (dbm::is_result($r)) {
-		$a->identities = $r;
+		$a->identities = dba::inArray($r);
 	} else {
 		$a->identities = array();
 	}
 
-	$r = q("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
+	$r = dba::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
 		FROM `manage`
 		INNER JOIN `user` ON `manage`.`mid` = `user`.`uid`
-		WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = %d",
-		intval($master_record['uid'])
+		WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?",
+		$master_record['uid']
 	);
 	if (dbm::is_result($r)) {
-		$a->identities = array_merge($a->identities,$r);
+		$a->identities = array_merge($a->identities, dba::inArray($r));
 	}
 
 	if ($login_initial) {
@@ -116,31 +115,21 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 		logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG);
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-		intval($_SESSION['uid']));
+	$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']);
 	if (dbm::is_result($r)) {
-		$a->contact = $r[0];
-		$a->cid = $r[0]['id'];
+		$a->contact = $r;
+		$a->cid = $r['id'];
 		$_SESSION['cid'] = $a->cid;
 	}
 
 	header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 
 	if ($login_initial || $login_refresh) {
-
-		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d",
-			dbesc(datetime_convert()),
-			intval($_SESSION['uid'])
-		);
+		dba::update('user', array('login_date' => datetime_convert()), array('uid' => $_SESSION['uid']));
 
 		// Set the login date for all identities of the user
-		q("UPDATE `user` SET `login_date` = '%s' WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0",
-			dbesc(datetime_convert()),
-			dbesc($master_record['password']),
-			dbesc($master_record['email'])
-		);
-
-
+		dba::update('user', array('login_date' => datetime_convert()),
+			array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false));
 	}
 
 	if ($login_initial) {
@@ -155,16 +144,13 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 		}
 	}
 
-
-
 	if ($login_initial) {
 		call_hooks('logged_in', $a->user);
 
 		if (($a->module !== 'home') && isset($_SESSION['return_url'])) {
-			goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
+			goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 		}
 	}
-
 }
 
 
@@ -235,7 +221,7 @@ function can_write_wall(App $a, $owner) {
 }
 
 
-function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
+function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
 
 	$local_user = local_user();
 	$remote_user = remote_user();
@@ -245,7 +231,6 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 	 *
 	 * default permissions - anonymous user
 	 */
-
 	$sql = " AND allow_cid = ''
 			 AND allow_gid = ''
 			 AND deny_cid  = ''
@@ -258,17 +243,14 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 
 	if (($local_user) && ($local_user == $owner_id)) {
 		$sql = '';
-	}
-
-	/**
-	 * Authenticated visitor. Unless pre-verified,
-	 * check that the contact belongs to this $owner_id
-	 * and load the groups the visitor belongs to.
-	 * If pre-verified, the caller is expected to have already
-	 * done this and passed the groups into this function.
-	 */
-
-	elseif ($remote_user) {
+	} elseif ($remote_user) {
+		/*
+		 * Authenticated visitor. Unless pre-verified,
+		 * check that the contact belongs to this $owner_id
+		 * and load the groups the visitor belongs to.
+		 * If pre-verified, the caller is expected to have already
+		 * done this and passed the groups into this function.
+		 */
 
 		if (! $remote_verified) {
 			$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
@@ -289,7 +271,9 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 					$gs .= '|<' . intval($g) . '>';
 			}
 
-			/*$sql = sprintf(
+			/*
+			 * @TODO old-lost code found?
+			$sql = sprintf(
 				" AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
 				  AND ( deny_cid  = '' OR  NOT deny_cid REGEXP '<%d>' )
 				  AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
@@ -299,7 +283,8 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 				intval($remote_user),
 				dbesc($gs),
 				dbesc($gs)
-			);*/
+			);
+			*/
 			$sql = sprintf(
 				" AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s')
 				  AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') )
@@ -316,7 +301,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
 }
 
 
-function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) {
+function item_permissions_sql($owner_id, $remote_verified = false, $groups = null) {
 
 	$local_user = local_user();
 	$remote_user = remote_user();
@@ -326,7 +311,6 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
 	 *
 	 * default permissions - anonymous user
 	 */
-
 	$sql = " AND `item`.allow_cid = ''
 			 AND `item`.allow_gid = ''
 			 AND `item`.deny_cid  = ''
@@ -337,21 +321,16 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
 	/**
 	 * Profile owner - everything is visible
 	 */
-
 	if ($local_user && ($local_user == $owner_id)) {
 		$sql = '';
-	}
-
-	/**
-	 * Authenticated visitor. Unless pre-verified,
-	 * check that the contact belongs to this $owner_id
-	 * and load the groups the visitor belongs to.
-	 * If pre-verified, the caller is expected to have already
-	 * done this and passed the groups into this function.
-	 */
-
-	elseif ($remote_user) {
-
+	} elseif ($remote_user) {
+		/*
+		 * Authenticated visitor. Unless pre-verified,
+		 * check that the contact belongs to this $owner_id
+		 * and load the groups the visitor belongs to.
+		 * If pre-verified, the caller is expected to have already
+		 * done this and passed the groups into this function.
+		 */
 		if (! $remote_verified) {
 			$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
 				intval($remote_user),
@@ -367,8 +346,9 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
 			$gs = '<<>>'; // should be impossible to match
 
 			if (is_array($groups) && count($groups)) {
-				foreach ($groups as $g)
+				foreach ($groups as $g) {
 					$gs .= '|<' . intval($g) . '>';
+				}
 			}
 
 			$sql = sprintf(
@@ -419,7 +399,11 @@ function get_form_security_token($typename = '') {
 }
 
 function check_form_security_token($typename = '', $formname = 'form_security_token') {
-	if (!x($_REQUEST, $formname)) return false;
+	if (!x($_REQUEST, $formname)) {
+		return false;
+	}
+
+	/// @TODO Careful, not secured!
 	$hash = $_REQUEST[$formname];
 
 	$max_livetime = 10800; // 3 hours
@@ -427,7 +411,9 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
 	$a = get_app();
 
 	$x = explode('.', $hash);
-	if (time() > (IntVal($x[0]) + $max_livetime)) return false;
+	if (time() > (IntVal($x[0]) + $max_livetime)) {
+		return false;
+	}
 
 	$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $x[0] . $typename);
 
@@ -443,12 +429,12 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
 		logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
 		logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
 		notice( check_form_security_std_err_msg() );
-		goaway(App::get_baseurl() . $err_redirect );
+		goaway(System::baseUrl() . $err_redirect );
 	}
 }
 function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
 	if (!check_form_security_token($typename, $formname)) {
-	    $a = get_app();
+		$a = get_app();
 		logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
 		logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
 		header('HTTP/1.1 403 Forbidden');