]> git.mxchange.org Git - friendica.git/commitdiff
Move .well-known, webfinger, xrd to src/Module/
authorPhilipp Holzer <admin@philipp.info>
Tue, 30 Apr 2019 22:14:06 +0000 (00:14 +0200)
committerPhilipp Holzer <admin@philipp.info>
Wed, 1 May 2019 16:25:04 +0000 (18:25 +0200)
12 files changed:
mod/_well_known.php [deleted file]
mod/webfinger.php [deleted file]
mod/xrd.php [deleted file]
src/App/Router.php
src/Model/Search.php [new file with mode: 0644]
src/Model/User.php
src/Module/HostMeta.php [deleted file]
src/Module/NodeInfo.php [new file with mode: 0644]
src/Module/Nodeinfo.php [deleted file]
src/Module/WebFinger.php [new file with mode: 0644]
src/Module/WellKnown/HostMeta.php [new file with mode: 0644]
src/Module/WellKnown/XSocialRelay.php [new file with mode: 0644]

diff --git a/mod/_well_known.php b/mod/_well_known.php
deleted file mode 100644 (file)
index 3bd86ec..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\System;
-use Friendica\Module\HostMeta;
-use Friendica\Module\Nodeinfo;
-
-require_once 'mod/xrd.php';
-
-function _well_known_init(App $a)
-{
-       if ($a->argc > 1) {
-               switch ($a->argv[1]) {
-                       case "host-meta":
-                               HostMeta::printHostMeta();
-                               break;
-                       case "x-social-relay":
-                               wk_social_relay();
-                               break;
-                       case "nodeinfo":
-                               Nodeinfo::printWellKnown($a);
-                               break;
-                       case "webfinger":
-                               xrd_init($a);
-                               break;
-               }
-       }
-       System::httpExit(404);
-}
-
-function wk_social_relay()
-{
-       $subscribe = (bool) Config::get('system', 'relay_subscribe', false);
-
-       if ($subscribe) {
-               $scope = Config::get('system', 'relay_scope', SR_SCOPE_ALL);
-       } else {
-               $scope = SR_SCOPE_NONE;
-       }
-
-       $tags = [];
-
-       if ($scope == SR_SCOPE_TAGS) {
-               $server_tags = Config::get('system', 'relay_server_tags');
-               $tagitems = explode(",", $server_tags);
-
-               /// @todo Check if it was better to use "strtolower" on the tags
-               foreach ($tagitems AS $tag) {
-                       $tag = trim($tag, "# ");
-                       $tags[$tag] = $tag;
-               }
-
-               if (Config::get('system', 'relay_user_tags')) {
-                       $terms = q("SELECT DISTINCT(`term`) FROM `search`");
-
-                       foreach ($terms AS $term) {
-                               $tag = trim($term["term"], "#");
-                               $tags[$tag] = $tag;
-                       }
-               }
-       }
-
-       $taglist = [];
-       foreach ($tags AS $tag) {
-               if (!empty($tag)) {
-                       $taglist[] = $tag;
-               }
-       }
-
-       $relay = [
-               'subscribe' => $subscribe,
-               'scope' => $scope,
-               'tags' => $taglist,
-               'protocols' => ['diaspora' => ['receive' => System::baseUrl() . '/receive/public'],
-                       'dfrn' => ['receive' => System::baseUrl() . '/dfrn_notify']]
-       ];
-
-       header('Content-type: application/json; charset=utf-8');
-       echo json_encode($relay, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-       exit;
-}
diff --git a/mod/webfinger.php b/mod/webfinger.php
deleted file mode 100644 (file)
index b22b1ee..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * @file mod/webfinger.php
- */
-use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Network\Probe;
-
-function webfinger_content(App $a)
-{
-       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();
-       }
-
-       $o = '<div class="generic-page-wrapper">';
-       $o .= '<h3>Webfinger Diagnostic</h3>';
-
-       $o .= '<form action="webfinger" method="get">';
-       $o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . defaults($_GET, 'addr', '') .'" />';
-       $o .= '<input type="submit" name="submit" value="Submit" /></form>';
-
-       $o .= '<br /><br />';
-
-       if (!empty($_GET['addr'])) {
-               $addr = trim($_GET['addr']);
-               $res = Probe::lrdd($addr);
-               $o .= '<pre>';
-               $o .= str_replace("\n", '<br />', print_r($res, true));
-               $o .= '</pre>';
-       }
-       $o .= '</div>';
-
-       return $o;
-}
diff --git a/mod/xrd.php b/mod/xrd.php
deleted file mode 100644 (file)
index b4cb60a..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * @file mod/xrd.php
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\Database\DBA;
-use Friendica\Protocol\Salmon;
-use Friendica\Util\Strings;
-
-function xrd_init(App $a)
-{
-       if ($a->argv[0] == 'xrd') {
-               if (empty($_GET['uri'])) {
-                       System::httpExit(404);
-               }
-
-               $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'])) {
-                       System::httpExit(404);
-               }
-
-               $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 = DBA::selectFirst('user', [], ['nickname' => $name]);
-       if (!DBA::isResult($user)) {
-               System::httpExit(404);
-       }
-
-       $profile_url = System::baseUrl().'/profile/'.$user['nickname'];
-
-       $alias = str_replace('/profile/', '/~', $profile_url);
-
-       $addr = 'acct:'.$user['nickname'].'@'.$a->getHostName();
-       if ($a->getURLPath()) {
-               $addr .= '/'.$a->getURLPath();
-       }
-
-       if ($mode == 'xml') {
-               xrd_xml($addr, $alias, $profile_url, $user);
-       } else {
-               xrd_json($addr, $alias, $profile_url, $user);
-       }
-}
-
-function xrd_json($uri, $alias, $profile_url, $r)
-{
-       $salmon_key = Salmon::salmonKey($r['spubkey']);
-
-       header('Access-Control-Allow-Origin: *');
-       header("Content-type: application/json; charset=utf-8");
-
-       $json = ['subject' => $uri,
-               'aliases' => [$alias, $profile_url],
-               'links' => [
-                       ['rel' => NAMESPACE_DFRN, 'href' => $profile_url],
-                       ['rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']],
-                       ['rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url],
-                       ['rel' => 'self', 'type' => 'application/activity+json', 'href' => $profile_url],
-                       ['rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']],
-                       ['rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']],
-                       ['rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'],
-                       ['rel' => 'http://joindiaspora.com/seed_location', 'type' => 'text/html', 'href' => System::baseUrl()],
-                       ['rel' => 'salmon', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
-                       ['rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
-                       ['rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'],
-                       ['rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::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' => System::baseUrl().'/owa']
-               ]
-       ];
-
-       echo json_encode($json);
-       exit();
-}
-
-function xrd_xml($uri, $alias, $profile_url, $r)
-{
-       $salmon_key = Salmon::salmonKey($r['spubkey']);
-
-       header('Access-Control-Allow-Origin: *');
-       header("Content-type: text/xml");
-
-       $tpl = Renderer::getMarkupTemplate('xrd_person.tpl');
-
-       $o = Renderer::replaceMacros($tpl, [
-               '$nick'        => $r['nickname'],
-               '$accturi'     => $uri,
-               '$alias'       => $alias,
-               '$profile_url' => $profile_url,
-               '$hcard_url'   => System::baseUrl() . '/hcard/'         . $r['nickname'],
-               '$atom'        => System::baseUrl() . '/dfrn_poll/'     . $r['nickname'],
-               '$poco_url'    => System::baseUrl() . '/poco/'          . $r['nickname'],
-               '$photo'       => System::baseUrl() . '/photo/profile/' . $r['uid']      . '.jpg',
-               '$baseurl'     => System::baseUrl(),
-               '$salmon'      => System::baseUrl() . '/salmon/'        . $r['nickname'],
-               '$salmen'      => System::baseUrl() . '/salmon/'        . $r['nickname'] . '/mention',
-               '$subscribe'   => System::baseUrl() . '/follow?url={uri}',
-               '$openwebauth' => System::baseUrl() . '/owa',
-               '$modexp'      => 'data:application/magic-public-key,'  . $salmon_key]
-       );
-
-       $arr = ['user' => $r, 'xml' => $o];
-       Hook::callAll('personal_xrd', $arr);
-
-       echo $arr['xml'];
-       exit();
-}
index 53fe0689a6452a85cf5ef3eb43f25f1858dd5628..c1739897793bad06f946fa26dc42c904bbb019e2 100644 (file)
@@ -44,6 +44,14 @@ class Router
                $this->routeCollector->addRoute(['GET'],         '/amcd',                Module\AccountManagementControlDocument::class);
                $this->routeCollector->addRoute(['GET'],         '/host-meta',           Module\HostMeta::class);
                $this->routeCollector->addRoute(['GET'],         '/hostxrd',             Module\HostMeta::class);
