forked from grumpydevelop/federator
remove key-files (don't belong in git) and minor cleanup
This commit is contained in:
parent
352377887c
commit
10a3b1e0f9
4 changed files with 3 additions and 40 deletions
|
@ -1,14 +0,0 @@
|
||||||
-----BEGIN PUBLIC KEY-----
|
|
||||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArTNHQL76ZuM7meWvtfHC
|
|
||||||
DOAivi9D4m2u3JdgN2R/cMa4+U4jURVJ1BZBesVkW8bS7AhBpFjAOUSNDsvsB7Yf
|
|
||||||
mxUa8vKD7GgTLQPUhP10EeEZz+R/onDlTU7TCDVd1PDdQwlx/2aT+m7K2KwmnOC5
|
|
||||||
ZUO0jO7EtXn4qhA1qt8oRFRogQlzvMbLr6lYhkomBxn4XqezbtDw+HQjJ2Af5ECR
|
|
||||||
+tElbkEZWpEG/fwJvv1hhqqDToloOkK2YhMTiOZFesafH+AFQq1pYx6hFoa6TIkG
|
|
||||||
8aLoLuPY+IBZqXtPLyh1cIiBYqAiyo0lIHjtKjWnPbXhu83EZ3VOvpbopYonSCOX
|
|
||||||
0uHsbf1fn9NGhe5TSSxbz0SAGJgZTr2VvHinqZ0k3me4CS/HUzkvOtMdVtwJdqLp
|
|
||||||
N/pUfGRjeiDbO5JvOMrimUP3klVB54Nf0IIw7aMhD3yO7KGoxRIV89H6i5TJF3zY
|
|
||||||
WeirON6ejHapNw6WCWL7YY5WDsGuiMIuAcfwYAcsaqaKYktjqJZT1hejJNVqLhSU
|
|
||||||
ZaVBcl56/VO9lPoC8u7NXFfnT4h3bIfL8Ft3riabQzFSMXjLI2Q27BG7R5xNEo+u
|
|
||||||
aG2STkjKam/+q5VeUnpg1F0HBz/QuZ+GcsItD8uN+IjN9yZhJjryRwhn2KcaPIYz
|
|
||||||
upOsIXACYAm0kfqNRK5qdwECAwEAAQ==
|
|
||||||
-----END PUBLIC KEY-----
|
|
|
@ -1,14 +0,0 @@
|
||||||
-----BEGIN PUBLIC KEY-----
|
|
||||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA6kZOjPKQjQIo5dugu80e
|
|
||||||
gsQXPkWhGjSUgbJ5UNwcyFto4p2euhVqVnTVOCWeS9+dPQP14fuVowODceaZLmGg
|
|
||||||
sBqraBZ4FNb76ByBdfiqDmPvUP61hrdDCZ52IPMYq7e3knWVakGouSqyoa/TVf3l
|
|
||||||
5oa7qgYnRDvHQXkA51Dj/1BqW57WeBQzEd5nwFhhAKZuVLxC/+xEu6Ohf+6WC2qR
|
|
||||||
Dz/toI26A3QrMCgmt21ELxjTyNmUdTL6U8PjutiMZJ2sy5uhR7stRNzoWt0AnRJE
|
|
||||||
1NlwPU8tKpfXAv00zxTS4xuLt0zv2lNSSRfECeM2g86fXuhMB0NYd30Mgda+Svbu
|
|
||||||
MEFvOkB5xEAi1NRamETV9Ci/LBqShC1ZBcY5QdikH4S0awIsQA3YMsK0y4+gCY1S
|
|
||||||
oHwFjR+KhiGKBa4NaKsfFy3JL5OB6+8PF6z2ICbD26X1jJy9ScLHrljd/AKVNtXE
|
|
||||||
Jaz2NDrqmqdjCILxROTle5aNnOfpaAMmiszIWmZNuCWRBbrpVXPeOR3D+qLEld3u
|
|
||||||
z2l/i2ywfNtt0VrMhKMWjT99aPOHyMvInuZGYx2RVhzYyf5h3V6FCoD67ihInbCa
|
|
||||||
SfDGHKhEa6gQaIIZi2EfY2QbYbZG/4gX9BHfUlTYMoFgW5P2qS1c27tTi/1LkJKx
|
|
||||||
CZWiL/7VWZ/nx94SQPL76k0CAwEAAQ==
|
|
||||||
-----END PUBLIC KEY-----
|
|
|
@ -204,20 +204,17 @@ class Api extends Main
|
||||||
$signatureHeader = $headers['Signature'] ?? null;
|
$signatureHeader = $headers['Signature'] ?? null;
|
||||||
|
|
||||||
if (!isset($signatureHeader)) {
|
if (!isset($signatureHeader)) {
|
||||||
http_response_code(400);
|
|
||||||
throw new Exceptions\PermissionDenied("Missing Signature header");
|
throw new Exceptions\PermissionDenied("Missing Signature header");
|
||||||
}
|
}
|
||||||
|
|
||||||
$config = $this->getConfig();
|
|
||||||
|
|
||||||
// Parse Signature header
|
// Parse Signature header
|
||||||
preg_match_all('/(\w+)=["\']?([^"\',]+)["\']?/', $signatureHeader, $matches);
|
preg_match_all('/(\w+)=["\']?([^"\',]+)["\']?/', $signatureHeader, $matches);
|
||||||
$signatureParts = array_combine($matches[1], $matches[2]);
|
$signatureParts = array_combine($matches[1], $matches[2]);
|
||||||
|
|
||||||
$signature = base64_decode($signatureParts['signature']);
|
$signature = base64_decode($signatureParts['signature']);
|
||||||
$signedHeaders = explode(' ', $signatureParts['headers']);
|
$signedHeaders = explode(' ', $signatureParts['headers']);
|
||||||
if (isset($headers['X-Sender']) && $headers['X-Sender'] === $config['keys']['headerSenderName']) {
|
if (isset($headers['X-Sender']) && $headers['X-Sender'] === $this->config['keys']['headerSenderName']) {
|
||||||
$pKeyPath = $_SERVER['DOCUMENT_ROOT'] . $config['keys']['contentnationPublicKeyPath'];
|
$pKeyPath = $_SERVER['DOCUMENT_ROOT'] . $this->config['keys']['contentnationPublicKeyPath'];
|
||||||
$publicKeyPem = file_get_contents($pKeyPath);
|
$publicKeyPem = file_get_contents($pKeyPath);
|
||||||
} else {
|
} else {
|
||||||
$keyId = $signatureParts['keyId'];
|
$keyId = $signatureParts['keyId'];
|
||||||
|
@ -226,7 +223,6 @@ class Api extends Main
|
||||||
[$publicKeyData, $info] = \Federator\Main::getFromRemote($keyId, ['Accept: application/activity+json']);
|
[$publicKeyData, $info] = \Federator\Main::getFromRemote($keyId, ['Accept: application/activity+json']);
|
||||||
|
|
||||||
if ($info['http_code'] != 200) {
|
if ($info['http_code'] != 200) {
|
||||||
http_response_code(500);
|
|
||||||
throw new Exceptions\PermissionDenied("Failed to fetch public key from keyId: $keyId");
|
throw new Exceptions\PermissionDenied("Failed to fetch public key from keyId: $keyId");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
namespace Federator\Api\FedUsers;
|
namespace Federator\Api\FedUsers;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* handle activitypub outbox requests
|
* handle activitypub inbox requests
|
||||||
*/
|
*/
|
||||||
class Inbox implements \Federator\Api\FedUsers\FedUsersInterface
|
class Inbox implements \Federator\Api\FedUsers\FedUsersInterface
|
||||||
{
|
{
|
||||||
|
@ -72,11 +72,6 @@ class Inbox implements \Federator\Api\FedUsers\FedUsersInterface
|
||||||
// Shared inbox
|
// Shared inbox
|
||||||
if (!isset($_user)) {
|
if (!isset($_user)) {
|
||||||
$rootDir = $_SERVER['DOCUMENT_ROOT'] . '../';
|
$rootDir = $_SERVER['DOCUMENT_ROOT'] . '../';
|
||||||
file_put_contents(
|
|
||||||
$rootDir . 'logs/inbox.log',
|
|
||||||
date('Y-m-d H:i:s') . ": ==== WILL TRY WORK WITH ACTIVITY ====\n" . json_encode($activity, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT) . "\n\n",
|
|
||||||
FILE_APPEND
|
|
||||||
);
|
|
||||||
|
|
||||||
// Save the raw input and parsed JSON to a file for inspection
|
// Save the raw input and parsed JSON to a file for inspection
|
||||||
file_put_contents(
|
file_put_contents(
|
||||||
|
|
Loading…
Add table
Reference in a new issue