From 2ae4b9f7e9f29e54c03557205677a1576917fc26 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Wed, 1 May 2019 19:17:52 +0200 Subject: [PATCH] Last refactoring :-) / refactor due feedback --- src/App/Router.php | 3 +- src/Module/WebFinger.php | 48 ++++++ src/Module/WellKnown/HostMeta.php | 16 +- src/Module/WellKnown/WebFinger.php | 196 --------------------- src/Module/WellKnown/XSocialRelay.php | 14 +- src/Module/Xrd.php | 198 +++++++++++++++++++--- view/templates/{xrd.tpl => webfinger.tpl} | 2 +- 7 files changed, 243 insertions(+), 234 deletions(-) create mode 100644 src/Module/WebFinger.php delete mode 100644 src/Module/WellKnown/WebFinger.php rename view/templates/{xrd.tpl => webfinger.tpl} (88%) diff --git a/src/App/Router.php b/src/App/Router.php index 67b1e828a0..96923289c5 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -43,11 +43,12 @@ class Router $this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class); $this->routeCollector->addRoute(['GET'], '/amcd', Module\AccountManagementControlDocument::class); $this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::class); + $this->routeCollector->addRoute(['GET'], '/webfinger', Module\WebFinger::class); $this->routeCollector->addRoute(['GET'], '/xrd', Module\Xrd::class); $this->routeCollector->addGroup('/.well-known', function (RouteCollector $collector) { $collector->addRoute(['GET'], '/host-meta' , Module\WellKnown\HostMeta::class); $collector->addRoute(['GET'], '/nodeinfo[/1.0]' , Module\NodeInfo::class); - $collector->addRoute(['GET'], '/webfinger' , Module\WellKnown\WebFinger::class); + $collector->addRoute(['GET'], '/webfinger' , Module\Xrd::class); $collector->addRoute(['GET'], '/x-social-relay' , Module\WellKnown\XSocialRelay::class); }); } diff --git a/src/Module/WebFinger.php b/src/Module/WebFinger.php new file mode 100644 index 0000000000..66280dce16 --- /dev/null +++ b/src/Module/WebFinger.php @@ -0,0 +1,48 @@ + L10n::t("Public access denied."), + "description" => L10n::t("Only logged in users are permitted to perform a probing.") + ] + ); + exit(); + } + } + + public static function content() + { + $app = self::getApp(); + + $addr = defaults($_GET, 'addr', ''); + $res = ''; + + if (!empty($addr)) { + $res = Probe::lrdd($addr); + $res = print_r($res, true); + } + + $tpl = Renderer::getMarkupTemplate('webfinger.tpl'); + return Renderer::replaceMacros($tpl, [ + '$addr' => $addr, + '$res' => $res, + ]); + } +} diff --git a/src/Module/WellKnown/HostMeta.php b/src/Module/WellKnown/HostMeta.php index aad56293d9..fd04467f75 100644 --- a/src/Module/WellKnown/HostMeta.php +++ b/src/Module/WellKnown/HostMeta.php @@ -18,22 +18,22 @@ class HostMeta extends BaseModule $app = self::getApp(); $config = $app->getConfig(); - header("Content-type: text/xml"); + header('Content-type: text/xml'); if (!$config->get('system', 'site_pubkey', false)) { $res = Crypto::newKeypair(1024); - $config->set('system','site_prvkey', $res['prvkey']); - $config->set('system','site_pubkey', $res['pubkey']); + $config->set('system', 'site_prvkey', $res['prvkey']); + $config->set('system', 'site_pubkey', $res['pubkey']); } $tpl = Renderer::getMarkupTemplate('xrd_host.tpl'); echo Renderer::replaceMacros($tpl, [ - '$zhost' => $app->getHostName(), - '$zroot' => $app->getBaseURL(), - '$domain' => $app->getBaseURL(), - '$bigkey' => Salmon::salmonKey($config->get('system', 'site_pubkey'))] - ); + '$zhost' => $app->getHostName(), + '$zroot' => $app->getBaseURL(), + '$domain' => $app->getBaseURL(), + '$bigkey' => Salmon::salmonKey($config->get('system', 'site_pubkey')) + ]); exit(); } diff --git a/src/Module/WellKnown/WebFinger.php b/src/Module/WellKnown/WebFinger.php deleted file mode 100644 index d9a143a7ab..0000000000 --- a/src/Module/WellKnown/WebFinger.php +++ /dev/null @@ -1,196 +0,0 @@ -argv[0] == 'xrd') { - if (empty($_GET['uri'])) { - return; - } - - $uri = urldecode(Strings::escapeTags(trim($_GET['uri']))); - if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/jrd+json') { - $mode = 'json'; - } else { - $mode = 'xml'; - } - } else { - if (empty($_GET['resource'])) { - return; - } - - $uri = urldecode(Strings::escapeTags(trim($_GET['resource']))); - if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/xrd+xml') { - $mode = 'xml'; - } else { - $mode = 'json'; - } - } - - if (substr($uri, 0, 4) === 'http') { - $name = ltrim(basename($uri), '~'); - } else { - $local = str_replace('acct:', '', $uri); - if (substr($local, 0, 2) == '//') { - $local = substr($local, 2); - } - - $name = substr($local, 0, strpos($local, '@')); - } - - $user = User::getByNickname($name); - - if (empty($user)) { - System::httpExit(404); - } - - $profileURL = $app->getBaseURL() . '/profile/' . $user['nickname']; - $alias = str_replace('/profile/', '/~', $profileURL); - - $addr = 'acct:' . $user['nickname'] . '@' . $app->getHostName(); - if ($app->getURLPath()) { - $addr .= '/' . $app->getURLPath(); - } - - if ($mode == 'xml') { - self::printXML($addr, $alias, $profileURL, $app->getBaseURL(), $user); - } else { - self::printJSON($addr, $alias, $profileURL, $app->getBaseURL(), $user); - } - } - - private static function printJSON($uri, $alias, $orofileURL, $baseURL, $user) - { - $salmon_key = Salmon::salmonKey($user['spubkey']); - - header('Access-Control-Allow-Origin: *'); - header("Content-type: application/json; charset=utf-8"); - - $json = [ - 'subject' => $uri, - 'aliases' => [ - $alias, - $orofileURL, - ], - 'links' => [ - [ - 'rel' => NAMESPACE_DFRN, - 'href' => $orofileURL, - ], - [ - 'rel' => NAMESPACE_FEED, - 'type' => 'application/atom+xml', - 'href' => $baseURL . '/dfrn_poll/' . $user['nickname'], - ], - [ - 'rel' => 'http://webfinger.net/rel/profile-page', - 'type' => 'text/html', - 'href' => $orofileURL, - ], - [ - 'rel' => 'self', - 'type' => 'application/activity+json', - 'href' => $orofileURL, - ], - [ - 'rel' => 'http://microformats.org/profile/hcard', - 'type' => 'text/html', - 'href' => $baseURL . '/hcard/' . $user['nickname'], - ], - [ - 'rel' => NAMESPACE_POCO, - 'href' => $baseURL . '/poco/' . $user['nickname'], - ], - [ - 'rel' => 'http://webfinger.net/rel/avatar', - 'type' => 'image/jpeg', - 'href' => $baseURL . '/photo/profile/' . $user['uid'] . '.jpg', - ], - [ - 'rel' => 'http://joindiaspora.com/seed_location', - 'type' => 'text/html', - 'href' => $baseURL, - ], - [ - 'rel' => 'salmon', - 'href' => $baseURL . '/salmon/' . $user['nickname'], - ], - [ - 'rel' => 'http://salmon-protocol.org/ns/salmon-replies', - 'href' => $baseURL . '/salmon/' . $user['nickname'], - ], - [ - 'rel' => 'http://salmon-protocol.org/ns/salmon-mention', - 'href' => $baseURL . '/salmon/' . $user['nickname'] . '/mention', - ], - [ - 'rel' => 'http://ostatus.org/schema/1.0/subscribe', - 'template' => $baseURL . '/follow?url={uri}', - ], - [ - 'rel' => 'magic-public-key', - 'href' => 'data:application/magic-public-key,' . $salmon_key, - ], - [ - 'rel' => 'http://purl.org/openwebauth/v1', - 'type' => 'application/x-zot+json', - 'href' => $baseURL . '/owa', - ], - ], - ]; - - echo json_encode($json); - exit(); - } - - private static function printXML($uri, $alias, $profileURL, $baseURL, $user) - { - $salmon_key = Salmon::salmonKey($user['spubkey']); - - header('Access-Control-Allow-Origin: *'); - header("Content-type: text/xml"); - - $tpl = Renderer::getMarkupTemplate('xrd_person.tpl'); - - $o = Renderer::replaceMacros($tpl, [ - '$nick' => $user['nickname'], - '$accturi' => $uri, - '$alias' => $alias, - '$profile_url' => $profileURL, - '$hcard_url' => $baseURL . '/hcard/' . $user['nickname'], - '$atom' => $baseURL . '/dfrn_poll/' . $user['nickname'], - '$poco_url' => $baseURL . '/poco/' . $user['nickname'], - '$photo' => $baseURL . '/photo/profile/' . $user['uid'] . '.jpg', - '$baseurl' => $baseURL, - '$salmon' => $baseURL . '/salmon/' . $user['nickname'], - '$salmen' => $baseURL . '/salmon/' . $user['nickname'] . '/mention', - '$subscribe' => $baseURL . '/follow?url={uri}', - '$openwebauth' => $baseURL . '/owa', - '$modexp' => 'data:application/magic-public-key,' . $salmon_key - ]); - - $arr = ['user' => $user, 'xml' => $o]; - Hook::callAll('personal_xrd', $arr); - - echo $arr['xml']; - exit(); - } -} diff --git a/src/Module/WellKnown/XSocialRelay.php b/src/Module/WellKnown/XSocialRelay.php index da3533fee4..33e58d0c5c 100644 --- a/src/Module/WellKnown/XSocialRelay.php +++ b/src/Module/WellKnown/XSocialRelay.php @@ -29,7 +29,7 @@ class XSocialRelay extends BaseModule if ($scope == SR_SCOPE_TAGS) { $server_tags = $config->get('system', 'relay_server_tags'); - $tagitems = explode(",", $server_tags); + $tagitems = explode(',', $server_tags); /// @todo Check if it was better to use "strtolower" on the tags foreach ($tagitems AS $tag) { @@ -47,10 +47,14 @@ class XSocialRelay extends BaseModule 'subscribe' => $subscribe, 'scope' => $scope, 'tags' => $tagList, - 'protocols' => ['diaspora' => - ['receive' => $app->getBaseURL() . '/receive/public'], - 'dfrn' => - ['receive' => $app->getBaseURL() . '/dfrn_notify']] + 'protocols' => [ + 'diaspora' => [ + 'receive' => $app->getBaseURL() . '/receive/public' + ], + 'dfrn' => [ + 'receive' => $app->getBaseURL() . '/dfrn_notify' + ] + ] ]; header('Content-type: application/json; charset=utf-8'); diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php index 1251e6e283..38ce151ff8 100644 --- a/src/Module/Xrd.php +++ b/src/Module/Xrd.php @@ -3,41 +3,193 @@ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\Core\L10n; +use Friendica\Core\Hook; use Friendica\Core\Renderer; use Friendica\Core\System; -use Friendica\Network\Probe; +use Friendica\Model\User; +use Friendica\Protocol\Salmon; +use Friendica\Util\Strings; +/** + * Prints responses to /.well-known/webfinger or /xrd requests + */ class Xrd extends BaseModule { - public static function init() + public static function rawContent() { - if (local_user()) { - System::httpExit( - 403, - [ - "title" => L10n::t("Public access denied."), - "description" => L10n::t("Only logged in users are permitted to perform a probing.") - ] - ); - exit(); + $app = self::getApp(); + + // @TODO: Replace with parameter from router + if ($app->argv[0] == 'xrd') { + if (empty($_GET['uri'])) { + return; + } + + $uri = urldecode(Strings::escapeTags(trim($_GET['uri']))); + if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/jrd+json') { + $mode = 'json'; + } else { + $mode = 'xml'; + } + } else { + if (empty($_GET['resource'])) { + return; + } + + $uri = urldecode(Strings::escapeTags(trim($_GET['resource']))); + if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/xrd+xml') { + $mode = 'xml'; + } else { + $mode = 'json'; + } + } + + if (substr($uri, 0, 4) === 'http') { + $name = ltrim(basename($uri), '~'); + } else { + $local = str_replace('acct:', '', $uri); + if (substr($local, 0, 2) == '//') { + $local = substr($local, 2); + } + + $name = substr($local, 0, strpos($local, '@')); + } + + $user = User::getByNickname($name); + + if (empty($user)) { + System::httpExit(404); + } + + $profileURL = $app->getBaseURL() . '/profile/' . $user['nickname']; + $alias = str_replace('/profile/', '/~', $profileURL); + + $addr = 'acct:' . $user['nickname'] . '@' . $app->getHostName(); + if ($app->getURLPath()) { + $addr .= '/' . $app->getURLPath(); + } + + if ($mode == 'xml') { + self::printXML($addr, $alias, $profileURL, $app->getBaseURL(), $user); + } else { + self::printJSON($addr, $alias, $profileURL, $app->getBaseURL(), $user); } } - public static function content() + private static function printJSON($uri, $alias, $orofileURL, $baseURL, $user) { - $addr = defaults($_GET, 'addr', ''); - $res = ''; + $salmon_key = Salmon::salmonKey($user['spubkey']); - if (!empty($addr)) { - $res = Probe::lrdd($addr); - $res = str_replace("\n", '
', print_r($res, true)); - } + header('Access-Control-Allow-Origin: *'); + header('Content-type: application/json; charset=utf-8'); + + $json = [ + 'subject' => $uri, + 'aliases' => [ + $alias, + $orofileURL, + ], + 'links' => [ + [ + 'rel' => NAMESPACE_DFRN, + 'href' => $orofileURL, + ], + [ + 'rel' => NAMESPACE_FEED, + 'type' => 'application/atom+xml', + 'href' => $baseURL . '/dfrn_poll/' . $user['nickname'], + ], + [ + 'rel' => 'http://webfinger.net/rel/profile-page', + 'type' => 'text/html', + 'href' => $orofileURL, + ], + [ + 'rel' => 'self', + 'type' => 'application/activity+json', + 'href' => $orofileURL, + ], + [ + 'rel' => 'http://microformats.org/profile/hcard', + 'type' => 'text/html', + 'href' => $baseURL . '/hcard/' . $user['nickname'], + ], + [ + 'rel' => NAMESPACE_POCO, + 'href' => $baseURL . '/poco/' . $user['nickname'], + ], + [ + 'rel' => 'http://webfinger.net/rel/avatar', + 'type' => 'image/jpeg', + 'href' => $baseURL . '/photo/profile/' . $user['uid'] . '.jpg', + ], + [ + 'rel' => 'http://joindiaspora.com/seed_location', + 'type' => 'text/html', + 'href' => $baseURL, + ], + [ + 'rel' => 'salmon', + 'href' => $baseURL . '/salmon/' . $user['nickname'], + ], + [ + 'rel' => 'http://salmon-protocol.org/ns/salmon-replies', + 'href' => $baseURL . '/salmon/' . $user['nickname'], + ], + [ + 'rel' => 'http://salmon-protocol.org/ns/salmon-mention', + 'href' => $baseURL . '/salmon/' . $user['nickname'] . '/mention', + ], + [ + 'rel' => 'http://ostatus.org/schema/1.0/subscribe', + 'template' => $baseURL . '/follow?url={uri}', + ], + [ + 'rel' => 'magic-public-key', + 'href' => 'data:application/magic-public-key,' . $salmon_key, + ], + [ + 'rel' => 'http://purl.org/openwebauth/v1', + 'type' => 'application/x-zot+json', + 'href' => $baseURL . '/owa', + ], + ], + ]; + + echo json_encode($json); + exit(); + } + + private static function printXML($uri, $alias, $profileURL, $baseURL, $user) + { + $salmon_key = Salmon::salmonKey($user['spubkey']); - $tpl = Renderer::getMarkupTemplate("xrd.tpl"); - return Renderer::replaceMacros($tpl, [ - '$addr' => $addr, - '$res' => $res, + header('Access-Control-Allow-Origin: *'); + header('Content-type: text/xml'); + + $tpl = Renderer::getMarkupTemplate('xrd_person.tpl'); + + $o = Renderer::replaceMacros($tpl, [ + '$nick' => $user['nickname'], + '$accturi' => $uri, + '$alias' => $alias, + '$profile_url' => $profileURL, + '$hcard_url' => $baseURL . '/hcard/' . $user['nickname'], + '$atom' => $baseURL . '/dfrn_poll/' . $user['nickname'], + '$poco_url' => $baseURL . '/poco/' . $user['nickname'], + '$photo' => $baseURL . '/photo/profile/' . $user['uid'] . '.jpg', + '$baseurl' => $baseURL, + '$salmon' => $baseURL . '/salmon/' . $user['nickname'], + '$salmen' => $baseURL . '/salmon/' . $user['nickname'] . '/mention', + '$subscribe' => $baseURL . '/follow?url={uri}', + '$openwebauth' => $baseURL . '/owa', + '$modexp' => 'data:application/magic-public-key,' . $salmon_key ]); + + $arr = ['user' => $user, 'xml' => $o]; + Hook::callAll('personal_xrd', $arr); + + echo $arr['xml']; + exit(); } } diff --git a/view/templates/xrd.tpl b/view/templates/webfinger.tpl similarity index 88% rename from view/templates/xrd.tpl rename to view/templates/webfinger.tpl index c9c2e48a1b..109a7fce25 100644 --- a/view/templates/xrd.tpl +++ b/view/templates/webfinger.tpl @@ -1,7 +1,7 @@

Webfinger Diagnostic

-
+ Lookup address:
-- 2.39.5