Add error handling in Module\Xrd

[friendica.git] / src / Module / Xrd.php

diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php
index a28d1eed2487c3a7ff6a4a0da6c10d10ceaf3280..249c143ffbd7168fd2ee901e8c67e66b4d9aba90 100644 (file)
--- a/src/Module/Xrd.php
+++ b/src/Module/Xrd.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
@@ -6,9 +25,10 @@ use Friendica\BaseModule;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
-use Friendica\Protocol\Activity\ANamespace;
+use Friendica\Protocol\ActivityNamespace;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\Strings;
 
@@ -17,9 +37,9 @@ use Friendica\Util\Strings;
  */
 class Xrd extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent(array $parameters = [])
        {
-               $app = self::getApp();
+               $app = DI::app();
 
                // @TODO: Replace with parameter from router
                if ($app->argv[0] == 'xrd') {
@@ -65,6 +85,11 @@ class Xrd extends BaseModule
 
                $owner = User::getOwnerDataById($user['uid']);
 
+               if (empty($owner)) {
+                       DI::logger()->warning('No owner data for user id', ['uri' => $uri, 'name' => $name, 'user' => $user]);
+                       throw new \Friendica\Network\HTTPException\NotFoundException();
+               }
+
                $alias = str_replace('/profile/', '/~', $owner['url']);
 
                $avatar = Photo::selectFirst(['type'], ['uid' => $owner['uid'], 'profile' => true]);
@@ -74,9 +99,9 @@ class Xrd extends BaseModule
                }
 
                if ($mode == 'xml') {
-                       self::printXML($alias, $app->getBaseURL(), $user, $owner, $avatar);
+                       self::printXML($alias, DI::baseUrl()->get(), $user, $owner, $avatar);
                } else {
-                       self::printJSON($alias, $app->getBaseURL(), $owner, $avatar);
+                       self::printJSON($alias, DI::baseUrl()->get(), $owner, $avatar);
                }
        }
 
@@ -95,11 +120,11 @@ class Xrd extends BaseModule
                        ],
                        'links'   => [
                                [
-                                       'rel'  => ANamespace::DFRN ,
+                                       'rel'  => ActivityNamespace::DFRN ,
                                        'href' => $owner['url'],
                                ],
                                [
-                                       'rel'  => ANamespace::FEED,
+                                       'rel'  => ActivityNamespace::FEED,
                                        'type' => 'application/atom+xml',
                                        'href' => $owner['poll'],
                                ],
@@ -119,7 +144,7 @@ class Xrd extends BaseModule
                                        'href' => $baseURL . '/hcard/' . $owner['nickname'],
                                ],
                                [
-                                       'rel'  => ANamespace::POCO,
+                                       'rel'  => ActivityNamespace::POCO,
                                        'href' => $owner['poco'],
                                ],
                                [