nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3670 from annando/json-webfinger

Browse source 
Support for JSON based webfinger
This commit is contained in:
Tobias Diekershoff 2017-08-30 08:31:30 +02:00 committed by GitHub
parent 51a070ecf3 157473e4f6
commit 0fa84d01b0
4 changed files with 63 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
mod/xrd.php
View file

@ -6,11 +6,20 @@ use Friendica\Core\System;
require_once('include/crypto.php');
function xrd_init(App $a) {
if ($a->argv[0] == 'xrd') {
$uri = urldecode(notags(trim($_GET['uri'])));
if ($uri == "") {
if ($_SERVER['HTTP_ACCEPT'] == 'application/jrd+json') {
$mode = 'json';
} else {
$mode = 'xml';
}
} else {
$uri = urldecode(notags(trim($_GET['resource'])));
if ($_SERVER['HTTP_ACCEPT'] == 'application/xrd+xml') {
$mode = 'xml';
} else {
$mode = 'json';
}
}
if(substr($uri,0,4) === 'http') {
@ -30,26 +39,11 @@ function xrd_init(App $a) {
killme();
}
$salmon_key = salmon_key($r['spubkey']);
header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml");
$tpl = get_markup_template('xrd_diaspora.tpl');
$dspr = replace_macros($tpl,array(
'$baseurl' => System::baseUrl(),
'$dspr_guid' => $r['guid'],
'$dspr_key' => base64_encode(pemtorsa($r['pubkey']))
));
$tpl = get_markup_template('xrd_person.tpl');
$profile_url = System::baseUrl().'/profile/'.$r['nickname'];
if ($acct) {
$alias = $profile_url;
}
else {
} else {
$alias = 'acct:'.$r['nickname'].'@'.$a->get_hostname();
if ($a->get_path()) {
@ -57,6 +51,46 @@ function xrd_init(App $a) {
}
}
if ($mode == 'xml') {
xrd_xml($a, $uri, $alias, $profile_url, $r);
} else {
xrd_json($a, $uri, $alias, $profile_url, $r);
}
}
function xrd_json($a, $uri, $alias, $profile_url, $r) {
$salmon_key = salmon_key($r['spubkey']);
header('Access-Control-Allow-Origin: *');
header("Content-type: application/json; charset=utf-8");
$json = array('subject' => $uri,
'aliases' => array($alias),
'links' => array(array('rel' => NAMESPACE_DFRN, 'href' => $profile_url),
array('rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']),
array('rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url),
array('rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']),
array('rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']),
array('rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'),
array('rel' => 'http://joindiaspora.com/seed_location', 'type' => 'text/html', 'href' => System::baseUrl()),
array('rel' => 'salmon', 'href' => System::baseUrl().'/salmon/'.$r['nickname']),
array('rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => System::baseUrl().'/salmon/'.$r['nickname']),
array('rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'),
array('rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'),
array('rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key)
));
echo json_encode($json);
killme();
}
function xrd_xml($a, $uri, $alias, $profile_url, $r) {
$salmon_key = salmon_key($r['spubkey']);
header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml");
$tpl = get_markup_template('xrd_person.tpl');
$o = replace_macros($tpl, array(
'$nick' => $r['nickname'],
'$accturi' => $uri,
@ -67,19 +101,16 @@ function xrd_init(App $a) {
'$zot_post' => System::baseUrl() . '/post/' . $r['nickname'],
'$poco_url' => System::baseUrl() . '/poco/' . $r['nickname'],
'$photo' => System::baseUrl() . '/photo/profile/' . $r['uid'] . '.jpg',
'$dspr' => $dspr,
'$baseurl' => System::baseUrl(),
'$salmon' => System::baseUrl() . '/salmon/' . $r['nickname'],
'$salmen' => System::baseUrl() . '/salmon/' . $r['nickname'] . '/mention',
'$subscribe' => System::baseUrl() . '/follow?url={uri}',
'$modexp' => 'data:application/magic-public-key,' . $salmon_key,
'$bigkey' => salmon_key($r['pubkey']),
));
$arr = array('user' => $r, 'xml' => $o);
call_hooks('personal_xrd', $arr);
echo $arr['xml'];
killme();
}

4
view/templates/xrd_diaspora.tpl
View file

@ -1,4 +0,0 @@
<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />

3
view/templates/xrd_host.tpl
View file

@ -4,7 +4,8 @@
<hm:Host>{{$zhost}}</hm:Host>
<Link rel='lrdd' type='application/xrd+xml' template='{{$domain}}/xrd/?uri={uri}' />
<Link rel='lrdd' type='application/xrd+xml' template='{{$domain}}/xrd?uri={uri}' />
<Link rel='lrdd' type='application/json' template='{{$domain}}/.well-known/webfinger?resource={uri}' />
<Link rel='acct-mgmt' href='{{$domain}}/amcd' />
<Link rel='http://services.mozilla.com/amcd/0.1' href='{{$domain}}/amcd' />
<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml"

10
view/templates/xrd_person.tpl
View file

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Subject>{{$accturi}}</Subject>
@ -21,7 +20,9 @@
<Link rel="http://webfinger.net/rel/avatar"
type="image/jpeg"
href="{{$photo}}" />
{{$dspr}}
<Link rel="http://joindiaspora.com/seed_location"
type="text/html"
href="{{$baseurl}}/" />
<Link rel="salmon"
href="{{$salmon}}" />
<Link rel="http://salmon-protocol.org/ns/salmon-replies"
@ -32,9 +33,4 @@
template="{{$subscribe}}" />
<Link rel="magic-public-key"
href="{{$modexp}}" />
<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
type="http://salmon-protocol.org/ns/magic-key"
mk:key_id="1">{{$bigkey}}</Property>
</XRD>