Make Two Factor Field numeric

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 23e4e88846e287867d6ed5f77a147e561096ecb6..313c2cb0bb4a830a759df057c390187c2f6f2de2 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -2,42 +2,42 @@
 /**
  * @file mod/salmon.php
  */
+
 use Friendica\App;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\Crypto;
-
-require_once 'include/items.php';
+use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 function salmon_post(App $a, $xml = '') {
 
        if (empty($xml)) {
-               $xml = file_get_contents('php://input');
+               $xml = Network::postdata();
        }
 
        Logger::log('new salmon ' . $xml, Logger::DATA);
 
-       $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
-       $mentions   = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
+       $nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
 
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                DBA::escape($nick)
        );
        if (! DBA::isResult($r)) {
-               System::httpExit(500);
+               throw new \Friendica\Network\HTTPException\InternalServerErrorException();
        }
 
        $importer = $r[0];
 
        // parse the xml
 
-       $dom = simplexml_load_string($xml,'SimpleXMLElement',0,NAMESPACE_SALMON_ME);
+       $dom = simplexml_load_string($xml,'SimpleXMLElement',0, ActivityNamespace::SALMON_ME);
 
        $base = null;
 
@@ -51,13 +51,13 @@ function salmon_post(App $a, $xml = '') {
 
        if (empty($base)) {
                Logger::log('unable to locate salmon data in xml ');
-               System::httpExit(400);
+               throw new \Friendica\Network\HTTPException\BadRequestException();
        }
 
        // Stash the signature away for now. We have to find their key or it won't be good for anything.
 
 
-       $signature = base64url_decode($base->sig);
+       $signature = Strings::base64UrlDecode($base->sig);
 
        // unpack the  data
 
@@ -76,20 +76,20 @@ function salmon_post(App $a, $xml = '') {
 
        $stnet_signed_data = $data;
 
-       $signed_data = $data  . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg);
+       $signed_data = $data  . '.' . Strings::base64UrlEncode($type) . '.' . Strings::base64UrlEncode($encoding) . '.' . Strings::base64UrlEncode($alg);
 
        $compliant_format = str_replace('=', '', $signed_data);
 
 
        // decode the data
-       $data = base64url_decode($data);
+       $data = Strings::base64UrlDecode($data);
 
        $author = OStatus::salmonAuthor($data, $importer);
        $author_link = $author["author-link"];
 
        if(! $author_link) {
                Logger::log('Could not retrieve author URI.');
-               System::httpExit(400);
+               throw new \Friendica\Network\HTTPException\BadRequestException();
        }
 
        // Once we have the author URI, go to the web and try to find their public key
@@ -100,13 +100,13 @@ function salmon_post(App $a, $xml = '') {
 
        if(! $key) {
                Logger::log('Could not retrieve author key.');
-               System::httpExit(400);
+               throw new \Friendica\Network\HTTPException\BadRequestException();
        }
 
        $key_info = explode('.',$key);
 
-       $m = base64url_decode($key_info[1]);
-       $e = base64url_decode($key_info[2]);
+       $m = Strings::base64UrlDecode($key_info[1]);
+       $e = Strings::base64UrlDecode($key_info[2]);
 
        Logger::log('key details: ' . print_r($key_info,true), Logger::DEBUG);
 
@@ -132,7 +132,7 @@ function salmon_post(App $a, $xml = '') {
 
        if (! $verify) {
                Logger::log('Message did not verify. Discarding.');
-               System::httpExit(400);
+               throw new \Friendica\Network\HTTPException\BadRequestException();
        }
 
        Logger::log('Message verified with mode '.$mode);
@@ -149,9 +149,9 @@ function salmon_post(App $a, $xml = '') {
                                                AND `uid` = %d LIMIT 1",
                DBA::escape(Protocol::OSTATUS),
                DBA::escape(Protocol::DFRN),
-               DBA::escape(normalise_link($author_link)),
+               DBA::escape(Strings::normaliseLink($author_link)),
                DBA::escape($author_link),
-               DBA::escape(normalise_link($author_link)),
+               DBA::escape(Strings::normaliseLink($author_link)),
                intval($importer['uid'])
        );
 
@@ -179,16 +179,15 @@ function salmon_post(App $a, $xml = '') {
        //if((DBA::isResult($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == Contact::FOLLOWER) || ($r[0]['blocked']))) {
        if (DBA::isResult($r) && $r[0]['blocked']) {
                Logger::log('Ignoring this author.');
-               System::httpExit(202);
-               // NOTREACHED
+               throw new \Friendica\Network\HTTPException\AcceptedException();
        }
 
        // Placeholder for hub discovery.
        $hub = '';
 
-       $contact_rec = ((DBA::isResult($r)) ? $r[0] : null);
+       $contact_rec = ((DBA::isResult($r)) ? $r[0] : []);
 
        OStatus::import($data, $importer, $contact_rec, $hub);
 
-       System::httpExit(200);
+       throw new \Friendica\Network\HTTPException\OKException();
 }