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

pleroma does not return a valid JRD when given an accept header of application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint)

Browse Source
This commit is contained in:
zotlabs 2018-05-20 19:18:39 -07:00
parent 8611e7f8a6
commit ac8706e919
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/network.php
View File

@ -1216,7 +1216,7 @@ function webfinger_rfc7033($webbie, $zot = false) {
if(strpos($webbie,'@')) { if(strpos($webbie,'@')) {
$lhs = substr($webbie,0,strpos($webbie,'@')); $lhs = substr($webbie,0,strpos($webbie,'@'));
$rhs = substr($webbie,strpos($webbie,'@')+1); $rhs = substr($webbie,strpos($webbie,'@')+1);
$resource = 'acct:' . $webbie; $resource = urlencode('acct:' . $webbie);
} }
else { else {
$m = parse_url($webbie); $m = parse_url($webbie);
@ -1234,7 +1234,7 @@ function webfinger_rfc7033($webbie, $zot = false) {
$counter = 0; $counter = 0;
$s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''), $s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''),
false, $counter, [ 'headers' => [ 'Accept: application/jrd+json, */*' ] ]); false, $counter, [ 'headers' => [ 'Accept: application/jrd+json, application/json, */*' ] ]);
if($s['success']) { if($s['success']) {
$j = json_decode($s['body'], true); $j = json_decode($s['body'], true);