+               $this->routeCollector->addRoute(['GET'],         '/nodeinfo/1.0',        Module\NodeInfo::class);
+               $this->routeCollector->addRoute(['GET'],         '/xrd',                 Module\WebFinger::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[/xrd]' , Module\WebFinger::class);
+                       $collector->addRoute(['GET'], '/x-social-relay'  , Module\WellKnown\XSocialRelay::class);
+               });
        }
 
        public function __construct(RouteCollector $routeCollector = null)
diff --git a/src/Model/Search.php b/src/Model/Search.php
new file mode 100644 (file)
index 0000000..5829ff9
--- /dev/null
@@ -0,0 +1,32 @@
+<?php
+
+namespace Friendica\Model;
+
+use Friendica\BaseObject;
+use Friendica\Database\DBA;
+
+/**
+ * Model for DB specific logic for the search entity
+ */
+class Search extends BaseObject
+{
+       /**
+        * Returns the list of user defined tags (e.g. #Friendica)
+        *
+        * @return array
+        *
+        * @throws \Exception
+        */
+       public static function getUserTags()
+       {
+               $termsStmt = DBA::p("SELECT DISTINCT(`term`) FROM `search`");
+
+               $tags = [];
+
+               while ($term = DBA::fetch($termsStmt)) {
+                       $tags[] = trim($term['term'], '#');
+               }
+
+               return $tags;
+       }
+}
index 4b3823f040d0e1db8f1f7dca070274bee68667fa..c575b44d38ea222593a6b20896fec42ee6d2753d 100644 (file)
@@ -91,12 +91,24 @@ class User
 
        /**
         * @param  integer       $uid
+        * @param array          $fields
         * @return array|boolean User record if it exists, false otherwise
         * @throws Exception
         */
