X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=44e016599e486862c0d4493499ba10e331838e33;hb=7d0a7f6be9e6c281ddafdfed799bf8b46785424a;hp=a06df954dd9ebb8f877af0dd0e0bef55c7ac5c41;hpb=621a77b275168be670cf0a59f9f0dc7b43eb3e6d;p=friendica.git diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index a06df954dd..44e016599e 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -5,6 +5,9 @@ * @brief The dfrn notify endpoint * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf */ + +use Friendica\App; + require_once('include/items.php'); require_once('include/dfrn.php'); require_once('include/event.php'); @@ -33,9 +36,9 @@ function dfrn_notify_post(App $a) { } $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", @@ -70,9 +73,11 @@ function dfrn_notify_post(App $a) { 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`, @@ -107,8 +112,9 @@ function dfrn_notify_post(App $a) { intval($prv), intval($importer['id']) ); - if ($writable != (-1)) + if ($writable != (-1)) { $importer['writable'] = $writable; + } $importer['forum'] = $page; } @@ -133,21 +139,10 @@ function dfrn_notify_post(App $a) { } - - // If we are setup as a soapbox we aren't accepting input from this person - // This behaviour is deactivated since it really doesn't make sense to even disallow comments - // The check if someone is a friend or simply a follower is done in a later place so it needn't to be done here - //if ($importer['page-flags'] == PAGE_SOAPBOX) - // xml_status(0); - - $rino = get_config('system','rino_encrypt'); + $rino = get_config('system', 'rino_encrypt'); $rino = intval($rino); - // use RINO1 if mcrypt isn't installed and RINO2 was selected - if ($rino == 2 and !function_exists('mcrypt_create_iv')) { - $rino=1; - } - logger("Local rino version: ". $rino, LOGGER_DEBUG); + logger("Local rino version: " . $rino, LOGGER_DEBUG); if (strlen($key)) { @@ -164,18 +159,15 @@ function dfrn_notify_post(App $a) { 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']); + openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']); + } else { + openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']); } - } - else { + } 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']); + openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']); + } else { + openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']); } } @@ -184,27 +176,31 @@ function dfrn_notify_post(App $a) { 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 = aes_decrypt(hex2bin($data),$final_key); + /* + *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); + $data = Crypto::decrypt(hex2bin($data), $final_key); } catch (InvalidCiphertext $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. + /* + * 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!'); + xml_status(0, 'The ciphertext has been tampered with!'); } catch (Ex\CryptoTestFailed $ex) { logger('Cannot safely perform dencryption'); - xml_status(0,'CryptoTestFailed'); + xml_status(0, 'CryptoTestFailed'); } catch (Ex\CannotPerformOperation $ex) { logger('Cannot safely perform decryption'); - xml_status(0,'Cannot safely perform decryption'); + xml_status(0, 'Cannot safely perform decryption'); } break; default: @@ -225,10 +221,12 @@ function dfrn_notify_post(App $a) { 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. - // 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']; @@ -239,7 +237,7 @@ function dfrn_notify_content(App $a) { logger('dfrn_notify: 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); } @@ -292,21 +290,22 @@ function dfrn_notify_content(App $a) { 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']); + $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); + 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); + 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; } @@ -314,20 +313,18 @@ function dfrn_notify_content(App $a) { $encrypted_id = bin2hex($encrypted_id); - $rino = get_config('system','rino_encrypt'); + $rino = get_config('system', 'rino_encrypt'); $rino = intval($rino); - // use RINO1 if mcrypt isn't installed and RINO2 was selected - if ($rino == 2 and !function_exists('mcrypt_create_iv')) { - $rino=1; - } 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 ($rino_remote < $rino) { + $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';