zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merge pull request #724 from mouse-reeve/inbox-boost-bug

Browse source 
Fixes exceptions in handling incoming boosts
This commit is contained in:
Mouse Reeve 2021-03-13 08:40:13 -08:00 • committed by GitHub
commit 40ab84bc15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 134 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bookwyrm/activitypub/base_activity.py
View file

@ -258,10 +258,9 @@ def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
# load the data and create the object
try:
data = get_data(remote_id)
except (ConnectorException, ConnectionError):
except ConnectorException:
raise ActivitySerializerError(
"Could not connect to host for remote_id in %s model: %s"
% (model.__name__, remote_id)
"Could not connect to host for remote_id in: %s" % (remote_id)
)
# determine the model implicitly, if not provided
if not model:

3
bookwyrm/activitypub/verbs.py
View file

@ -70,6 +70,9 @@ class Undo(Verb):
if self.object.type == "Follow":
model = apps.get_model("bookwyrm.UserFollows")
obj = self.object.to_model(model=model, save=False, allow_create=False)
if not obj:
# if we don't have the object, we can't undo it. happens a lot with boosts
return
obj.delete()

2
bookwyrm/connectors/abstract_connector.py
View file

@ -244,7 +244,7 @@ def get_data(url):
"User-Agent": settings.USER_AGENT,
},
)
except (RequestError, SSLError) as e:
except (RequestError, SSLError, ConnectionError) as e:
logger.exception(e)
raise ConnectorException()

4
bookwyrm/models/activitypub_mixin.py
View file

@ -456,8 +456,8 @@ def broadcast_task(sender_id, activity, recipients):
for recipient in recipients:
try:
sign_and_send(sender, activity, recipient)
except (HTTPError, SSLError, ConnectionError) as e:
logger.exception(e)
except (HTTPError, SSLError, ConnectionError):
pass
def sign_and_send(sender, data, destination):

7
bookwyrm/models/status.py
View file

@ -115,13 +115,18 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
def ignore_activity(cls, activity):
""" keep notes if they are replies to existing statuses """
if activity.type == "Announce":
# keep it if the booster or the boosted are local
try:
boosted = activitypub.resolve_remote_id(activity.object, save=False)
except activitypub.ActivitySerializerError:
# if we can't load the status, definitely ignore it
return True
# keep the boost if we would keep the status
return cls.ignore_activity(boosted.to_activity_dataclass())
# keep if it if it's a custom type
if activity.type != "Note":
return False
# keep it if it's a reply to an existing status
if cls.objects.filter(remote_id=activity.inReplyTo).exists():
return False

137
bookwyrm/tests/models/test_status_model.py
View file

