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

[PLUGIN][ActivityPub][Inbox] Improve logs

This commit is contained in:
Diogo Peralta Cordeiro 2022-02-17 22:47:37 +00:00
parent 99f7e7cd79
commit 52ae5fa690
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ActivityPub/ActivityPub.php
View File

@ -389,7 +389,7 @@ class ActivityPub extends Plugin
return Event::next; return Event::next;
} }
} catch (Exception $e) { } catch (Exception $e) {
Log::error('ActivityPub Webfinger Mention check failed: ' . $e->getMessage()); Log::error('ActivityPub Webfinger Mention check failed.', [$e]);
return Event::next; return Event::next;
} }
} }

13
plugins/ActivityPub/Controller/Inbox.php
View File

@ -67,7 +67,11 @@ class Inbox extends Controller
{ {
$error = function (string $m, ?Exception $e = null): TypeResponse { $error = function (string $m, ?Exception $e = null): TypeResponse {
Log::error('ActivityPub Error Answer: ' . ($json = json_encode(['error' => $m, 'exception' => var_export($e, true)]))); Log::error('ActivityPub Error Answer: ' . ($json = json_encode(['error' => $m, 'exception' => var_export($e, true)])));
return new TypeResponse($json, 400); if (is_null($e)) {
return new TypeResponse($json, 400);
} else {
throw $e;
}
}; };
$path = Router::url('activitypub_inbox', type: Router::ABSOLUTE_PATH); $path = Router::url('activitypub_inbox', type: Router::ABSOLUTE_PATH);
@ -76,7 +80,7 @@ class Inbox extends Controller
$user = DB::findOneBy('local_user', ['id' => $gsactor_id]); $user = DB::findOneBy('local_user', ['id' => $gsactor_id]);
$path = Router::url('activitypub_actor_inbox', ['gsactor_id' => $user->getId()], type: Router::ABSOLUTE_PATH); $path = Router::url('activitypub_actor_inbox', ['gsactor_id' => $user->getId()], type: Router::ABSOLUTE_PATH);
} catch (Exception $e) { } catch (Exception $e) {
throw new ClientException(_m('No such actor.'), 404, $e); throw new ClientException(_m('No such actor.'), 404, previous: $e);
} }
} }
@ -107,7 +111,7 @@ class Inbox extends Controller
$actor_public_key = $activitypub_rsa->getPublicKey(); $actor_public_key = $activitypub_rsa->getPublicKey();
$headers = $this->request->headers->all(); $headers = $this->request->headers->all();
Log::debug('ActivityPub Inbox: Request Headers: ' . var_export($headers, true)); Log::debug('ActivityPub Inbox: Request Headers.', [$headers]);
// Flattify headers // Flattify headers
foreach ($headers as $key => $val) { foreach ($headers as $key => $val) {
$headers[$key] = $val[0]; $headers[$key] = $val[0];
@ -121,9 +125,8 @@ class Inbox extends Controller
// Extract the signature properties // Extract the signature properties
$signatureData = HTTPSignature::parseSignatureHeader($headers['signature']); $signatureData = HTTPSignature::parseSignatureHeader($headers['signature']);
Log::debug('ActivityPub Inbox: HTTP Signature Data: ' . print_r($signatureData, true)); Log::debug('ActivityPub Inbox: HTTP Signature Data.', [$signatureData]);
if (isset($signatureData['error'])) { if (isset($signatureData['error'])) {
Log::debug('ActivityPub Inbox: HTTP Signature: ' . json_encode($signatureData, \JSON_PRETTY_PRINT));
return $error(json_encode($signatureData, \JSON_PRETTY_PRINT)); return $error(json_encode($signatureData, \JSON_PRETTY_PRINT));
} }