friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #10950 from friendica/issue-10947 

Issue 10947: Send correct accept-header for AP
This commit is contained in:
Hypolite Petovan 2021-11-03 15:48:19 -04:00 committed by GitHub
parent 72a500ea08 1219a4d00e
commit 9f411b0c76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Protocol/ActivityPub.php
View File

@ -21,6 +21,7 @@
namespace Friendica\Protocol;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Model\APContact;
use Friendica\Model\User;
@ -80,9 +81,15 @@ class ActivityPub
*/
public static function isRequest()
{
return stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
$isrequest = stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/json') ||
stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');
if ($isrequest) {
Logger::debug('Is AP request', ['accept' => $_SERVER['HTTP_ACCEPT'], 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
}
return $isrequest;
}
/**

11
src/Protocol/ActivityPub/Receiver.php
View File

@ -68,17 +68,6 @@ class Receiver
const TARGET_ANSWER = 6;
const TARGET_GLOBAL = 7;
/**
* Checks if the web request is done for the AP protocol
*
* @return bool is it AP?
*/
public static function isRequest()
{
return stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');
}
/**
* Checks incoming message from the inbox
*

2
src/Util/HTTPSignature.php
View File

@ -417,7 +417,7 @@ class HTTPSignature
* @return \Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses CurlResult
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => ['application/activity+json', 'application/ld+json']])
public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => ['application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"']])
{
$header = [];