X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=eebaa076d94b9bc0ece344ee5e09ae9478f8ee37;hb=b92fc24ff06681f445edff0d45f8f81a7e25ebe6;hp=2aa654534621dbb186a5dd6b61db1068397ae212;hpb=030784ad3598902b44a5e42f25e6d3bac4bd1bcb;p=friendica.git diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 2aa6545346..74f6d4e9f4 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -1,17 +1,28 @@ = 2.21) { + if ($dfrn_version >= 2.21) { $writable = (($perm === 'rw') ? 1 : 0); } $direction = (-1); - if(strpos($dfrn_id,':') == 1) { - $direction = intval(substr($dfrn_id,0,1)); - $dfrn_id = substr($dfrn_id,2); + if (strpos($dfrn_id, ':') == 1) { + $direction = intval(substr($dfrn_id, 0, 1)); + $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(! count($r)) { + if (! DBM::is_result($r)) { logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge); - xml_status(3); + xml_status(3, 'Could not match challenge'); } $r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s'", @@ -48,7 +59,7 @@ function dfrn_notify_post(&$a) { // find the local user who owns this relationship. $sql_extra = ''; - switch($direction) { + switch ($direction) { case (-1): $sql_extra = sprintf(" AND ( `issued-id` = '%s' OR `dfrn-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id)); break; @@ -59,13 +70,15 @@ function dfrn_notify_post(&$a) { $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id)); break; default: - xml_status(3); + xml_status(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. + /* + * 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`, @@ -81,9 +94,9 @@ function dfrn_notify_post(&$a) { dbesc($a->argv[1]) ); - if(! count($r)) { + if (! DBM::is_result($r)) { logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id); - xml_status(3); + xml_status(3, 'Contact not found'); //NOTREACHED } @@ -91,15 +104,18 @@ function dfrn_notify_post(&$a) { $importer = $r[0]; - if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) { + 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']) ); - if($writable != (-1)) + if ($writable != (-1)) { $importer['writable'] = $writable; + } $importer['forum'] = $page; } @@ -111,70 +127,110 @@ function dfrn_notify_post(&$a) { logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']); logger('dfrn_notify: data: ' . $data, LOGGER_DATA); - if($dissolve == 1) { + if ($dissolve == 1) { - /** + /* * Relationship is dissolved permanently */ require_once('include/Contact.php'); contact_remove($importer['id']); logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']); - xml_status(0); - + xml_status(0, 'relationship dissolved'); } + $rino = Config::get('system', 'rino_encrypt'); + $rino = intval($rino); - // If we are setup as a soapbox we aren't accepting input from this person + logger("Local rino version: " . $rino, LOGGER_DEBUG); - if($importer['page-flags'] == PAGE_SOAPBOX) - xml_status(0); + 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_version > 1 && $rino < $rino_remote) { + logger("rino version '$rino_remote' is lower than supported '$rino'"); + xml_status(0, "rino version '$rino_remote' is lower than supported '$rino'"); + } - if(strlen($key)) { $rawkey = hex2bin(trim($key)); logger('rino: md5 raw key: ' . md5($rawkey)); $final_key = ''; - if($dfrn_version >= 2.1) { - if((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) { - openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']); + if ($dfrn_version >= 2.1) { + 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 { - openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']); + } else { + 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']); } } - else { - 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']); - } + + #logger('rino: received key : ' . $final_key); + + switch($rino_remote) { + case 0: + case 1: + /* + *we got a key. old code send only the key, without RINO version. + * we assume RINO 1 if key and no RINO version + */ + $data = DFRN::aes_decrypt(hex2bin($data), $final_key); + break; + case 2: + try { + $data = \Crypto::decrypt(hex2bin($data), $final_key); + } catch (\InvalidCiphertextException $ex) { // VERY IMPORTANT + /* + * Either: + * 1. The ciphertext was modified by the attacker, + * 2. The key is wrong, or + * 3. $ciphertext is not a valid ciphertext or was corrupted. + * Assume the worst. + */ + logger('The ciphertext has been tampered with!'); + xml_status(0, 'The ciphertext has been tampered with!'); + } catch (\CryptoTestFailedException $ex) { + logger('Cannot safely perform dencryption'); + xml_status(0, 'CryptoTestFailed'); + } catch (\CannotPerformOperationException $ex) { + logger('Cannot safely perform decryption'); + xml_status(0, 'Cannot safely perform decryption'); + } + break; + default: + logger("rino: invalid sent version '$rino_remote'"); + xml_status(0, "Invalid sent version '$rino_remote'"); } - logger('rino: received key : ' . $final_key); - $data = aes_decrypt(hex2bin($data),$final_key); + logger('rino: decrypted data: ' . $data, LOGGER_DATA); } - - $ret = local_delivery($importer,$data); - xml_status($ret); + $ret = DFRN::import($data, $importer); + xml_status($ret, 'Processed'); // NOTREACHED } -function dfrn_notify_content(&$a) { +function dfrn_notify_content(App $a) { if(x($_GET,'dfrn_id')) { - // initial communication from external contact, $direction is their direction. - // If this is a duplex communication, ours will be the opposite. + /* + * 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_version = (float) $_GET['dfrn_version']; + $rino_remote = ((x($_GET,'rino')) ? intval($_GET['rino']) : 0); $type = ""; $last_update = ""; @@ -193,7 +249,7 @@ function dfrn_notify_content(&$a) { $r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time())); $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` ) - VALUES( '%s', '%s', %d ) ", + VALUES( '%s', '%s', %d, '%s', '%s' ) ", dbesc($hash), dbesc($dfrn_id), intval(time() + 90 ), @@ -201,7 +257,7 @@ function dfrn_notify_content(&$a) { dbesc($last_update) ); - logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG ); + logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG); $sql_extra = ''; switch($direction) { @@ -228,42 +284,49 @@ function dfrn_notify_content(&$a) { dbesc($a->argv[1]) ); - if(! count($r)) + if (! DBM::is_result($r)) { $status = 1; + } + + logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG); - $challenge = ''; + $challenge = ''; $encrypted_id = ''; - $id_str = $my_id . '.' . mt_rand(1000,9999); + $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']); - - 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)) { - openssl_public_encrypt($hash,$challenge,$pub_key); - openssl_public_encrypt($id_str,$encrypted_id,$pub_key); - } - else + $dplx = intval($r[0]['duplex']); + + 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)) { + openssl_public_encrypt($hash, $challenge, $pub_key); + openssl_public_encrypt($id_str, $encrypted_id, $pub_key); + } else { + /// @TODO these kind of else-blocks are making the code harder to understand $status = 1; + } $challenge = bin2hex($challenge); $encrypted_id = bin2hex($encrypted_id); - $rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0); - $rino_enable = get_config('system','rino_encrypt'); + $rino = Config::get('system', 'rino_encrypt'); + $rino = intval($rino); - if(! $rino_enable) - $rino = 0; + logger("Local rino version: ". $rino, LOGGER_DEBUG); + + // 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 + if ($rino_remote < $rino) { + $rino = $rino_remote; + } if((($r[0]['rel']) && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) { $perm = 'rw'; - } - else { + } else { $perm = 'r'; }