keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6277 from annando/nextcloud-ap

Browse source 
Fix ActivityPub with Nextcloud
This commit is contained in:
Hypolite Petovan 2018-12-17 15:28:22 -05:00 committed by GitHub
commit f413abb82b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Module/Inbox.php
View file

@ -9,6 +9,7 @@ use Friendica\Protocol\ActivityPub;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Util\HTTPSignature; use Friendica\Util\HTTPSignature;
use Friendica\Core\Logger;
/** /**
* ActivityPub Inbox * ActivityPub Inbox

2
src/Util/HTTPSignature.php
View file

@ -204,6 +204,8 @@ class HTTPSignature
if (preg_match('/algorithm="(.*?)"/ism', $header, $matches)) { if (preg_match('/algorithm="(.*?)"/ism', $header, $matches)) {
$ret['algorithm'] = $matches[1]; $ret['algorithm'] = $matches[1];
} else {
$ret['algorithm'] = 'rsa-sha256';
} }
if (preg_match('/headers="(.*?)"/ism', $header, $matches)) { if (preg_match('/headers="(.*?)"/ism', $header, $matches)) {