Merge pull request #6372 from MrPetovan/bug/6334-escape-get-app

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index f4c7e311cae263e2efa242fa9297514a5b38d96f..8d6e81a68523e6e862661130205322eb5c5225dc 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,12 +1,13 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
-
-require_once 'include/items.php';
+use Friendica\Util\Strings;
+use Friendica\Core\System;
 
 function hub_return($valid, $body)
 {
@@ -14,7 +15,7 @@ function hub_return($valid, $body)
                header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
                echo $body;
        } else {
-               header($_SERVER["SERVER_PROTOCOL"] . ' 404 Not Found');
+               System::httpExit(404);
        }
        killme();
 }
@@ -23,30 +24,29 @@ function hub_return($valid, $body)
 
 function hub_post_return()
 {
-       header($_SERVER["SERVER_PROTOCOL"] . ' 200 OK');
-       killme();
+       System::httpExit(200);
 }
 
 function pubsub_init(App $a)
 {
-       $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
+       $nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
        if ($_SERVER['REQUEST_METHOD'] === 'GET') {
-               $hub_mode      = notags(trim(defaults($_GET, 'hub_mode', '')));
-               $hub_topic     = notags(trim(defaults($_GET, 'hub_topic', '')));
-               $hub_challenge = notags(trim(defaults($_GET, 'hub_challenge', '')));
-               $hub_lease     = notags(trim(defaults($_GET, 'hub_lease_seconds', '')));
-               $hub_verify    = notags(trim(defaults($_GET, 'hub_verify_token', '')));
+               $hub_mode      = Strings::escapeTags(trim(defaults($_GET, 'hub_mode', '')));
+               $hub_topic     = Strings::escapeTags(trim(defaults($_GET, 'hub_topic', '')));
+               $hub_challenge = Strings::escapeTags(trim(defaults($_GET, 'hub_challenge', '')));
+               $hub_lease     = Strings::escapeTags(trim(defaults($_GET, 'hub_lease_seconds', '')));
+               $hub_verify    = Strings::escapeTags(trim(defaults($_GET, 'hub_verify_token', '')));
 
-               logger('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
-               logger('Data: ' . print_r($_GET,true), LOGGER_DATA);
+               Logger::log('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
+               Logger::log('Data: ' . print_r($_GET,true), Logger::DATA);
 
                $subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
                $owner = DBA::selectFirst('user', ['uid'], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
                if (!DBA::isResult($owner)) {
-                       logger('Local account not found: ' . $nick);
+                       Logger::log('Local account not found: ' . $nick);
                        hub_return(false, '');
                }
 
@@ -58,12 +58,12 @@ function pubsub_init(App $a)
 
                $contact = DBA::selectFirst('contact', ['id', 'poll'], $condition);
                if (!DBA::isResult($contact)) {
-                       logger('Contact ' . $contact_id . ' not found.');
+                       Logger::log('Contact ' . $contact_id . ' not found.');
                        hub_return(false, '');
                }
 
-               if (!empty($hub_topic) && !link_compare($hub_topic, $contact['poll'])) {
-                       logger('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
+               if (!empty($hub_topic) && !Strings::compareLink($hub_topic, $contact['poll'])) {
+                       Logger::log('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
                        hub_return(false, '');
                }
 
@@ -71,13 +71,13 @@ function pubsub_init(App $a)
                // Don't allow outsiders to unsubscribe us.
 
                if (($hub_mode === 'unsubscribe') && empty($hub_verify)) {
-                       logger('Bogus unsubscribe');
+                       Logger::log('Bogus unsubscribe');
                        hub_return(false, '');
                }
 
                if (!empty($hub_mode)) {
                        DBA::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
-                       logger($hub_mode . ' success for contact ' . $contact_id . '.');
+                       Logger::log($hub_mode . ' success for contact ' . $contact_id . '.');
                }
                hub_return(true, $hub_challenge);
        }
@@ -87,10 +87,10 @@ function pubsub_post(App $a)
 {
        $xml = file_get_contents('php://input');
 
-       logger('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
-       logger('Data: ' . $xml, LOGGER_DATA);
+       Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
+       Logger::log('Data: ' . $xml, Logger::DATA);
 
-       $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
+       $nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
        $importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
@@ -106,16 +106,16 @@ function pubsub_post(App $a)
                if (!empty($author['contact-id'])) {
                        $condition = ['id' => $author['contact-id'], 'uid' => $importer['uid'], 'subhub' => true, 'blocked' => false];
                        $contact = DBA::selectFirst('contact', [], $condition);
-                       logger('No record for ' . $nick .' with contact id ' . $contact_id . ' - using '.$author['contact-id'].' instead.');
+                       Logger::log('No record for ' . $nick .' with contact id ' . $contact_id . ' - using '.$author['contact-id'].' instead.');
                }
                if (!DBA::isResult($contact)) {
-                       logger('Contact ' . $author["author-link"] . ' (' . $contact_id . ') for user ' . $nick . " wasn't found - ignored. XML: " . $xml);
+                       Logger::log('Contact ' . $author["author-link"] . ' (' . $contact_id . ') for user ' . $nick . " wasn't found - ignored. XML: " . $xml);
                        hub_post_return();
                }
        }
 
        if (!in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND]) && ($contact['network'] != Protocol::FEED)) {
-               logger('Contact ' . $contact['id'] . ' is not expected to share with us - ignored.');
+               Logger::log('Contact ' . $contact['id'] . ' is not expected to share with us - ignored.');
                hub_post_return();
        }
 
@@ -125,7 +125,7 @@ function pubsub_post(App $a)
                hub_post_return();
        }
 
-       logger('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
+       Logger::log('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
        $feedhub = '';
        consume_feed($xml, $importer, $contact, $feedhub);