We can now return a list of known servers

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 874f17c77202a97b25c084603dd3b2c5f5aaf8e5..d34c959f1f4dbd16094871e348de7cf7230be8a0 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,13 +1,18 @@
 <?php
 
-require_once('library/simplepie/simplepie.inc');
+/**
+ * @file mod/dfrn_notify.php
+ * @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');
 
-function dfrn_notify_post(&$a) {
-    logger(__function__, LOGGER_TRACE);
+function dfrn_notify_post(App $a) {
+       logger(__function__, LOGGER_TRACE);
        $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'])) : '');
@@ -37,7 +42,7 @@ function dfrn_notify_post(&$a) {
                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);
        }
@@ -83,7 +88,7 @@ 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);
                //NOTREACHED
@@ -93,6 +98,8 @@ function dfrn_notify_post(&$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),
@@ -115,7 +122,7 @@ function dfrn_notify_post(&$a) {
 
        if($dissolve == 1) {
 
-               /**
+               /*
                 * Relationship is dissolved permanently
                 */
 
@@ -128,20 +135,27 @@ function dfrn_notify_post(&$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);
 
-       if($importer['page-flags'] == PAGE_SOAPBOX)
-               xml_status(0);
+       $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(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'");
                }
-               
+
                $rawkey = hex2bin(trim($key));
                logger('rino: md5 raw key: ' . md5($rawkey));
                $final_key = '';
@@ -164,7 +178,7 @@ function dfrn_notify_post(&$a) {
                }
 
                #logger('rino: received key : ' . $final_key);
-               
+
                switch($rino_remote) {
                        case 0:
                        case 1:
@@ -195,19 +209,19 @@ function dfrn_notify_post(&$a) {
                                logger("rino: invalid sent verision '$rino_remote'");
                                xml_status(0);
                }
-               
-               
+
+
                logger('rino: decrypted data: ' . $data, LOGGER_DATA);
        }
 
-       $ret = local_delivery($importer,$data);
+       $ret = dfrn::import($data, $importer);
        xml_status($ret);
 
        // NOTREACHED
 }
 
 
-function dfrn_notify_content(&$a) {
+function dfrn_notify_content(App $a) {
 
        if(x($_GET,'dfrn_id')) {
 
@@ -243,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) {
@@ -270,8 +284,11 @@ 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 = '';
                $encrypted_id = '';
@@ -295,14 +312,18 @@ function dfrn_notify_content(&$a) {
                $challenge    = bin2hex($challenge);
                $encrypted_id = bin2hex($encrypted_id);
 
-               
+
                $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((($r[0]['rel']) && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) {
                        $perm = 'rw';
                }