GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[ActivityPub][Inbox] With PHP 7.3 we don't need get_all_headers workaround anymore

Browse Source 
Furthermore, it was broken on Apache2 because the actual function
doesn't put the resulting array's key in lowercase.
This commit is contained in:
Diogo Cordeiro 2020-06-26 14:08:47 +01:00 committed by Diogo Peralta Cordeiro
parent ad6955e7ff
commit c7e1352618
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/ActivityPub/actions/apinbox.php
View File

@ -90,16 +90,16 @@ class apInboxAction extends ManagedAction
common_debug('ActivityPub Inbox: HTTP Signature: Validation will now start!'); common_debug('ActivityPub Inbox: HTTP Signature: Validation will now start!');
$headers = $this->get_all_headers(); $headers = getallheaders();
common_debug('ActivityPub Inbox: Request Headers: ' . print_r($headers, true)); common_debug('ActivityPub Inbox: Request Headers: ' . print_r($headers, true));
if (!isset($headers['signature'])) { if (!isset($headers['Signature'])) {
common_debug('ActivityPub Inbox: HTTP Signature: Missing Signature header.'); common_debug('ActivityPub Inbox: HTTP Signature: Missing Signature header.');
ActivityPubReturn::error('Missing Signature header.', 400); ActivityPubReturn::error('Missing Signature header.', 400);
} }
// Extract the signature properties // Extract the signature properties
$signatureData = HTTPSignature::parseSignatureHeader($headers['signature']); $signatureData = HTTPSignature::parseSignatureHeader($headers['Signature']);
common_debug('ActivityPub Inbox: HTTP Signature Data: ' . print_r($signatureData, true)); common_debug('ActivityPub Inbox: HTTP Signature Data: ' . print_r($signatureData, true));
if (isset($signatureData['error'])) { if (isset($signatureData['error'])) {
common_debug('ActivityPub Inbox: HTTP Signature: ' . json_encode($signatureData, true)); common_debug('ActivityPub Inbox: HTTP Signature: ' . json_encode($signatureData, true));
@ -141,26 +141,4 @@ class apInboxAction extends ManagedAction
ActivityPubReturn::error($e->getMessage()); ActivityPubReturn::error($e->getMessage());
} }
} }
/**
* Get all HTTP header key/values as an associative array for the current request.
*
* @return array [string] The HTTP header key/value pairs.
* @author PHP Manual Contributed Notes <joyview@gmail.com>
*/
private function get_all_headers()
{
// If we're running on an Apache2 webserver
if (function_exists('getallheaders')) {
return getallheaders();
}
// Otherwise, do it manually.
$headers = [];
foreach ($_SERVER as $name => $value) {
if (substr($name, 0, 5) == 'HTTP_') {
$headers[strtolower(str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5))))))] = $value;
}
}
return $headers;
}
} }