@ -8,19 +8,31 @@ from django.core.files.base import ContentFile
from django.db import IntegrityError
from django.test import TestCase
from django.utils import timezone
import responses
from bookwyrm import models, settings
from bookwyrm import activitypub, models, settings
# pylint: disable=too-many-public-methods
@patch("bookwyrm.models.Status.broadcast")
class Status(TestCase):
""" lotta types of statuses """
def setUp(self):
""" useful things for creating a status """
self.user = models.User.objects.create_user(
self.local_user = models.User.objects.create_user(
"mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
)
with patch("bookwyrm.models.user.set_remote_server.delay"):
self.remote_user = models.User.objects.create_user(
"rat",
"rat@rat.com",
"ratword",
local=False,
remote_id="https://example.com/users/rat",
inbox="https://example.com/users/rat/inbox",
outbox="https://example.com/users/rat/outbox",
)
self.book = models.Edition.objects.create(title="Test Edition")
image_file = pathlib.Path(__file__).parent.joinpath(
@ -34,22 +46,22 @@ class Status(TestCase):
def test_status_generated_fields(self, _):
""" setting remote id """
status = models.Status.objects.create(content="bleh", user=self.user)
status = models.Status.objects.create(content="bleh", user=self.local_user)
expected_id = "https://%s/user/mouse/status/%d" % (settings.DOMAIN, status.id)
self.assertEqual(status.remote_id, expected_id)
self.assertEqual(status.privacy, "public")
def test_replies(self, _):
""" get a list of replies """
parent = models.Status.objects.create(content="hi", user=self.user)
parent = models.Status.objects.create(content="hi", user=self.local_user)
child = models.Status.objects.create(
content="hello", reply_parent=parent, user=self.user
content="hello", reply_parent=parent, user=self.local_user
)
models.Review.objects.create(
content="hey", reply_parent=parent, user=self.user, book=self.book
content="hey", reply_parent=parent, user=self.local_user, book=self.book
)
models.Status.objects.create(
content="hi hello", reply_parent=child, user=self.user
content="hi hello", reply_parent=child, user=self.local_user
)
replies = models.Status.replies(parent)
@ -75,15 +87,15 @@ class Status(TestCase):
def test_to_replies(self, _):
""" activitypub replies collection """
parent = models.Status.objects.create(content="hi", user=self.user)
parent = models.Status.objects.create(content="hi", user=self.local_user)
child = models.Status.objects.create(
content="hello", reply_parent=parent, user=self.user
content="hello", reply_parent=parent, user=self.local_user
)
models.Review.objects.create(
content="hey", reply_parent=parent, user=self.user, book=self.book
content="hey", reply_parent=parent, user=self.local_user, book=self.book
)
models.Status.objects.create(
content="hi hello", reply_parent=child, user=self.user
content="hi hello", reply_parent=child, user=self.local_user
)
replies = parent.to_replies()
@ -92,7 +104,9 @@ class Status(TestCase):
def test_status_to_activity(self, _):
""" subclass of the base model version with a "pure" serializer """
status = models.Status.objects.create(content="test content", user=self.user)
status = models.Status.objects.create(
content="test content", user=self.local_user
)
activity = status.to_activity()
self.assertEqual(activity["id"], status.remote_id)
self.assertEqual(activity["type"], "Note")
@ -103,7 +117,7 @@ class Status(TestCase):
""" subclass of the base model version with a "pure" serializer """
status = models.Status.objects.create(
content="test content",
user=self.user,
user=self.local_user,
deleted=True,
deleted_date=timezone.now(),
)
@ -114,7 +128,9 @@ class Status(TestCase):
def test_status_to_pure_activity(self, _):
""" subclass of the base model version with a "pure" serializer """
status = models.Status.objects.create(content="test content", user=self.user)
status = models.Status.objects.create(
content="test content", user=self.local_user
)
activity = status.to_activity(pure=True)
self.assertEqual(activity["id"], status.remote_id)
self.assertEqual(activity["type"], "Note")
@ -125,10 +141,10 @@ class Status(TestCase):
def test_generated_note_to_activity(self, _):
""" subclass of the base model version with a "pure" serializer """
status = models.GeneratedNote.objects.create(
content="test content", user=self.user
content="test content", user=self.local_user
)
status.mention_books.set([self.book])
status.mention_users.set([self.user])
status.mention_users.set([self.local_user])
activity = status.to_activity()
self.assertEqual(activity["id"], status.remote_id)
self.assertEqual(activity["type"], "GeneratedNote")
@ -139,10 +155,10 @@ class Status(TestCase):
def test_generated_note_to_pure_activity(self, _):
""" subclass of the base model version with a "pure" serializer """
status = models.GeneratedNote.objects.create(
content="test content", user=self.user
content="test content", user=self.local_user
)
status.mention_books.set([self.book])
status.mention_users.set([self.user])
status.mention_users.set([self.local_user])
activity = status.to_activity(pure=True)
self.assertEqual(activity["id"], status.remote_id)
self.assertEqual(
@ -163,7 +179,7 @@ class Status(TestCase):
def test_comment_to_activity(self, _):
""" subclass of the base model version with a "pure" serializer """
status = models.Comment.objects.create(
content="test content", user=self.user, book=self.book
content="test content", user=self.local_user, book=self.book
)
activity = status.to_activity()
self.assertEqual(activity["id"], status.remote_id)
@ -174,7 +190,7 @@ class Status(TestCase):
def test_comment_to_pure_activity(self, _):
""" subclass of the base model version with a "pure" serializer """
status = models.Comment.objects.create(
content="test content", user=self.user, book=self.book
content="test content", user=self.local_user, book=self.book
)
activity = status.to_activity(pure=True)
self.assertEqual(activity["id"], status.remote_id)
@ -196,7 +212,7 @@ class Status(TestCase):
status = models.Quotation.objects.create(
quote="a sickening sense",
content="test content",
user=self.user,
user=self.local_user,
book=self.book,
)
activity = status.to_activity()
@ -211,7 +227,7 @@ class Status(TestCase):
status = models.Quotation.objects.create(
quote="a sickening sense",
content="test content",
user=self.user,
user=self.local_user,
book=self.book,
)
activity = status.to_activity(pure=True)
@ -235,7 +251,7 @@ class Status(TestCase):
name="Review name",
content="test content",
rating=3,
user=self.user,
user=self.local_user,
book=self.book,
)
activity = status.to_activity()
@ -252,7 +268,7 @@ class Status(TestCase):
name="Review name",
content="test content",
rating=3,
user=self.user,
user=self.local_user,
book=self.book,
)
activity = status.to_activity(pure=True)
@ -275,30 +291,34 @@ class Status(TestCase):
def fav_broadcast_mock(_, activity, user):
""" ok """
self.assertEqual(user.remote_id, self.user.remote_id)
self.assertEqual(user.remote_id, self.local_user.remote_id)
self.assertEqual(activity["type"], "Like")
models.Favorite.broadcast = fav_broadcast_mock
status = models.Status.objects.create(content="test content", user=self.user)
fav = models.Favorite.objects.create(status=status, user=self.user)
status = models.Status.objects.create(
content="test content", user=self.local_user
)
fav = models.Favorite.objects.create(status=status, user=self.local_user)
# can't fav a status twice
with self.assertRaises(IntegrityError):
models.Favorite.objects.create(status=status, user=self.user)
models.Favorite.objects.create(status=status, user=self.local_user)
activity = fav.to_activity()
self.assertEqual(activity["type"], "Like")
self.assertEqual(activity["actor"], self.user.remote_id)
self.assertEqual(activity["actor"], self.local_user.remote_id)
self.assertEqual(activity["object"], status.remote_id)
models.Favorite.broadcast = real_broadcast
def test_boost(self, _):
""" boosting, this one's a bit fussy """
status = models.Status.objects.create(content="test content", user=self.user)
boost = models.Boost.objects.create(boosted_status=status, user=self.user)
status = models.Status.objects.create(
content="test content", user=self.local_user
)
boost = models.Boost.objects.create(boosted_status=status, user=self.local_user)
activity = boost.to_activity()
self.assertEqual(activity["actor"], self.user.remote_id)
self.assertEqual(activity["actor"], self.local_user.remote_id)
self.assertEqual(activity["object"], status.remote_id)
self.assertEqual(activity["type"], "Announce")
self.assertEqual(activity, boost.to_activity(pure=True))
@ -306,18 +326,20 @@ class Status(TestCase):
def test_notification(self, _):
""" a simple model """
notification = models.Notification.objects.create(
user=self.user, notification_type="FAVORITE"
user=self.local_user, notification_type="FAVORITE"
)
self.assertFalse(notification.read)
with self.assertRaises(IntegrityError):
models.Notification.objects.create(
user=self.user, notification_type="GLORB"
user=self.local_user, notification_type="GLORB"
)
def test_create_broadcast(self, broadcast_mock):
""" should send out two verions of a status on create """
models.Comment.objects.create(content="hi", user=self.user, book=self.book)
models.Comment.objects.create(
content="hi", user=self.local_user, book=self.book
)
self.assertEqual(broadcast_mock.call_count, 2)
pure_call = broadcast_mock.call_args_list[0]
bw_call = broadcast_mock.call_args_list[1]
@ -332,3 +354,48 @@ class Status(TestCase):
args = bw_call[0][0]
self.assertEqual(args["type"], "Create")
self.assertEqual(args["object"]["type"], "Comment")
def test_recipients_with_mentions(self, _):
""" get recipients to broadcast a status """
status = models.GeneratedNote.objects.create(
content="test content", user=self.local_user
)
status.mention_users.add(self.remote_user)
self.assertEqual(status.recipients, [self.remote_user])
def test_recipients_with_reply_parent(self, _):
""" get recipients to broadcast a status """
parent_status = models.GeneratedNote.objects.create(
content="test content", user=self.remote_user
)
status = models.GeneratedNote.objects.create(
content="test content", user=self.local_user, reply_parent=parent_status
)
self.assertEqual(status.recipients, [self.remote_user])
def test_recipients_with_reply_parent_and_mentions(self, _):
""" get recipients to broadcast a status """
parent_status = models.GeneratedNote.objects.create(
content="test content", user=self.remote_user
)
status = models.GeneratedNote.objects.create(
content="test content", user=self.local_user, reply_parent=parent_status
)
status.mention_users.set([self.remote_user])
self.assertEqual(status.recipients, [self.remote_user])
@responses.activate
def test_ignore_activity_boost(self, _):
""" don't bother with most remote statuses """
activity = activitypub.Announce(
id="http://www.faraway.com/boost/12",
actor=self.remote_user.remote_id,
object="http://fish.com/nothing",
)
responses.add(responses.GET, "http://fish.com/nothing", status=404)
self.assertTrue(models.Status.ignore_activity(activity))

17
bookwyrm/tests/views/test_inbox.py
View file

@ -563,6 +563,23 @@ class Inbox(TestCase):
}
views.inbox.activity_task(activity)
def test_handle_unboost_unknown_boost(self):
""" undo a boost """
activity = {
"type": "Undo",
"actor": "hi",
"id": "bleh",
"to": ["https://www.w3.org/ns/activitystreams#public"],
"cc": ["https://example.com/user/mouse/followers"],
"object": {
"type": "Announce",
"id": "http://fake.com/unknown/boost",
"actor": self.remote_user.remote_id,
"object": self.status.remote_id,
},
}
views.inbox.activity_task(activity)
def test_handle_add_book_to_shelf(self):
""" shelving a book """
work = models.Work.objects.create(title="work title")