X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=63f53e0606a104365412a440150d26607a13577f;hb=96a43d0db915fc2fc4d61de4ab649e951c352504;hp=f653faca9599ade707593cf0de2df6c287f193ff;hpb=d27cf0cb6041e90cb8465c198e25ad2320c616eb;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index f653faca95..63f53e0606 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -8,16 +8,18 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
+use Friendica\Util\Strings;
 
 require_once 'include/items.php';
 
 function dfrn_notify_post(App $a) {
-	logger(__function__, LOGGER_TRACE);
+	Logger::log(__function__, Logger::TRACE);
 
 	$postdata = file_get_contents('php://input');
 
@@ -37,15 +39,15 @@ function dfrn_notify_post(App $a) {
 		}
 	}
 
-	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? notags(trim($_POST['dfrn_id']))   : '');
+	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? Strings::escapeTags(trim($_POST['dfrn_id']))   : '');
 	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version']    : 2.0);
-	$challenge    = ((x($_POST,'challenge'))    ? notags(trim($_POST['challenge'])) : '');
+	$challenge    = ((x($_POST,'challenge'))    ? Strings::escapeTags(trim($_POST['challenge'])) : '');
 	$data         = ((x($_POST,'data'))         ? $_POST['data']                    : '');
 	$key          = ((x($_POST,'key'))          ? $_POST['key']                     : '');
 	$rino_remote  = ((x($_POST,'rino'))         ? intval($_POST['rino'])            :  0);
 	$dissolve     = ((x($_POST,'dissolve'))     ? intval($_POST['dissolve'])        :  0);
-	$perm         = ((x($_POST,'perm'))         ? notags(trim($_POST['perm']))      : 'r');
-	$ssl_policy   = ((x($_POST,'ssl_policy'))   ? notags(trim($_POST['ssl_policy'])): 'none');
+	$perm         = ((x($_POST,'perm'))         ? Strings::escapeTags(trim($_POST['perm']))      : 'r');
+	$ssl_policy   = ((x($_POST,'ssl_policy'))   ? Strings::escapeTags(trim($_POST['ssl_policy'])): 'none');
 	$page         = ((x($_POST,'page'))         ? intval($_POST['page'])            :  0);
 
 	$forum = (($page == 1) ? 1 : 0);
