X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModule%2FXrd.php;h=d24628ce65652f81ae76fd466f2477279ba052ce;hb=6dbbd081795fa1c8fe57db2248ac162efeeada88;hp=0618a5de6da3ffbc67c080b879a2da51f746d77f;hpb=4ab772ed673d38ff7458e2e0155fdf9b9155551f;p=friendica.git diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php index 0618a5de6d..d24628ce65 100644 --- a/src/Module/Xrd.php +++ b/src/Module/Xrd.php @@ -1,34 +1,51 @@ . + * + */ namespace Friendica\Module; use Friendica\BaseModule; use Friendica\Core\Hook; -use Friendica\Database\DBA; use Friendica\Core\Renderer; use Friendica\Core\System; -use Friendica\Model\User; +use Friendica\DI; use Friendica\Model\Photo; +use Friendica\Model\User; +use Friendica\Protocol\ActivityNamespace; use Friendica\Protocol\Salmon; -use Friendica\Util\Strings; /** * Prints responses to /.well-known/webfinger or /xrd requests */ class Xrd extends BaseModule { - public static function rawContent() + protected function rawContent(array $request = []) { - $app = self::getApp(); - // @TODO: Replace with parameter from router - if ($app->argv[0] == 'xrd') { + if (DI::args()->getArgv()[0] == 'xrd') { if (empty($_GET['uri'])) { return; } - $uri = urldecode(Strings::escapeTags(trim($_GET['uri']))); - if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/jrd+json') { + $uri = urldecode(trim($_GET['uri'])); + if (strpos($_SERVER['HTTP_ACCEPT'] ?? '', 'application/jrd+json') !== false) { $mode = 'json'; } else { $mode = 'xml'; @@ -38,8 +55,8 @@ class Xrd extends BaseModule return; } - $uri = urldecode(Strings::escapeTags(trim($_GET['resource']))); - if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/xrd+xml') { + $uri = urldecode(trim($_GET['resource'])); + if (strpos($_SERVER['HTTP_ACCEPT'] ?? '', 'application/xrd+xml') !== false) { $mode = 'xml'; } else { $mode = 'json'; @@ -57,36 +74,89 @@ class Xrd extends BaseModule $name = substr($local, 0, strpos($local, '@')); } - $user = User::getByNickname($name); - - if (empty($user)) { - throw new \Friendica\Network\HTTPException\NotFoundException(); - } + if ($name == User::getActorName()) { + $owner = User::getSystemAccount(); + if (empty($owner)) { + throw new \Friendica\Network\HTTPException\NotFoundException(); + } + self::printSystemJSON($owner); + } else { + $user = User::getByNickname($name); + if (empty($user)) { + throw new \Friendica\Network\HTTPException\NotFoundException(); + } - $owner = User::getOwnerDataById($user['uid']); + $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']); + $alias = str_replace('/profile/', '/~', $owner['url']); - $avatar = Photo::selectFirst(['type'], ['uid' => $owner['uid'], 'profile' => true]); + $avatar = Photo::selectFirst(['type'], ['uid' => $owner['uid'], 'profile' => true]); + } - if (!DBA::isResult($avatar)) { + if (empty($avatar)) { $avatar = ['type' => 'image/jpeg']; } 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); } } + private static function printSystemJSON(array $owner) + { + $json = [ + 'subject' => 'acct:' . $owner['addr'], + 'aliases' => [$owner['url']], + 'links' => [ + [ + 'rel' => 'http://webfinger.net/rel/profile-page', + 'type' => 'text/html', + 'href' => $owner['url'], + ], + [ + 'rel' => 'self', + 'type' => 'application/activity+json', + 'href' => $owner['url'], + ], + [ + 'rel' => 'http://ostatus.org/schema/1.0/subscribe', + 'template' => DI::baseUrl()->get() . '/follow?url={uri}', + ], + [ + 'rel' => ActivityNamespace::FEED, + 'type' => 'application/atom+xml', + 'href' => $owner['poll'] ?? DI::baseUrl()->get(), + ], + [ + 'rel' => 'salmon', + 'href' => DI::baseUrl()->get() . '/salmon/' . $owner['nickname'], + ], + [ + 'rel' => 'http://microformats.org/profile/hcard', + 'type' => 'text/html', + 'href' => DI::baseUrl()->get() . '/hcard/' . $owner['nickname'], + ], + [ + 'rel' => 'http://joindiaspora.com/seed_location', + 'type' => 'text/html', + 'href' => DI::baseUrl()->get(), + ], + ] + ]; + header('Access-Control-Allow-Origin: *'); + System::jsonExit($json, 'application/jrd+json; charset=utf-8'); + } + private static function printJSON($alias, $baseURL, $owner, $avatar) { $salmon_key = Salmon::salmonKey($owner['spubkey']); - header('Access-Control-Allow-Origin: *'); - header('Content-type: application/json; charset=utf-8'); - $json = [ 'subject' => 'acct:' . $owner['addr'], 'aliases' => [ @@ -95,13 +165,13 @@ class Xrd extends BaseModule ], 'links' => [ [ - 'rel' => NAMESPACE_DFRN, + 'rel' => ActivityNamespace::DFRN , 'href' => $owner['url'], ], [ - 'rel' => NAMESPACE_FEED, + 'rel' => ActivityNamespace::FEED, 'type' => 'application/atom+xml', - 'href' => $owner['notify'], + 'href' => $owner['poll'], ], [ 'rel' => 'http://webfinger.net/rel/profile-page', @@ -119,13 +189,13 @@ class Xrd extends BaseModule 'href' => $baseURL . '/hcard/' . $owner['nickname'], ], [ - 'rel' => NAMESPACE_POCO, + 'rel' => ActivityNamespace::POCO, 'href' => $owner['poco'], ], [ 'rel' => 'http://webfinger.net/rel/avatar', 'type' => $avatar['type'], - 'href' => $owner['photo'], + 'href' => User::getAvatarUrl($owner), ], [ 'rel' => 'http://joindiaspora.com/seed_location', @@ -160,8 +230,8 @@ class Xrd extends BaseModule ], ]; - echo json_encode($json); - exit(); + header('Access-Control-Allow-Origin: *'); + System::jsonExit($json, 'application/jrd+json; charset=utf-8'); } private static function printXML($alias, $baseURL, $user, $owner, $avatar) @@ -179,9 +249,9 @@ class Xrd extends BaseModule '$alias' => $alias, '$profile_url' => $owner['url'], '$hcard_url' => $baseURL . '/hcard/' . $owner['nickname'], - '$atom' => $owner['notify'], + '$atom' => $owner['poll'], '$poco_url' => $owner['poco'], - '$photo' => $owner['photo'], + '$photo' => User::getAvatarUrl($owner), '$type' => $avatar['type'], '$salmon' => $baseURL . '/salmon/' . $owner['nickname'], '$salmen' => $baseURL . '/salmon/' . $owner['nickname'] . '/mention',