From c824f06cae63f936b1e8cc0b608ed5a70573b136 Mon Sep 17 00:00:00 2001 From: freamon Date: Tue, 21 Jan 2025 20:16:39 +0000 Subject: [PATCH 1/2] Move the Monitor for nodebb bug to a better place --- app/activitypub/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/activitypub/routes.py b/app/activitypub/routes.py index f9f57bb6..2ad0bc69 100644 --- a/app/activitypub/routes.py +++ b/app/activitypub/routes.py @@ -420,7 +420,6 @@ def shared_inbox(): object = request_json['object'] if not 'actor' in object: missing_actor_in_announce_object = True - log_incoming_ap(id, APLOG_ANNOUNCE, APLOG_MONITOR, request_json, 'Actor is missing in Announce object') if not 'id' in object or not 'type' in object or not 'object' in object: if 'type' in object and (object['type'] == 'Page' or object['type'] == 'Note'): log_incoming_ap(id, APLOG_ANNOUNCE, APLOG_IGNORED, saved_json, 'Intended for Mastodon') @@ -507,6 +506,7 @@ def shared_inbox(): if ((request_json['object']['type'] == 'Create' or request_json['object']['type']) and 'attributedTo' in request_json['object']['object'] and isinstance(request_json['object']['object']['attributedTo'], str)): request_json['object']['actor'] = request_json['object']['object']['attributedTo'] + log_incoming_ap(id, APLOG_ANNOUNCE, APLOG_MONITOR, request_json, 'nodebb: Actor is missing in the Create') if current_app.debug: process_inbox_request(request_json, store_ap_json) From 7bc14cffd2544da612ff83e38d09003a50378445 Mon Sep 17 00:00:00 2001 From: freamon Date: Tue, 21 Jan 2025 20:36:23 +0000 Subject: [PATCH 2/2] nodebb: log bad activity before fixing it --- app/activitypub/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/activitypub/routes.py b/app/activitypub/routes.py index 2ad0bc69..6108bd25 100644 --- a/app/activitypub/routes.py +++ b/app/activitypub/routes.py @@ -505,8 +505,8 @@ def shared_inbox(): if missing_actor_in_announce_object: if ((request_json['object']['type'] == 'Create' or request_json['object']['type']) and 'attributedTo' in request_json['object']['object'] and isinstance(request_json['object']['object']['attributedTo'], str)): - request_json['object']['actor'] = request_json['object']['object']['attributedTo'] log_incoming_ap(id, APLOG_ANNOUNCE, APLOG_MONITOR, request_json, 'nodebb: Actor is missing in the Create') + request_json['object']['actor'] = request_json['object']['object']['attributedTo'] if current_app.debug: process_inbox_request(request_json, store_ap_json)