-       public static function getById($uid)
+       public static function getById($uid, array $fields = [])
        {
-               return DBA::selectFirst('user', [], ['uid' => $uid]);
+               return DBA::selectFirst('user', $fields, ['uid' => $uid]);
+       }
+
+       /**
+        * @param  string        $nickname
+        * @param array          $fields
+        * @return array|boolean User record if it exists, false otherwise
+        * @throws Exception
+        */
+       public static function getByNickname($nickname, array $fields = [])
+       {
+               return DBA::selectFirst('user', $fields, ['nickname' => $nickname]);
        }
 
        /**
diff --git a/src/Module/HostMeta.php b/src/Module/HostMeta.php
deleted file mode 100644 (file)
index 21953b5..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Friendica\Module;
-
-use Friendica\BaseModule;
-use Friendica\Core\Renderer;
-use Friendica\Protocol\Salmon;
-use Friendica\Util\Crypto;
-
-/**
- * Prints the host-meta text
- */
-class HostMeta extends BaseModule
-{
-       public static function rawContent()
-       {
-               parent::rawContent();
-
-               self::printHostMeta();
-       }
-
-       /**
-        * Prints the host-meta output of this node
-        *
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        */
-       public static function printHostMeta()
-       {
-               $app = self::getApp();
-               $config = $app->getConfig();
-
-               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']);
-               }
-
-               $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'))]
-               );
-
-               exit();
-       }
-}
diff --git a/src/Module/NodeInfo.php b/src/Module/NodeInfo.php
new file mode 100644 (file)
index 0000000..7fad79f
--- /dev/null
@@ -0,0 +1,170 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\App;
+use Friendica\BaseModule;
+use Friendica\Core\Addon;
+use Friendica\Core\System;
+
+/**
+ * Standardized way of exposing metadata about a server running one of the distributed social networks.
+ * @see https://github.com/jhass/nodeinfo/blob/master/PROTOCOL.md
+ */
+class NodeInfo extends BaseModule
+{
+       /**
+        * Prints the Nodeinfo for a well-known request
+        *
+        * @param App $app
+        *
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       public static function printWellKnown(App $app)
+       {
+               $config = $app->getConfig();
+
+               if (!$config->get('system', 'nodeinfo')) {
+                       System::httpExit(404);
+               }
+
+               $nodeinfo = [
+                       'links' => [[
+                               'rel'  => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
+                               'href' => $app->getBaseURL() . '/nodeinfo/1.0']]
+               ];
+
+               header('Content-type: application/json; charset=utf-8');
+               echo json_encode($nodeinfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+               exit;
+       }
+
+       public static function init()
+       {
+               $app = self::getApp();
+               $config = $app->getConfig();
+
+               if (!$config->get('system', 'nodeinfo')) {
+                       System::httpExit(404);
+               }
+
+               if (($app->argc != 2) || ($app->argv[1] != '1.0')) {
+                       self::printWellKnown($app);
+               }
+       }
+
+       public static function rawContent()
+       {
+               $config = self::getApp()->getConfig();
+
+               $smtp = (function_exists('imap_open') && !$config->get('system', 'imap_disabled') && !$config->get('system', 'dfrn_only'));
+
+               $nodeinfo = [
+                       'version'           => 1.0,
+                       'software'          => [
+                               'name'    => 'friendica',
+                               'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
+                       ],
+                       'protocols'         => [
+                               'inbound'  => [
+                                       'friendica',
+                               ],
+                               'outbound' => [
+                                       'friendica',
+                               ],
+                       ],
+                       'services'          => [
+                               'inbound'  => [],
+                               'outbound' => [],
+                       ],
+                       'usage'             => [],
+                       'openRegistrations' => intval($config->get('config', 'register_policy')) !== Register::CLOSED,
+                       'metadata'          => [
+                               'nodeName' => $config->get('config', 'sitename'),
+                       ],
+               ];
+
+               if (!empty($config->get('system', 'diaspora_enabled'))) {
+                       $nodeinfo['protocols']['inbound'][] = 'diaspora';
+                       $nodeinfo['protocols']['outbound'][] = 'diaspora';
+               }
+
+               if (empty($config->get('system', 'ostatus_disabled'))) {
+                       $nodeinfo['protocols']['inbound'][] = 'gnusocial';
+                       $nodeinfo['protocols']['outbound'][] = 'gnusocial';
+               }
+
+               if (!empty($config->get('system', 'nodeinfo'))) {
+
+                       $nodeinfo['usage']['users'] = [
+                               'total'          => intval($config->get('nodeinfo', 'total_users')),
+                               'activeHalfyear' => intval($config->get('nodeinfo', 'active_users_halfyear')),
+                               'activeMonth'    => intval($config->get('nodeinfo', 'active_users_monthly'))
+                       ];
+                       $nodeinfo['usage']['localPosts'] = intval($config->get('nodeinfo', 'local_posts'));
+                       $nodeinfo['usage']['localComments'] = intval($config->get('nodeinfo', 'local_comments'));
+
+                       if (Addon::isEnabled('blogger')) {
+                               $nodeinfo['services']['outbound'][] = 'blogger';
+                       }
+                       if (Addon::isEnabled('dwpost')) {
+                               $nodeinfo['services']['outbound'][] = 'dreamwidth';
+                       }
+                       if (Addon::isEnabled('statusnet')) {
+                               $nodeinfo['services']['inbound'][] = 'gnusocial';
+                               $nodeinfo['services']['outbound'][] = 'gnusocial';
+                       }
+                       if (Addon::isEnabled('ijpost')) {
+                               $nodeinfo['services']['outbound'][] = 'insanejournal';
+                       }
+                       if (Addon::isEnabled('libertree')) {
+                               $nodeinfo['services']['outbound'][] = 'libertree';
+                       }
+                       if (Addon::isEnabled('buffer')) {
+                               $nodeinfo['services']['outbound'][] = 'linkedin';
+                       }
+                       if (Addon::isEnabled('ljpost')) {
+                               $nodeinfo['services']['outbound'][] = 'livejournal';
+                       }
+                       if (Addon::isEnabled('buffer')) {
+                               $nodeinfo['services']['outbound'][] = 'pinterest';
+                       }
+                       if (Addon::isEnabled('posterous')) {
+                               $nodeinfo['services']['outbound'][] = 'posterous';
+                       }
+                       if (Addon::isEnabled('pumpio')) {
+                               $nodeinfo['services']['inbound'][] = 'pumpio';
+                               $nodeinfo['services']['outbound'][] = 'pumpio';
+                       }
+
+                       if ($smtp) {
+                               $nodeinfo['services']['outbound'][] = 'smtp';
+                       }
+                       if (Addon::isEnabled('tumblr')) {
+                               $nodeinfo['services']['outbound'][] = 'tumblr';
+                       }
+                       if (Addon::isEnabled('twitter') || Addon::isEnabled('buffer')) {
+                               $nodeinfo['services']['outbound'][] = 'twitter';
+                       }
+                       if (Addon::isEnabled('wppost')) {
+                               $nodeinfo['services']['outbound'][] = 'wordpress';
+                       }
+                       $nodeinfo['metadata']['protocols'] = $nodeinfo['protocols'];
+                       $nodeinfo['metadata']['protocols']['outbound'][] = 'atom1.0';
+                       $nodeinfo['metadata']['protocols']['inbound'][] = 'atom1.0';
+                       $nodeinfo['metadata']['protocols']['inbound'][] = 'rss2.0';
+
+                       $nodeinfo['metadata']['services'] = $nodeinfo['services'];
+
+                       if (Addon::isEnabled('twitter')) {
+                               $nodeinfo['metadata']['services']['inbound'][] = 'twitter';
+                       }
+
+                       $nodeinfo['metadata']['explicitContent'] = $config->get('system', 'explicit_content', false) == true;
+               }
+
+               header('Content-type: application/json; charset=utf-8');
+               echo json_encode($nodeinfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+               exit;
+       }
+}
diff --git a/src/Module/Nodeinfo.php b/src/Module/Nodeinfo.php
deleted file mode 100644 (file)
index 18f2c72..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-namespace Friendica\Module;
-
-use Friendica\App;
-use Friendica\BaseModule;
-use Friendica\Core\Addon;
-use Friendica\Core\System;
-
-/**
- * Prints infos about the current node
- */
-class Nodeinfo extends BaseModule
-{
-       /**
-        * Prints the Nodeinfo for a well-known request
-        *
-        * @param App $app
-        *
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        */
-       public static function printWellKnown(App $app)
-       {
-               $config = $app->getConfig();
-
-               if (!$config->get('system', 'nodeinfo')) {
-                       System::httpExit(404);
-               }
-
-               $nodeinfo = [
-                       'links' => [[
-                               'rel'  => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
-                               'href' => $app->getBaseURL() . '/nodeinfo/1.0']]
-               ];
-
-               header('Content-type: application/json; charset=utf-8');
-               echo json_encode($nodeinfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-               exit;
-       }
-
-       public static function init()
-       {
-               $app = self::getApp();
-               $config = $app->getConfig();
-
-               if (!$config->get('system', 'nodeinfo')) {
-                       System::httpExit(404);
-               }
-
-               if (($app->argc != 2) || ($app->argv[1] != '1.0')) {
-                       System::httpExit(404);
-               }
-       }
-
-       public static function rawContent()
-       {
-               $config = self::getApp()->getConfig();
-
-               $smtp = (function_exists('imap_open') && !$config->get('system', 'imap_disabled') && !$config->get('system', 'dfrn_only'));
-
-               $nodeinfo = [
-                       'version'           => 1.0,
-                       'software'          => [
-                               'name'    => 'friendica',
-                               'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
-                       ],
-                       'protocols'         => [
-                               'inbound'  => [
-                                       'friendica',
-                               ],
-                               'outbound' => [
-                                       'friendica',
-                               ],
-                       ],
-                       'services'          => [
-                               'inbound'  => [],
-                               'outbound' => [],
-                       ],
-                       'usage'             => [],
-                       'openRegistrations' => intval($config->get('config', 'register_policy')) !== Register::CLOSED,
-                       'metadata'          => [
-                               'nodeName' => $config->get('config', 'sitename'),
-                       ],
-               ];
-
-               if (!empty($config->get('system', 'diaspora_enabled'))) {
-                       $nodeinfo['protocols']['inbound'][] = 'diaspora';
-                       $nodeinfo['protocols']['outbound'][] = 'diaspora';
-               }
-
-               if (empty($config->get('system', 'ostatus_disabled'))) {
-                       $nodeinfo['protocols']['inbound'][] = 'gnusocial';
-                       $nodeinfo['protocols']['outbound'][] = 'gnusocial';
-               }
-
-               if (!empty($config->get('system', 'nodeinfo'))) {
-
-                       $nodeinfo['usage']['users'] = [
-                               'total'          => intval($config->get('nodeinfo', 'total_users')),
-                               'activeHalfyear' => intval($config->get('nodeinfo', 'active_users_halfyear')),
-                               'activeMonth'    => intval($config->get('nodeinfo', 'active_users_monthly'))
-                       ];
-                       $nodeinfo['usage']['localPosts'] = intval($config->get('nodeinfo', 'local_posts'));
-                       $nodeinfo['usage']['localComments'] = intval($config->get('nodeinfo', 'local_comments'));
-
-                       if (Addon::isEnabled('blogger')) {
-                               $nodeinfo['services']['outbound'][] = 'blogger';
-                       }
-                       if (Addon::isEnabled('dwpost')) {
-                               $nodeinfo['services']['outbound'][] = 'dreamwidth';
-                       }
-                       if (Addon::isEnabled('statusnet')) {
-                               $nodeinfo['services']['inbound'][] = 'gnusocial';
-                               $nodeinfo['services']['outbound'][] = 'gnusocial';
-                       }
-                       if (Addon::isEnabled('ijpost')) {
-                               $nodeinfo['services']['outbound'][] = 'insanejournal';
-                       }
-                       if (Addon::isEnabled('libertree')) {
-                               $nodeinfo['services']['outbound'][] = 'libertree';
-                       }
-                       if (Addon::isEnabled('buffer')) {
-                               $nodeinfo['services']['outbound'][] = 'linkedin';
-                       }
-                       if (Addon::isEnabled('ljpost')) {
-                               $nodeinfo['services']['outbound'][] = 'livejournal';
-                       }
-                       if (Addon::isEnabled('buffer')) {
-                               $nodeinfo['services']['outbound'][] = 'pinterest';
-                       }
-                       if (Addon::isEnabled('posterous')) {
-                               $nodeinfo['services']['outbound'][] = 'posterous';
-                       }
-                       if (Addon::isEnabled('pumpio')) {
-                               $nodeinfo['services']['inbound'][] = 'pumpio';
-                               $nodeinfo['services']['outbound'][] = 'pumpio';
-                       }
-
-                       if ($smtp) {
-                               $nodeinfo['services']['outbound'][] = 'smtp';
-                       }
-                       if (Addon::isEnabled('tumblr')) {
-                               $nodeinfo['services']['outbound'][] = 'tumblr';
-                       }
-                       if (Addon::isEnabled('twitter') || Addon::isEnabled('buffer')) {
-                               $nodeinfo['services']['outbound'][] = 'twitter';
-                       }
-                       if (Addon::isEnabled('wppost')) {
-                               $nodeinfo['services']['outbound'][] = 'wordpress';
-                       }
-                       $nodeinfo['metadata']['protocols'] = $nodeinfo['protocols'];
-                       $nodeinfo['metadata']['protocols']['outbound'][] = 'atom1.0';
-                       $nodeinfo['metadata']['protocols']['inbound'][] = 'atom1.0';
-                       $nodeinfo['metadata']['protocols']['inbound'][] = 'rss2.0';
-
-                       $nodeinfo['metadata']['services'] = $nodeinfo['services'];
-
-                       if (Addon::isEnabled('twitter')) {
-                               $nodeinfo['metadata']['services']['inbound'][] = 'twitter';
-                       }
-
-                       $nodeinfo['metadata']['explicitContent'] = $config->get('system', 'explicit_content', false) == true;
-               }
-
-               header('Content-type: application/json; charset=utf-8');
-               echo json_encode($nodeinfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-               exit;
-       }
-}
diff --git a/src/Module/WebFinger.php b/src/Module/WebFinger.php
new file mode 100644 (file)
index 0000000..d456c6a
--- /dev/null
@@ -0,0 +1,235 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Model\User;
+use Friendica\Network\Probe;
+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 content()
+       {
+               parent::content();
+
+               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();
+               }
+
+               $output = '<div class="generic-page-wrapper">';
+               $output .= '<h3>Webfinger Diagnostic</h3>';
+
+               $output .= '<form action="webfinger" method="get">';
+               $output .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . defaults($_GET, 'addr', '') . '" />';
+               $output .= '<input type="submit" name="submit" value="Submit" /></form>';
+
+               $output .= '<br /><br />';
+
+               if (!empty($_GET['addr'])) {
+                       $addr = trim($_GET['addr']);
+                       $res = Probe::lrdd($addr);
+                       $output .= '<pre>';
+                       $output .= str_replace("\n", '<br />', print_r($res, true));
+                       $output .= '</pre>';
+               }
+               $output .= '</div>';
+
+               return $output;
+       }
+
+       public static function rawContent()
+       {
+               parent::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();
+       }
+}
diff --git a/src/Module/WellKnown/HostMeta.php b/src/Module/WellKnown/HostMeta.php
new file mode 100644 (file)
index 0000000..282781a
--- /dev/null
@@ -0,0 +1,42 @@
+<?php
+
+namespace Friendica\Module\WellKnown;
+
+use Friendica\BaseModule;
+use Friendica\Core\Renderer;
+use Friendica\Protocol\Salmon;
+use Friendica\Util\Crypto;
+
+/**
+ * Prints the metadata for describing this host
+ * @see https://tools.ietf.org/html/rfc6415
+ */
+class HostMeta extends BaseModule
+{
+       public static function rawContent()
+       {
+               parent::rawContent();
+
+               $app = self::getApp();
+               $config = $app->getConfig();
+
+               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']);
+               }
+
+               $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'))]
+               );
+
+               exit();
+       }
+}
diff --git a/src/Module/WellKnown/XSocialRelay.php b/src/Module/WellKnown/XSocialRelay.php
new file mode 100644 (file)
index 0000000..5766a8c
--- /dev/null
@@ -0,0 +1,62 @@
+<?php
+
+namespace Friendica\Module\WellKnown;
+
+use Friendica\BaseModule;
+use Friendica\Model\Search;
+
+/**
+ * Node subscription preferences for social realy systems
+ * @see https://git.feneas.org/jaywink/social-relay/blob/master/docs/relays.md
+ */
+class XSocialRelay extends BaseModule
+{
+       public static function rawContent()
+       {
+               parent::rawContent();
+
+               $app = self::getApp();
+               $config = $app->getConfig();
+
+               $subscribe = $config->get('system', 'relay_subscribe', false);
+
+               if ($subscribe) {
+                       $scope = $config->get('system', 'relay_scope', SR_SCOPE_ALL);
+               } else {
+                       $scope = SR_SCOPE_NONE;
+               }
+
+               $systemTags = [];
+               $userTags = [];
+
+               if ($scope == SR_SCOPE_TAGS) {
+                       $server_tags = $config->get('system', 'relay_server_tags');
+                       $tagitems = explode(",", $server_tags);
+
+                       /// @todo Check if it was better to use "strtolower" on the tags
+                       foreach ($tagitems AS $tag) {
+                               $systemTags[] = trim($tag, "# ");
+                       }
+
+                       if ($config->get('system', 'relay_user_tags')) {
+                               $userTags = Search::getUserTags();
+                       }
+               }
+
+               $tagList = array_unique(array_merge($systemTags, $userTags));
+
+               $relay = [
+                       'subscribe' => $subscribe,
+                       'scope'     => $scope,
+                       'tags'      => $tagList,
+                       'protocols' => ['diaspora' =>
+                                                               ['receive' => $app->getBaseURL() . '/receive/public'],
+                                                       'dfrn'     =>
+                                                               ['receive' => $app->getBaseURL() . '/dfrn_notify']]
+               ];
+
+               header('Content-type: application/json; charset=utf-8');
+               echo json_encode($relay, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+               exit;
+       }
+}