X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=90d3fb2b5d8a5917563f2309b3c3d25babb8a60f;hb=a0f65ca7a1b1fbc1a2d0f823940211377fc6e13e;hp=726f8335db4f76336cf405af2be653f4f530cfa2;hpb=4f2ae8868431952bd3acda1537ee899740cbf205;p=friendica.git diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 726f8335db..90d3fb2b5d 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -8,17 +8,18 @@ use Friendica\App; use Friendica\Core\Config; +use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Database\DBA; -use Friendica\Database\DBM; 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'); @@ -28,7 +29,7 @@ function dfrn_notify_post(App $a) { $nick = defaults($a->argv, 1, ''); $user = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]); - if (!DBM::is_result($user)) { + if (!DBA::isResult($user)) { System::httpExit(500); } dfrn_dispatch_private($user, $postdata); @@ -38,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::removeTags(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::removeTags(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::removeTags(trim($_POST['perm'])) : 'r'); + $ssl_policy = ((x($_POST,'ssl_policy')) ? Strings::removeTags(trim($_POST['ssl_policy'])): 'none'); $page = ((x($_POST,'page')) ? intval($_POST['page']) : 0); $forum = (($page == 1) ? 1 : 0); @@ -64,59 +65,43 @@ 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'); } DBA::delete('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge]); - // find the local user who owns this relationship. + $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]); + if (!DBA::isResult($user)) { + Logger::log('User not found for nickname ' . $a->argv[1]); + System::xmlExit(3, 'User not found'); + } - $sql_extra = ''; + // find the local user who owns this relationship. + $condition = []; switch ($direction) { case (-1): - $sql_extra = sprintf(" AND ( `issued-id` = '%s' OR `dfrn-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id)); + $condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']]; break; case 0: - $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']]; break; case 1: - $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']]; break; default: System::xmlExit(3, 'Invalid direction'); break; // NOTREACHED } - /* - * be careful - $importer will contain both the contact information for the contact - * sending us the post, and also the user information for the person receiving it. - * since they are mixed together, it is easy to get them confused. - */ - - $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, - `contact`.`pubkey` AS `cpubkey`, - `contact`.`prvkey` AS `cprvkey`, - `contact`.`thumb` AS `thumb`, - `contact`.`url` as `url`, - `contact`.`name` as `senderName`, - `user`.* - FROM `contact` - LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` - WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `user`.`nickname` = '%s' AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $sql_extra LIMIT 1", - dbesc($a->argv[1]) - ); - - if (!DBM::is_result($r)) { - logger('contact not found for dfrn_id ' . $dfrn_id); + $contact = DBA::selectFirst('contact', ['id'], $condition); + if (!DBA::isResult($contact)) { + Logger::log('contact not found for dfrn_id ' . $dfrn_id); System::xmlExit(3, 'Contact not found'); - //NOTREACHED } // $importer in this case contains the contact record for the remote contact joined with the user record of our user. - - $importer = $r[0]; + $importer = DFRN::getImporter($contact['id'], $user['uid']); if ((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) { $fields = ['writable' => ($writable == (-1)) ? $importer['writable'] : $writable, @@ -134,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'); } @@ -151,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 = ''; @@ -182,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'); @@ -199,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; @@ -208,25 +193,19 @@ 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'); } - // We now have some contact, so we fetch it - $importer = DBA::fetch_first("SELECT *, `name` as `senderName` - FROM `contact` - WHERE NOT `blocked` AND `id` = ? LIMIT 1", - $contact['id']); - - $importer['importer_uid'] = 0; + $importer = DFRN::getImporter($contact['id']); // This should never fail - if (!DBM::is_result($importer)) { - logger('Contact not found for address ' . $msg['author']); + if (empty($importer)) { + 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); @@ -246,29 +225,20 @@ 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'); } } - // We now have some contact, so we fetch it - $importer = DBA::fetch_first("SELECT *, `name` as `senderName` - FROM `contact` - WHERE NOT `blocked` AND `id` = ? LIMIT 1", - $cid); + $importer = DFRN::getImporter($cid, $user['uid']); // This should never fail - if (!DBM::is_result($importer)) { - logger('Contact not found for address ' . $msg['author']); + if (empty($importer)) { + Logger::log('Contact not found for address ' . $msg['author']); System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found'); } - // Set the user id. This is important if this is a public contact - $importer['importer_uid'] = $user['uid']; - - $importer = array_merge($importer, $user); - - 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); @@ -284,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::removeTags(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) { @@ -298,7 +268,7 @@ function dfrn_notify_content(App $a) { $dfrn_id = substr($dfrn_id,2); } - $hash = random_string(); + $hash = Strings::getRandomHex(); $status = 0; @@ -308,47 +278,55 @@ 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::log('User not found for nickname ' . $a->argv[1]); + killme(); + } - $sql_extra = ''; - switch($direction) { + $condition = []; + switch ($direction) { case (-1): - $sql_extra = sprintf(" AND (`issued-id` = '%s' OR `dfrn-id` = '%s') ", dbesc($dfrn_id), dbesc($dfrn_id)); + $condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']]; $my_id = $dfrn_id; break; case 0: - $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']]; $my_id = '1:' . $dfrn_id; break; case 1: - $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); + $condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']]; $my_id = '0:' . $dfrn_id; break; default: $status = 1; - break; // NOTREACHED + break; } - $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` - WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s' - AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $sql_extra LIMIT 1", - dbesc($a->argv[1]) - ); + $contact = DBA::selectFirst('contact', ['id'], $condition); + if (!DBA::isResult($contact)) { + Logger::log('contact not found for dfrn_id ' . $dfrn_id); + System::xmlExit(3, 'Contact not found'); + } - if (!DBM::is_result($r)) { - logger('No user data found for ' . $a->argv[1] . ' - SQL: ' . $sql_extra); + // $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::log('No importer data found for user ' . $a->argv[1] . ' and contact ' . $dfrn_id); killme(); } - logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DATA); + Logger::log("Remote rino version: ".$rino_remote." for ".$importer["url"], Logger::DATA); $challenge = ''; $encrypted_id = ''; $id_str = $my_id . '.' . mt_rand(1000,9999); - $prv_key = trim($r[0]['prvkey']); - $pub_key = trim($r[0]['pubkey']); - $dplx = intval($r[0]['duplex']); + $prv_key = trim($importer['cprvkey']); + $pub_key = trim($importer['cpubkey']); + $dplx = intval($importer['duplex']); if (($dplx && strlen($prv_key)) || (strlen($prv_key) && !strlen($pub_key))) { openssl_private_encrypt($hash, $challenge, $prv_key); @@ -368,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 @@ -376,7 +354,7 @@ function dfrn_notify_content(App $a) { $rino = $rino_remote; } - if (($r[0]['rel'] && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) { + if (($importer['rel'] && ($importer['rel'] != Contact::SHARING)) || ($importer['page-flags'] == Contact::PAGE_COMMUNITY)) { $perm = 'rw'; } else { $perm = 'r';