Some more

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index ff5856a946861a7ae91ea2cae7e5f87004dac08f..508cd4de65ace3477695c5efa427b709944cbb7c 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,5 +1,8 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\PConfig;
+
 require_once('include/salmon.php');
 require_once('include/ostatus.php');
 require_once('include/crypto.php');
@@ -19,7 +22,7 @@ function salmon_return($val) {
 
 }
 
-function salmon_post(&$a) {
+function salmon_post(App $a) {
 
        $xml = file_get_contents('php://input');
 
@@ -79,7 +82,7 @@ function salmon_post(&$a) {
 
        $signed_data = $data  . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg);
 
-       $compliant_format = str_replace('=','',$signed_data);
+       $compliant_format = str_replace('=', '', $signed_data);
 
 
        // decode the data
@@ -115,24 +118,28 @@ function salmon_post(&$a) {
 
        // We should have everything we need now. Let's see if it verifies.
 
-       $verify = rsa_verify($compliant_format,$signature,$pubkey);
+       // Try GNU Social format
+       $verify = rsa_verify($signed_data, $signature, $pubkey);
+       $mode = 1;
 
-       if(! $verify) {
-               logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
-           $verify = rsa_verify($signed_data,$signature,$pubkey);
+       if (! $verify) {
+               logger('mod-salmon: message did not verify using protocol. Trying compliant format.');
+               $verify = rsa_verify($compliant_format, $signature, $pubkey);
+               $mode = 2;
        }
 
-       if(! $verify) {
-               logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.');
-           $verify = rsa_verify($stnet_signed_data,$signature,$pubkey);
+       if (! $verify) {
+               logger('mod-salmon: message did not verify using padding. Trying old statusnet format.');
+               $verify = rsa_verify($stnet_signed_data, $signature, $pubkey);
+               $mode = 3;
        }
 
-       if(! $verify) {
+       if (! $verify) {
                logger('mod-salmon: Message did not verify. Discarding.');
                http_status_exit(400);
        }
 
-       logger('mod-salmon: Message verified.');
+       logger('mod-salmon: Message verified with mode '.$mode);
 
 
        /*
@@ -153,10 +160,10 @@ function salmon_post(&$a) {
        );
        if (! dbm::is_result($r)) {
                logger('mod-salmon: Author unknown to us.');
-               if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
+               if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
                        $result = new_contact($importer['uid'],$author_link);
                        if($result['success']) {
-                               $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') 
+                               $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
                                        AND `uid` = %d LIMIT 1",
                                        dbesc(NETWORK_OSTATUS),
                                        dbesc($author_link),