From 5a13e4b362da42951ba512399f720c10c385c07f Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Tue, 10 Jul 2018 01:06:32 +0200 Subject: [PATCH] Tombstome handling (#23) * Better Delete handling * Tweak the tombstone support * More work on Tombstone handling --- activitypub.py | 16 ++++++++++++++++ app.py | 27 +++++++++++++++------------ 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/activitypub.py b/activitypub.py index b30a98c..336ede5 100644 --- a/activitypub.py +++ b/activitypub.py @@ -24,6 +24,7 @@ from little_boxes import activitypub as ap from little_boxes import strtobool from little_boxes.activitypub import _to_list from little_boxes.backend import Backend +from little_boxes.errors import ActivityGoneError from little_boxes.errors import Error from utils.media import Kind @@ -150,6 +151,8 @@ class MicroblogPubBackend(Backend): iri = iri.replace("/activity", "") is_a_note = True data = DB.activities.find_one({"box": Box.OUTBOX.value, "remote_id": iri}) + if data and data["meta"]["deleted"]: + raise ActivityGoneError(f"{iri} is gone") if data and is_a_note: return data["activity"]["object"] elif data: @@ -158,6 +161,8 @@ class MicroblogPubBackend(Backend): # Check if the activity is stored in the inbox data = DB.activities.find_one({"remote_id": iri}) if data: + if data["meta"]["deleted"]: + raise ActivityGoneError(f"{iri} is gone") return data["activity"] # Fetch the URL via HTTP @@ -305,6 +310,12 @@ class MicroblogPubBackend(Backend): ).get_object() logger.info(f"inbox_delete handle_replies obj={obj!r}") + + # Fake a Undo so any related Like/Announce doesn't appear on the web UI + DB.activities.update( + {"meta.object.id": obj.id}, + {"$set": {"meta.undo": True, "meta.exta": "object deleted"}}, + ) if obj: self._handle_replies_delete(as_actor, obj) @@ -325,6 +336,11 @@ class MicroblogPubBackend(Backend): )["activity"] ).get_object() + DB.activities.update( + {"meta.object.id": obj.id}, + {"$set": {"meta.undo": True, "meta.exta": "object deleted"}}, + ) + self._handle_replies_delete(as_actor, obj) @ensure_it_is_me diff --git a/app.py b/app.py index 322e1e9..a734e8e 100644 --- a/app.py +++ b/app.py @@ -472,7 +472,9 @@ def admin_login(): session["challenge"] = None session["logged_in"] = True - return redirect(request.args.get("redirect") or url_for("admin_notifications")) + return redirect( + request.args.get("redirect") or url_for("admin_notifications") + ) else: abort(401) @@ -940,7 +942,7 @@ def outbox(): # TODO(tsileo): returns the whole outbox if authenticated q = { "box": Box.OUTBOX.value, - "meta.deleted": False, # TODO(tsileo): retrieve deleted and expose tombstone + "meta.deleted": False, "type": {"$in": [ActivityType.CREATE.value, ActivityType.ANNOUNCE.value]}, } return jsonify( @@ -974,9 +976,12 @@ def outbox_detail(item_id): doc = DB.activities.find_one( {"box": Box.OUTBOX.value, "remote_id": back.activity_url(item_id)} ) + if not doc: + abort(404) + if doc["meta"].get("deleted", False): obj = ap.parse_activity(doc["activity"]) - resp = jsonify(**obj.get_object().get_tombstone()) + resp = jsonify(**obj.get_tombstone().to_dict()) resp.status_code = 410 return resp return jsonify(**activity_from_doc(doc)) @@ -984,17 +989,18 @@ def outbox_detail(item_id): @app.route("/outbox//activity") def outbox_activity(item_id): - # TODO(tsileo): handle Tombstone data = DB.activities.find_one( - { - "box": Box.OUTBOX.value, - "remote_id": back.activity_url(item_id), - "meta.deleted": False, - } + {"box": Box.OUTBOX.value, "remote_id": back.activity_url(item_id)} ) if not data: abort(404) obj = activity_from_doc(data) + if data["meta"].get("deleted", False): + obj = ap.parse_activity(data["activity"]) + resp = jsonify(**obj.get_object().get_tombstone().to_dict()) + resp.status_code = 410 + return resp + if obj["type"] != ActivityType.CREATE.value: abort(404) return jsonify(**obj["object"]) @@ -1002,7 +1008,6 @@ def outbox_activity(item_id): @app.route("/outbox//replies") def outbox_activity_replies(item_id): - # TODO(tsileo): handle Tombstone if not is_api_request(): abort(404) data = DB.activities.find_one( @@ -1038,7 +1043,6 @@ def outbox_activity_replies(item_id): @app.route("/outbox//likes") def outbox_activity_likes(item_id): - # TODO(tsileo): handle Tombstone if not is_api_request(): abort(404) data = DB.activities.find_one( @@ -1077,7 +1081,6 @@ def outbox_activity_likes(item_id): @app.route("/outbox//shares") def outbox_activity_shares(item_id): - # TODO(tsileo): handle Tombstone if not is_api_request(): abort(404) data = DB.activities.find_one(