X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_notify.php;h=b911a27e219d9f9fe22cff16eeff4c8e28cf9f4c;hb=c4038e7af15442d8bca8c7d7818ffbb9b02a0521;hp=7eddd4f3d576e05b59b787a2fb4eb05321b14176;hpb=da40c96e9a059e1f41ff62bdf7107c9dbfca6dbe;p=friendica.git
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 7eddd4f3d5..b911a27e21 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -8,16 +8,16 @@
use Friendica\App;
use Friendica\Core\Config;
+use Friendica\Core\Logger;
use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
-
-require_once 'include/items.php';
+use Friendica\Util\Strings;
function dfrn_notify_post(App $a) {
- logger(__function__, LOGGER_TRACE);
+ Logger::log(__function__, Logger::TRACE);
$postdata = file_get_contents('php://input');
@@ -25,57 +25,28 @@ function dfrn_notify_post(App $a) {
$data = json_decode($postdata);
if (is_object($data)) {
$nick = defaults($a->argv, 1, '');
- $user = dba::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
- if (!DBM::is_result($user)) {
- System::httpExit(500);
- }
- $msg = Diaspora::decodeRaw($user, $postdata);
-
- // Check if the user has got this contact
- $cid = Contact::getIdForURL($msg['author'], $user['uid']);
- if (!$cid) {
- // Otherwise there should be a public contact
- $cid = Contact::getIdForURL($msg['author']);
- if (!$cid) {
- logger('Contact not found for address ' . $msg['author']);
- System::xmlExit(3, 'Contact 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);
- // This should never fail
- if (!DBM::is_result($importer)) {
- logger('Contact not found for address ' . $msg['author']);
- System::xmlExit(3, 'Contact not found');
+ $user = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
+ if (!DBA::isResult($user)) {
+ System::httpExit(500);
}
-
- // Set the user id. This is important if this is a public contact
- $importer['importer_uid'] = $user['uid'];
-
- // Now we should be able to import it
- $ret = DFRN::import($msg['message'], $importer);
- System::xmlExit($ret, 'Done');
- } else {
+ dfrn_dispatch_private($user, $postdata);
+ } elseif (!dfrn_dispatch_public($postdata)) {
require_once 'mod/salmon.php';
salmon_post($a, $postdata);
}
}
- $dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
- $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
- $challenge = ((x($_POST,'challenge')) ? notags(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');
- $page = ((x($_POST,'page')) ? intval($_POST['page']) : 0);
+ $dfrn_id = (!empty($_POST['dfrn_id']) ? Strings::escapeTags(trim($_POST['dfrn_id'])) : '');
+ $dfrn_version = (!empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0);
+ $challenge = (!empty($_POST['challenge']) ? Strings::escapeTags(trim($_POST['challenge'])) : '');
+ $data = defaults($_POST, 'data', '');
+ $key = defaults($_POST, 'key', '');
+ $rino_remote = (!empty($_POST['rino']) ? intval($_POST['rino']) : 0);
+ $dissolve = (!empty($_POST['dissolve']) ? intval($_POST['dissolve']) : 0);
+ $perm = (!empty($_POST['perm']) ? Strings::escapeTags(trim($_POST['perm'])) : 'r');
+ $ssl_policy = (!empty($_POST['ssl_policy']) ? Strings::escapeTags(trim($_POST['ssl_policy'])): 'none');
+ $page = (!empty($_POST['page']) ? intval($_POST['page']) : 0);
$forum = (($page == 1) ? 1 : 0);
$prv = (($page == 2) ? 1 : 0);
@@ -91,77 +62,50 @@ function dfrn_notify_post(App $a) {
$dfrn_id = substr($dfrn_id, 2);
}
- $r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
- dbesc($dfrn_id),
- dbesc($challenge)
- );
- if (! DBM::is_result($r)) {
- logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
+ if (!DBA::exists('challenge', ['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');
}
- $r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s'",
- dbesc($dfrn_id),
- dbesc($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('dfrn_notify: 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];
-
- logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DEBUG);
+ $importer = DFRN::getImporter($contact['id'], $user['uid']);
if ((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) {
- q("UPDATE `contact` SET `writable` = %d, forum = %d, prv = %d WHERE `id` = %d",
- intval(($writable == (-1)) ? $importer['writable'] : $writable),
- intval($forum),
- intval($prv),
- intval($importer['id'])
- );
+ $fields = ['writable' => ($writable == (-1)) ? $importer['writable'] : $writable,
+ 'forum' => $forum, 'prv' => $prv];
+ DBA::update('contact', $fields, ['id' => $importer['id']]);
+
if ($writable != (-1)) {
$importer['writable'] = $writable;
}
@@ -173,49 +117,47 @@ function dfrn_notify_post(App $a) {
$importer = Contact::updateSslPolicy($importer, $ssl_policy);
- logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
- logger('dfrn_notify: 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');
}
$rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino);
- logger("Local rino version: " . $rino, LOGGER_DEBUG);
-
if (strlen($key)) {
// 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::log('rino: md5 raw key: ' . md5($rawkey), Logger::DATA);
+
$final_key = '';
if ($dfrn_version >= 2.1) {
- if ((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
+ if (($importer['duplex'] && strlen($importer['cprvkey'])) || !strlen($importer['cpubkey'])) {
openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
} else {
openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']);
}
} else {
- if ((($importer['duplex']) && strlen($importer['cpubkey'])) || (! strlen($importer['cprvkey']))) {
+ if (($importer['duplex'] && strlen($importer['cpubkey'])) || !strlen($importer['cprvkey'])) {
openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']);
} else {
openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
}
}
- switch($rino_remote) {
+ switch ($rino_remote) {
case 0:
case 1:
// we got a key. old code send only the key, without RINO version.
@@ -223,100 +165,168 @@ 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::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');
// NOTREACHED
}
+function dfrn_dispatch_public($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;
+ }
+
+ // Fetch the corresponding public contact
+ $contact = Contact::getDetailsByAddr($msg['author'], 0);
+ if (!$contact) {
+ Logger::log('Contact not found for address ' . $msg['author']);
+ System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
+ }
+
+ $importer = DFRN::getImporter($contact['id']);
+
+ // This should never fail
+ if (empty($importer)) {
+ Logger::log('Contact not found for address ' . $msg['author']);
+ System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
+ }
+
+ 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);
+ System::xmlExit($ret, 'Done');
+}
+
+function dfrn_dispatch_private($user, $postdata)
+{
+ $msg = Diaspora::decodeRaw($user, $postdata);
+ if (!$msg) {
+ System::xmlExit(4, 'Unable to parse message');
+ }
+
+ // Check if the user has got this contact
+ $cid = Contact::getIdForURL($msg['author'], $user['uid']);
+ if (!$cid) {
+ // Otherwise there should be a public contact
+ $cid = Contact::getIdForURL($msg['author']);
+ if (!$cid) {
+ Logger::log('Contact not found for address ' . $msg['author']);
+ System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
+ }
+ }
+
+ $importer = DFRN::getImporter($cid, $user['uid']);
+
+ // This should never fail
+ if (empty($importer)) {
+ Logger::log('Contact not found for address ' . $msg['author']);
+ System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
+ }
+
+ 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);
+ System::xmlExit($ret, 'Done');
+}
function dfrn_notify_content(App $a) {
- if(x($_GET,'dfrn_id')) {
+ if (!empty($_GET['dfrn_id'])) {
/*
* initial communication from external contact, $direction is their direction.
* 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);
+ $rino_remote = (!empty($_GET['rino']) ? intval($_GET['rino']) : 0);
$type = "";
$last_update = "";
- logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id);
+ Logger::log('new notification dfrn_id=' . $dfrn_id);
$direction = (-1);
- if(strpos($dfrn_id,':') == 1) {
+ if (strpos($dfrn_id,':') == 1) {
$direction = intval(substr($dfrn_id,0,1));
$dfrn_id = substr($dfrn_id,2);
}
- $hash = random_string();
+ $hash = Strings::getRandomHex();
$status = 0;
- $r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time()));
+ DBA::delete('challenge', ["`expire` < ?", time()]);
- $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
- VALUES( '%s', '%s', %d, '%s', '%s' ) ",
- dbesc($hash),
- dbesc($dfrn_id),
- intval(time() + 90 ),
- dbesc($type),
- dbesc($last_update)
- );
+ $fields = ['challenge' => $hash, 'dfrn-id' => $dfrn_id, 'expire' => time() + 90,
+ 'type' => $type, 'last_update' => $last_update];
+ DBA::insert('challenge', $fields);
- logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG);
+ Logger::log('challenge=' . $hash, Logger::DATA);
- $sql_extra = '';
- switch($direction) {
+ $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
+ if (!DBA::isResult($user)) {
+ Logger::log('User not found for nickname ' . $a->argv[1]);
+ killme();
+ }
+
+ $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)) {
- $status = 1;
+ // $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_DEBUG);
+ 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))))) {
+ if (($dplx && strlen($prv_key)) || (strlen($prv_key) && !strlen($pub_key))) {
openssl_private_encrypt($hash, $challenge, $prv_key);
openssl_private_encrypt($id_str, $encrypted_id, $prv_key);
} elseif (strlen($pub_key)) {
@@ -334,7 +344,7 @@ function dfrn_notify_content(App $a) {
$rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino);
- logger("Local rino version: ". $rino, LOGGER_DEBUG);
+ 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
@@ -342,7 +352,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';
@@ -358,9 +368,8 @@ function dfrn_notify_content(App $a) {
. "\t" . '' . $perm . '' . "\r\n"
. "\t" . '' . $encrypted_id . '' . "\r\n"
. "\t" . '' . $challenge . '' . "\r\n"
- . '' . "\r\n" ;
+ . '' . "\r\n";
killme();
}
-
}