@@ -63,7 +65,7 @@ function dfrn_notify_post(App $a) {
 	}
 
 	if (!DBA::exists('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge])) {
-		logger('could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
+		Logger::log('could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
 		System::xmlExit(3, 'Could not match challenge');
 	}
 
@@ -71,7 +73,7 @@ function dfrn_notify_post(App $a) {
 
 	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
 	if (!DBA::isResult($user)) {
-		logger('User not found for nickname ' . $a->argv[1]);
+		Logger::log('User not found for nickname ' . $a->argv[1]);
 		System::xmlExit(3, 'User not found');
 	}
 
@@ -79,13 +81,13 @@ function dfrn_notify_post(App $a) {
 	$condition = [];
 	switch ($direction) {
 		case (-1):
-			$condition = ["`issued-id` = ? OR `dfrn-id` = ?", $dfrn_id, $dfrn_id];
+			$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
 			break;
 		case 0:
-			$condition = ['issued-id' => $dfrn_id, 'duplex' => true];
+			$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 			break;
 		case 1:
-			$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true];
+			$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 			break;
 		default:
 			System::xmlExit(3, 'Invalid direction');
@@ -94,7 +96,7 @@ function dfrn_notify_post(App $a) {
 
 	$contact = DBA::selectFirst('contact', ['id'], $condition);
 	if (!DBA::isResult($contact)) {
-		logger('contact not found for dfrn_id ' . $dfrn_id);
+		Logger::log('contact not found for dfrn_id ' . $dfrn_id);
 		System::xmlExit(3, 'Contact not found');
 	}
 
@@ -117,12 +119,12 @@ function dfrn_notify_post(App $a) {
 
 	$importer = Contact::updateSslPolicy($importer, $ssl_policy);
 
-	logger('data: ' . $data, LOGGER_DATA);
+	Logger::log('data: ' . $data, Logger::DATA);
 
 	if ($dissolve == 1) {
 		// Relationship is dissolved permanently
 		Contact::remove($importer['id']);
-		logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
+		Logger::log('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
 		System::xmlExit(0, 'relationship dissolved');
 	}
 
@@ -134,12 +136,12 @@ function dfrn_notify_post(App $a) {
 		// if local rino is lower than remote rino, abort: should not happen!
 		// but only for $remote_rino > 1, because old code did't send rino version
 		if ($rino_remote > 1 && $rino < $rino_remote) {
-			logger("rino version '$rino_remote' is lower than supported '$rino'");
+			Logger::log("rino version '$rino_remote' is lower than supported '$rino'");
 			System::xmlExit(0, "rino version '$rino_remote' is lower than supported '$rino'");
 		}
 
 		$rawkey = hex2bin(trim($key));
-		logger('rino: md5 raw key: ' . md5($rawkey), LOGGER_DATA);
+		Logger::log('rino: md5 raw key: ' . md5($rawkey), Logger::DATA);
 
 		$final_key = '';
 
@@ -165,14 +167,14 @@ function dfrn_notify_post(App $a) {
 				$data = DFRN::aesDecrypt(hex2bin($data), $final_key);
 				break;
 			default:
-				logger("rino: invalid sent version '$rino_remote'");
+				Logger::log("rino: invalid sent version '$rino_remote'");
 				System::xmlExit(0, "Invalid sent version '$rino_remote'");
 		}
 
-		logger('rino: decrypted data: ' . $data, LOGGER_DATA);
+		Logger::log('rino: decrypted data: ' . $data, Logger::DATA);
 	}
 
-	logger('Importing post from ' . $importer['addr'] . ' to ' . $importer['nickname'] . ' with the RINO ' . $rino_remote . ' encryption.', LOGGER_DEBUG);
+	Logger::log('Importing post from ' . $importer['addr'] . ' to ' . $importer['nickname'] . ' with the RINO ' . $rino_remote . ' encryption.', Logger::DEBUG);
 
 	$ret = DFRN::import($data, $importer);
 	System::xmlExit($ret, 'Processed');
@@ -182,7 +184,7 @@ function dfrn_notify_post(App $a) {
 
 function dfrn_dispatch_public($postdata)
 {
-	$msg = Diaspora::decodeRaw([], $postdata);
+	$msg = Diaspora::decodeRaw([], $postdata, true);
 	if (!$msg) {
 		// We have to fail silently to be able to hand it over to the salmon parser
 		return false;
@@ -191,7 +193,7 @@ function dfrn_dispatch_public($postdata)
 	// Fetch the corresponding public contact
 	$contact = Contact::getDetailsByAddr($msg['author'], 0);
 	if (!$contact) {
-		logger('Contact not found for address ' . $msg['author']);
+		Logger::log('Contact not found for address ' . $msg['author']);
 		System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 	}
 
@@ -199,11 +201,11 @@ function dfrn_dispatch_public($postdata)
 
 	// This should never fail
 	if (empty($importer)) {
-		logger('Contact not found for address ' . $msg['author']);
+		Logger::log('Contact not found for address ' . $msg['author']);
 		System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 	}
 
-	logger('Importing post from ' . $msg['author'] . ' with the public envelope.', LOGGER_DEBUG);
+	Logger::log('Importing post from ' . $msg['author'] . ' with the public envelope.', Logger::DEBUG);
 
 	// Now we should be able to import it
 	$ret = DFRN::import($msg['message'], $importer);
@@ -223,7 +225,7 @@ function dfrn_dispatch_private($user, $postdata)
 		// Otherwise there should be a public contact
 		$cid = Contact::getIdForURL($msg['author']);
 		if (!$cid) {
-			logger('Contact not found for address ' . $msg['author']);
+			Logger::log('Contact not found for address ' . $msg['author']);
 			System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 		}
 	}
@@ -232,11 +234,11 @@ function dfrn_dispatch_private($user, $postdata)
 
 	// This should never fail
 	if (empty($importer)) {
-		logger('Contact not found for address ' . $msg['author']);
+		Logger::log('Contact not found for address ' . $msg['author']);
 		System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 	}
 
-	logger('Importing post from ' . $msg['author'] . ' to ' . $user['nickname'] . ' with the private envelope.', LOGGER_DEBUG);
+	Logger::log('Importing post from ' . $msg['author'] . ' to ' . $user['nickname'] . ' with the private envelope.', Logger::DEBUG);
 
 	// Now we should be able to import it
 	$ret = DFRN::import($msg['message'], $importer);
@@ -252,13 +254,13 @@ function dfrn_notify_content(App $a) {
 		 * If this is a duplex communication, ours will be the opposite.
 		 */
 
-		$dfrn_id = notags(trim($_GET['dfrn_id']));
+		$dfrn_id = Strings::escapeTags(trim($_GET['dfrn_id']));
 		$dfrn_version = (float) $_GET['dfrn_version'];
 		$rino_remote = ((x($_GET,'rino')) ? intval($_GET['rino']) : 0);
 		$type = "";
 		$last_update = "";
 
-		logger('new notification dfrn_id=' . $dfrn_id);
+		Logger::log('new notification dfrn_id=' . $dfrn_id);
 
 		$direction = (-1);
 		if (strpos($dfrn_id,':') == 1) {
@@ -266,7 +268,7 @@ function dfrn_notify_content(App $a) {
 			$dfrn_id = substr($dfrn_id,2);
 		}
 
-		$hash = random_string();
+		$hash = Strings::getRandomHex();
 
 		$status = 0;
 
@@ -276,26 +278,26 @@ function dfrn_notify_content(App $a) {
 			'type' => $type, 'last_update' => $last_update];
 		DBA::insert('challenge', $fields);
 
-		logger('challenge=' . $hash, LOGGER_DATA);
+		Logger::log('challenge=' . $hash, Logger::DATA);
 
 		$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
 		if (!DBA::isResult($user)) {
-			logger('User not found for nickname ' . $a->argv[1]);
+			Logger::log('User not found for nickname ' . $a->argv[1]);
 			killme();
 		}
 
 		$condition = [];
 		switch ($direction) {
 			case (-1):
-				$condition = ["`issued-id` = ? OR `dfrn-id` = ?", $dfrn_id, $dfrn_id];
+				$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
 				$my_id = $dfrn_id;
 				break;
 			case 0:
-				$condition = ['issued-id' => $dfrn_id, 'duplex' => true];
+				$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 				$my_id = '1:' . $dfrn_id;
 				break;
 			case 1:
-				$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true];
+				$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 				$my_id = '0:' . $dfrn_id;
 				break;
 			default:
@@ -305,18 +307,18 @@ function dfrn_notify_content(App $a) {
 
 		$contact = DBA::selectFirst('contact', ['id'], $condition);
 		if (!DBA::isResult($contact)) {
-			logger('contact not found for dfrn_id ' . $dfrn_id);
+			Logger::log('contact not found for dfrn_id ' . $dfrn_id);
 			System::xmlExit(3, 'Contact not found');
 		}
 
 		// $importer in this case contains the contact record for the remote contact joined with the user record of our user.
 		$importer = DFRN::getImporter($contact['id'], $user['uid']);
 		if (empty($importer)) {
-			logger('No importer data found for user ' . $a->argv[1] . ' and contact ' . $dfrn_id);
+			Logger::log('No importer data found for user ' . $a->argv[1] . ' and contact ' . $dfrn_id);
 			killme();
 		}
 
-		logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DATA);
+		Logger::log("Remote rino version: ".$rino_remote." for ".$importer["url"], Logger::DATA);
 
 		$challenge    = '';
 		$encrypted_id = '';
@@ -344,7 +346,7 @@ function dfrn_notify_content(App $a) {
 		$rino = Config::get('system', 'rino_encrypt');
 		$rino = intval($rino);
 
-		logger("Local rino version: ". $rino, LOGGER_DATA);
+		Logger::log("Local rino version: ". $rino, Logger::DATA);
 
 		// if requested rino is lower than enabled local rino, lower local rino version
 		// if requested rino is higher than enabled local rino, reply with local rino