Add Contact Object

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 84d589a217f732a38a33ac54a99a7ce324fea634..74f6d4e9f4164b2944cfaa3c2417051944024e31 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -5,11 +5,15 @@
  * @brief The dfrn notify endpoint
  * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
  */
-require_once('include/items.php');
-require_once('include/dfrn.php');
-require_once('include/event.php');
 
-require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+use Friendica\Protocol\DFRN;
+
+require_once 'include/items.php';
+require_once 'include/event.php';
 
 function dfrn_notify_post(App $a) {
        logger(__function__, LOGGER_TRACE);
@@ -42,9 +46,9 @@ function dfrn_notify_post(App $a) {
                dbesc($dfrn_id),
                dbesc($challenge)
        );
-       if (! dbm::is_result($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'",
@@ -55,7 +59,7 @@ function dfrn_notify_post(App $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;
@@ -66,7 +70,7 @@ function dfrn_notify_post(App $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
        }
 
@@ -90,9 +94,9 @@ function dfrn_notify_post(App $a) {
                dbesc($a->argv[1])
        );
 
-       if (! dbm::is_result($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
        }
 
@@ -132,16 +136,11 @@ function dfrn_notify_post(App $a) {
                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 = get_config('system', 'rino_encrypt');
+       $rino = Config::get('system', 'rino_encrypt');
        $rino = intval($rino);
-       // use RINO1 if mcrypt isn't installed and RINO2 was selected
-       if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
-               $rino = 1;
-       }
 
        logger("Local rino version: " .  $rino, LOGGER_DEBUG);
 
@@ -151,7 +150,7 @@ function dfrn_notify_post(App $a) {
                // 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'");
+                       xml_status(0, "rino version '$rino_remote' is lower than supported '$rino'");
                }
 
                $rawkey = hex2bin(trim($key));
@@ -160,15 +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']);
+                               openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
                        } else {
-                               openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
+                               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']);
+                               openssl_public_decrypt($rawkey, $final_key, $importer['cpubkey']);
                        } else {
-                               openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
+                               openssl_private_decrypt($rawkey, $final_key, $importer['cprvkey']);
                        }
                }
 
@@ -178,15 +177,15 @@ function dfrn_notify_post(App $a) {
                        case 0:
                        case 1:
                                /*
-                                * we got a key. old code send only the key, without RINO version.
+                                *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);
+                               $data = DFRN::aes_decrypt(hex2bin($data), $final_key);
                                break;
                        case 2:
                                try {
-                                       $data = Crypto::decrypt(hex2bin($data),$final_key);
-                               } catch (InvalidCiphertext $ex) { // VERY IMPORTANT
+                                       $data = \Crypto::decrypt(hex2bin($data), $final_key);
+                               } catch (\InvalidCiphertextException $ex) { // VERY IMPORTANT
                                        /*
                                         * Either:
                                         *   1. The ciphertext was modified by the attacker,
@@ -195,26 +194,26 @@ function dfrn_notify_post(App $a) {
                                         * Assume the worst.
                                         */
                                        logger('The ciphertext has been tampered with!');
-                                       xml_status(0,'The ciphertext has been tampered with!');
-                               } catch (Ex\CryptoTestFailed $ex) {
+                                       xml_status(0, 'The ciphertext has been tampered with!');
+                               } catch (\CryptoTestFailedException $ex) {
                                        logger('Cannot safely perform dencryption');
-                                       xml_status(0,'CryptoTestFailed');
-                               } catch (Ex\CannotPerformOperation $ex) {
+                                       xml_status(0, 'CryptoTestFailed');
+                               } catch (\CannotPerformOperationException $ex) {
                                        logger('Cannot safely perform decryption');
-                                       xml_status(0,'Cannot safely perform decryption');
+                                       xml_status(0, 'Cannot safely perform decryption');
                                }
                                break;
                        default:
-                               logger("rino: invalid sent verision '$rino_remote'");
-                               xml_status(0);
+                               logger("rino: invalid sent version '$rino_remote'");
+                               xml_status(0, "Invalid sent version '$rino_remote'");
                }
 
 
                logger('rino: decrypted data: ' . $data, LOGGER_DATA);
        }
 
-       $ret = dfrn::import($data, $importer);
-       xml_status($ret);
+       $ret = DFRN::import($data, $importer);
+       xml_status($ret, 'Processed');
 
        // NOTREACHED
 }
@@ -285,7 +284,7 @@ function dfrn_notify_content(App $a) {
                                dbesc($a->argv[1])
                );
 
-               if (! dbm::is_result($r)) {
+               if (! DBM::is_result($r)) {
                        $status = 1;
                }
 
@@ -314,12 +313,8 @@ function dfrn_notify_content(App $a) {
                $encrypted_id = bin2hex($encrypted_id);
 
 
-               $rino = get_config('system','rino_encrypt');
+               $rino = Config::get('system', 'rino_encrypt');
                $rino = intval($rino);
-               // use RINO1 if mcrypt isn't installed and RINO2 was selected
-               if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
-                       $rino = 1;
-               }
 
                logger("Local rino version: ". $rino, LOGGER_DEBUG);