Last refactoring :-) / refactor due feedback

This commit is contained in:
Philipp Holzer 2019-05-01 19:17:52 +02:00
parent 0345c50e2d
commit 2ae4b9f7e9
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
7 changed files with 243 additions and 234 deletions

View File

@ -43,11 +43,12 @@ class Router
$this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class); $this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class);
$this->routeCollector->addRoute(['GET'], '/amcd', Module\AccountManagementControlDocument::class); $this->routeCollector->addRoute(['GET'], '/amcd', Module\AccountManagementControlDocument::class);
$this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::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->addRoute(['GET'], '/xrd', Module\Xrd::class);
$this->routeCollector->addGroup('/.well-known', function (RouteCollector $collector) { $this->routeCollector->addGroup('/.well-known', function (RouteCollector $collector) {
$collector->addRoute(['GET'], '/host-meta' , Module\WellKnown\HostMeta::class); $collector->addRoute(['GET'], '/host-meta' , Module\WellKnown\HostMeta::class);
$collector->addRoute(['GET'], '/nodeinfo[/1.0]' , Module\NodeInfo::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); $collector->addRoute(['GET'], '/x-social-relay' , Module\WellKnown\XSocialRelay::class);
}); });
} }

48
src/Module/WebFinger.php Normal file
View File

@ -0,0 +1,48 @@
<?php
namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Network\Probe;
/**
* Web based module to perform webfinger probing
*/
class WebFinger extends BaseModule
{
public static function init()
{
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();
}
}
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,
]);
}
}

View File

@ -18,22 +18,22 @@ class HostMeta extends BaseModule
$app = self::getApp(); $app = self::getApp();
$config = $app->getConfig(); $config = $app->getConfig();
header("Content-type: text/xml"); header('Content-type: text/xml');
if (!$config->get('system', 'site_pubkey', false)) { if (!$config->get('system', 'site_pubkey', false)) {
$res = Crypto::newKeypair(1024); $res = Crypto::newKeypair(1024);
$config->set('system','site_prvkey', $res['prvkey']); $config->set('system', 'site_prvkey', $res['prvkey']);
$config->set('system','site_pubkey', $res['pubkey']); $config->set('system', 'site_pubkey', $res['pubkey']);
} }
$tpl = Renderer::getMarkupTemplate('xrd_host.tpl'); $tpl = Renderer::getMarkupTemplate('xrd_host.tpl');
echo Renderer::replaceMacros($tpl, [ echo Renderer::replaceMacros($tpl, [
'$zhost' => $app->getHostName(), '$zhost' => $app->getHostName(),
'$zroot' => $app->getBaseURL(), '$zroot' => $app->getBaseURL(),
'$domain' => $app->getBaseURL(), '$domain' => $app->getBaseURL(),
'$bigkey' => Salmon::salmonKey($config->get('system', 'site_pubkey'))] '$bigkey' => Salmon::salmonKey($config->get('system', 'site_pubkey'))
); ]);
exit(); exit();
} }

View File

@ -1,196 +0,0 @@
<?php
namespace Friendica\Module\WellKnown;
use Friendica\BaseModule;
use Friendica\Core\Hook;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Model\User;
use Friendica\Protocol\Salmon;
use Friendica\Util\Strings;
/**
* Prints information about people
* @see https://tools.ietf.org/html/rfc7033
*/
class WebFinger extends BaseModule
{
public static function rawContent()
{
$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);
}
}
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();
}
}

View File

@ -29,7 +29,7 @@ class XSocialRelay extends BaseModule
if ($scope == SR_SCOPE_TAGS) { if ($scope == SR_SCOPE_TAGS) {
$server_tags = $config->get('system', 'relay_server_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 /// @todo Check if it was better to use "strtolower" on the tags
foreach ($tagitems AS $tag) { foreach ($tagitems AS $tag) {
@ -47,10 +47,14 @@ class XSocialRelay extends BaseModule
'subscribe' => $subscribe, 'subscribe' => $subscribe,
'scope' => $scope, 'scope' => $scope,
'tags' => $tagList, 'tags' => $tagList,
'protocols' => ['diaspora' => 'protocols' => [
['receive' => $app->getBaseURL() . '/receive/public'], 'diaspora' => [
'dfrn' => 'receive' => $app->getBaseURL() . '/receive/public'
['receive' => $app->getBaseURL() . '/dfrn_notify']] ],
'dfrn' => [
'receive' => $app->getBaseURL() . '/dfrn_notify'
]
]
]; ];
header('Content-type: application/json; charset=utf-8'); header('Content-type: application/json; charset=utf-8');

View File

@ -3,41 +3,193 @@
namespace Friendica\Module; namespace Friendica\Module;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\L10n; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\System; 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 class Xrd extends BaseModule
{ {
public static function init() public static function rawContent()
{ {
if (local_user()) { $app = self::getApp();
System::httpExit(
403, // @TODO: Replace with parameter from router
[ if ($app->argv[0] == 'xrd') {
"title" => L10n::t("Public access denied."), if (empty($_GET['uri'])) {
"description" => L10n::t("Only logged in users are permitted to perform a probing.") return;
] }
);
exit(); $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', ''); $salmon_key = Salmon::salmonKey($user['spubkey']);
$res = '';
if (!empty($addr)) { header('Access-Control-Allow-Origin: *');
$res = Probe::lrdd($addr); header('Content-type: application/json; charset=utf-8');
$res = str_replace("\n", '<br />', print_r($res, true));
}
$tpl = Renderer::getMarkupTemplate("xrd.tpl"); $json = [
return Renderer::replaceMacros($tpl, [ 'subject' => $uri,
'$addr' => $addr, 'aliases' => [
'$res' => $res, $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();
} }
} }

View File

@ -1,7 +1,7 @@
<div class="generic-page-wrapper"> <div class="generic-page-wrapper">
<h3>Webfinger Diagnostic</h3> <h3>Webfinger Diagnostic</h3>
<form action="xrd" method="get"> <form action="webfinger" method="get">
Lookup address: <input type="text" style="width: 250px;" name="addr" value="{{$addr}}" /> Lookup address: <input type="text" style="width: 250px;" name="addr" value="{{$addr}}" />
<input type="submit" name="submit" value="Submit" /> <input type="submit" name="submit" value="Submit" />
</form> </form>