From e61ed380f7ba3129f1981b1500d8371921c9a5c6 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 21 Apr 2018 09:55:41 +0000 Subject: [PATCH 1/5] Reworked dfrn_notify endpoint, added public endpoint --- mod/dfrn_notify.php | 185 +++++++++++++++++++++++++------------------- 1 file changed, 106 insertions(+), 79 deletions(-) diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 7eddd4f3d5..9bd06c6748 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -25,41 +25,23 @@ 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); + $public = empty($nick); + if (!$public) { + $user = dba::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]); + if (!DBM::is_result($user)) { + System::httpExit(500); + } + } else { + // We don't need the user with public posts + $user = []; } $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'); - } + if ($public) { + dfrn_dispatch_public($msg); + } else { + dfrn_dispatch_private($user, $msg); } - - // 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'); - } - - // 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 { require_once 'mod/salmon.php'; salmon_post($a, $postdata); @@ -91,19 +73,12 @@ 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('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. @@ -143,8 +118,8 @@ function dfrn_notify_post(App $a) { dbesc($a->argv[1]) ); - if (! DBM::is_result($r)) { - logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id); + if (!DBM::is_result($r)) { + logger('contact not found for dfrn_id ' . $dfrn_id); System::xmlExit(3, 'Contact not found'); //NOTREACHED } @@ -153,15 +128,11 @@ function dfrn_notify_post(App $a) { $importer = $r[0]; - logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DEBUG); - 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,8 +144,7 @@ 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('data: ' . $data, LOGGER_DATA); if ($dissolve == 1) { // Relationship is dissolved permanently @@ -186,8 +156,6 @@ function dfrn_notify_post(App $a) { $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! @@ -198,24 +166,25 @@ function dfrn_notify_post(App $a) { } $rawkey = hex2bin(trim($key)); - logger('rino: md5 raw key: ' . md5($rawkey)); + logger('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. @@ -230,16 +199,80 @@ function dfrn_notify_post(App $a) { logger('rino: decrypted data: ' . $data, LOGGER_DATA); } + logger('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($msg) +{ + // Fetch the corresponding public contact + $contact = getDetailsByAddr($msg['author'], 0); + if (!$contact) { + 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'); + } + + logger('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, $msg) +{ + // 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'); + } + + // Set the user id. This is important if this is a public contact + $importer['importer_uid'] = $user['uid']; + + logger('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 (x($_GET,'dfrn_id')) { /* * initial communication from external contact, $direction is their direction. @@ -252,10 +285,10 @@ function dfrn_notify_content(App $a) { $type = ""; $last_update = ""; - logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id); + logger('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); } @@ -264,23 +297,18 @@ function dfrn_notify_content(App $a) { $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('challenge=' . $hash, LOGGER_DATA); $sql_extra = ''; switch($direction) { case (-1): - $sql_extra = sprintf(" AND ( `issued-id` = '%s' OR `dfrn-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id)); + $sql_extra = sprintf(" AND (`issued-id` = '%s' OR `dfrn-id` = '%s') ", dbesc($dfrn_id), dbesc($dfrn_id)); $my_id = $dfrn_id; break; case 0: @@ -302,11 +330,11 @@ function dfrn_notify_content(App $a) { dbesc($a->argv[1]) ); - if (! DBM::is_result($r)) { + if (!DBM::is_result($r)) { $status = 1; } - logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG); + logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DATA); $challenge = ''; $encrypted_id = ''; @@ -316,7 +344,7 @@ function dfrn_notify_content(App $a) { $pub_key = trim($r[0]['pubkey']); $dplx = intval($r[0]['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 +362,7 @@ function dfrn_notify_content(App $a) { $rino = Config::get('system', 'rino_encrypt'); $rino = intval($rino); - logger("Local rino version: ". $rino, LOGGER_DEBUG); + logger("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 +370,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 (($r[0]['rel'] && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) { $perm = 'rw'; } else { $perm = 'r'; @@ -362,5 +390,4 @@ function dfrn_notify_content(App $a) { killme(); } - } From c59b28a8c4e1af76a6b4ee3b8f8029e8d62b2a3a Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 22 Apr 2018 10:04:30 +0000 Subject: [PATCH 2/5] create public endpoint --- src/Protocol/DFRN.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index eb28228942..0263281968 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1415,7 +1415,16 @@ class DFRN $envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch); - $dest_url = ($public_batch ? $fcontact["batch"] : $contact["notify"]); + // Create the endpoint for public posts. This is some WIP and should later be added to the probing + if ($public_batch && empty($contact["batch"])) { + $parts = parse_url($contact["notify"]); + $path_parts = explode('/', $parts['path']); + array_pop($path_parts); + $parts['path'] = implode('/', $path_parts); + $contact["batch"] = Network::unparseURL($parts); + } + + $dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]); $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json"); From b77ae3a8a736aab2a6e31bf1dae9ba8d384b9552 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 22 Apr 2018 10:42:01 +0000 Subject: [PATCH 3/5] Public posts are now transferred successfully to the DFRN part --- mod/dfrn_notify.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 9bd06c6748..86e1484f79 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -25,24 +25,13 @@ function dfrn_notify_post(App $a) { $data = json_decode($postdata); if (is_object($data)) { $nick = defaults($a->argv, 1, ''); - $public = empty($nick); - if (!$public) { - $user = dba::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]); - if (!DBM::is_result($user)) { - System::httpExit(500); - } - } else { - // We don't need the user with public posts - $user = []; - } - $msg = Diaspora::decodeRaw($user, $postdata); - if ($public) { - dfrn_dispatch_public($msg); - } else { - dfrn_dispatch_private($user, $msg); + $user = dba::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]); + if (!DBM::is_result($user)) { + System::httpExit(500); } - } else { + dfrn_dispatch_private($user, $postdata); + } elseif (!dfrn_dispatch_public($postdata)) { require_once 'mod/salmon.php'; salmon_post($a, $postdata); } @@ -207,10 +196,16 @@ function dfrn_notify_post(App $a) { // NOTREACHED } -function dfrn_dispatch_public($msg) +function dfrn_dispatch_public($postdata) { + $msg = Diaspora::decodeRaw([], $postdata); + 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 = getDetailsByAddr($msg['author'], 0); + $contact = Contact::getDetailsByAddr($msg['author'], 0); if (!$contact) { logger('Contact not found for address ' . $msg['author']); System::xmlExit(3, 'Contact not found'); @@ -220,7 +215,7 @@ function dfrn_dispatch_public($msg) $importer = dba::fetch_first("SELECT *, `name` as `senderName` FROM `contact` WHERE NOT `blocked` AND `id` = ? LIMIT 1", - $cid); + $contact['id']); // This should never fail if (!DBM::is_result($importer)) { @@ -235,8 +230,13 @@ function dfrn_dispatch_public($msg) System::xmlExit($ret, 'Done'); } -function dfrn_dispatch_private($user, $msg) +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) { From 8f2db615385b640553e7ae72518e3a506fed6b0f Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 22 Apr 2018 10:58:03 +0000 Subject: [PATCH 4/5] Receiving of public posts is now working --- mod/dfrn_notify.php | 2 ++ src/Protocol/DFRN.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 86e1484f79..e2f0336db6 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -217,6 +217,8 @@ function dfrn_dispatch_public($postdata) WHERE NOT `blocked` AND `id` = ? LIMIT 1", $contact['id']); + $importer['importer_uid'] = 0; + // This should never fail if (!DBM::is_result($importer)) { logger('Contact not found for address ' . $msg['author']); diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 0263281968..bffcb2086f 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -2780,7 +2780,7 @@ class DFRN logger('ignoring read-only contact '.$importer["id"]); return; } - if ($importer["uid"] == 0) { + if (($importer["uid"] == 0) && ($importer["importer_uid"] != 0)) { logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG); return; } From 98c677f09f96fea6cc154c397ed3bbfaa06e8551 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 22 Apr 2018 11:33:32 +0000 Subject: [PATCH 5/5] Currently disabled --- mod/dfrn_notify.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index e2f0336db6..27e8ed63f8 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -198,6 +198,9 @@ function dfrn_notify_post(App $a) { function dfrn_dispatch_public($postdata) { + /// @todo Currently disabled, until there is a working item distribution for public posts + return false; + $msg = Diaspora::decodeRaw([], $postdata); if (!$msg) { // We have to fail silently to be able to hand it over to the salmon parser