harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide root discovery for owa

Browse Source
This commit is contained in:
zotlabs 2017-09-07 20:42:03 -07:00
parent 048a8c5f44
commit f2dc55244c
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Zotlabs/Module/Wfinger.php
View File

@ -30,9 +30,15 @@ class Wfinger extends \Zotlabs\Web\Controller {
$resource = $_REQUEST['resource']; $resource = $_REQUEST['resource'];
logger('webfinger: ' . $resource,LOGGER_DEBUG); logger('webfinger: ' . $resource,LOGGER_DEBUG);
$root_resource = false;
if(strcasecmp(rtrim($resource,'/'),z_root()) === 0)
$root_resource = true;
$r = null; $r = null;
if($resource) { if(($resource) && (! $root_resource)) {
if(strpos($resource,'acct:') === 0) { if(strpos($resource,'acct:') === 0) {
$channel = str_replace('acct:','',$resource); $channel = str_replace('acct:','',$resource);
@ -60,7 +66,25 @@ class Wfinger extends \Zotlabs\Web\Controller {
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
if($root_resource) {
$result['subject'] = $resource;
$result['properties'] = [
'https://w3id.org/security/v1#publicKeyPem' => get_config('system','pubkey')
];
$result['links'] = [
[
'rel' => 'http://purl.org/openwebauth/v1',
'type' => 'application/x-zot+json',
'href' => z_root() . '/owa',
],
];
}
if($resource && $r) { if($resource && $r) {
$h = q("select hubloc_addr from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0", $h = q("select hubloc_addr from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0",
@ -84,7 +108,8 @@ class Wfinger extends \Zotlabs\Web\Controller {
$result['properties'] = [ $result['properties'] = [
'http://webfinger.net/ns/name' => $r[0]['channel_name'], 'http://webfinger.net/ns/name' => $r[0]['channel_name'],
'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name'] 'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name'],
'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey']
]; ];
foreach($aliases as $alias) foreach($aliases as $alias)
@ -143,14 +168,16 @@ class Wfinger extends \Zotlabs\Web\Controller {
$result['zot'] = zotinfo( [ 'address' => $r[0]['xchan_addr'] ]); $result['zot'] = zotinfo( [ 'address' => $r[0]['xchan_addr'] ]);
} }
} }
else {
if(! $result) {
header($_SERVER["SERVER_PROTOCOL"] . ' ' . 400 . ' ' . 'Bad Request'); header($_SERVER["SERVER_PROTOCOL"] . ' ' . 400 . ' ' . 'Bad Request');
killme(); killme();
} }
$arr = [ 'channel' => $r[0], 'request' => $_REQUEST, 'result' => $result ]; $arr = [ 'channel' => $r[0], 'request' => $_REQUEST, 'result' => $result ];
call_hooks('webfinger',$arr); call_hooks('webfinger',$arr);
json_return_and_die($arr['result'],'application/jrd+json'); json_return_and_die($arr['result'],'application/jrd+json');
} }