mirror
/
bridgy-fed
kopia lustrzana https://github.com/snarfed/bridgy-fed
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

merging receive: bug fix for same domain check: normalize target URLs earlier 

for #529, a3f99a81ce
merge-web-protocol-receive
Ryan Barrett 2023-07-11 13:12:49 -07:00
rodzic d4d5bff81b
commit 67c4dacedf
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
3 zmienionych plików z 20 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
protocol.py
Wyświetl plik

@ -817,6 +817,9 @@ class Protocol:
logger.error(f'Follower {user.key} has no delivery target')
continue
# normalize URL (lower case hostname, etc)
target = util.dedupe_urls([target])[0]
# HACK: use last target object from above for reposts, which
# has its resolved id
targets[Target(protocol=user.LABEL, uri=target)] = \

18
tests/test_activitypub.py
Wyświetl plik

@ -137,13 +137,13 @@ LIKE = {
'id': 'http://mas.to/like#ok',
'type': 'Like',
'object': 'https://user.com/post',
'actor': 'https://user.com/actor',
'actor': 'https://mas.to/actor',
}
LIKE_WRAPPED = copy.deepcopy(LIKE)
LIKE_WRAPPED['object'] = 'http://localhost/r/https://user.com/post'
LIKE_ACTOR = {
'@context': 'https://www.w3.org/ns/activitystreams',
'id': 'https://user.com/actor',
'id': 'https://mas.to/actor',
'type': 'Person',
'name': 'Ms. Actor',
'preferredUsername': 'msactor',
@ -277,7 +277,7 @@ class ActivityPubTest(TestCase):
self.user = self.make_user('user.com', has_hcard=True, has_redirects=True,
obj_as2={**ACTOR, 'id': 'https://user.com/'})
self.swentel_key = ndb.Key(ActivityPub, 'https://mas.to/users/swentel')
self.user_actor_key = ndb.Key(ActivityPub, 'https://user.com/actor')
self.masto_actor_key = ndb.Key(ActivityPub, 'https://mas.to/actor')
ACTOR_BASE['publicKey']['publicKeyPem'] = self.user.public_pem().decode()
@ -398,7 +398,7 @@ class ActivityPubTest(TestCase):
}
self._test_inbox_reply(reply, mock_head, mock_get, mock_post)
self.assert_user(ActivityPub, 'https://user.com/actor',
self.assert_user(ActivityPub, 'https://mas.to/actor',
obj_as2=LIKE_ACTOR, direct=True)
def test_inbox_activity_without_id(self, *_):
@ -690,7 +690,7 @@ class ActivityPubTest(TestCase):
}),
type='like',
labels=['activity', 'user', 'notification'],
users=[self.user.key, self.user_actor_key],
users=[self.user.key, self.masto_actor_key],
object_ids=['http://nope.com/post'])
def test_inbox_not_public(self, mock_head, mock_get, mock_post):
@ -723,7 +723,7 @@ class ActivityPubTest(TestCase):
got = self.post('/user.com/inbox', json=LIKE)
self.assertEqual(200, got.status_code)
self.assertIn(self.as2_req('https://user.com/actor'), mock_get.mock_calls)
self.assertIn(self.as2_req('https://mas.to/actor'), mock_get.mock_calls)
self.assertIn(self.req('https://user.com/post'), mock_get.mock_calls)
args, kwargs = mock_post.call_args
@ -734,7 +734,7 @@ class ActivityPubTest(TestCase):
}, kwargs['data'])
self.assert_object('http://mas.to/like#ok',
users=[self.user.key, self.user_actor_key],
users=[self.user.key, self.masto_actor_key],
source_protocol='activitypub',
status='complete',
our_as1=as2.to_as1(LIKE_WITH_ACTOR),
@ -750,7 +750,7 @@ class ActivityPubTest(TestCase):
mock_get.return_value = self.as2_resp(LIKE_ACTOR)
self.test_inbox_like()
self.assert_user(ActivityPub, 'https://user.com/actor',
self.assert_user(ActivityPub, 'https://mas.to/actor',
obj_as2=LIKE_ACTOR, direct=True)
def test_inbox_follow_accept_with_id(self, *mocks):
@ -1213,7 +1213,7 @@ class ActivityPubTest(TestCase):
self.assertEqual(204, got.status_code)
self.assert_object('http://mas.to/like#ok',
users=[self.user.key, self.user_actor_key],
users=[self.user.key, self.masto_actor_key],
source_protocol='activitypub',
status='ignored',
our_as1=as2.to_as1(LIKE_WITH_ACTOR),

16
tests/test_web.py
Wyświetl plik

@ -877,7 +877,7 @@ class WebTest(TestCase):
self.as2_req('https://mas.to/author'),
))
inboxes = ('https://inbox', 'https://public/inbox',
inboxes = ('https://inbox/', 'https://public/inbox',
'https://shared/inbox', 'https://mas.to/inbox')
self.assert_deliveries(mock_post, inboxes, expected_as2, ignore=['cc'])
@ -972,7 +972,7 @@ class WebTest(TestCase):
})
self.assertEqual(200, got.status_code)
inboxes = ['https://inbox', 'https://public/inbox', 'https://shared/inbox']
inboxes = ['https://inbox/', 'https://public/inbox', 'https://shared/inbox']
self.assert_deliveries(mock_post, inboxes, {
**NOTE_AS2,
'attributedTo': None,
@ -1051,7 +1051,7 @@ class WebTest(TestCase):
mock_get.assert_has_calls((
self.req('https://user.com/post'),
))
inboxes = ('https://inbox', 'https://public/inbox', 'https://shared/inbox')
inboxes = ('https://inbox/', 'https://public/inbox', 'https://shared/inbox')
self.assert_deliveries(mock_post, inboxes, CREATE_AS2)
self.assert_object('https://user.com/post',
@ -1088,7 +1088,7 @@ class WebTest(TestCase):
mock_get.assert_has_calls((
self.req('https://user.com/post'),
))
inboxes = ('https://inbox', 'https://public/inbox', 'https://shared/inbox')
inboxes = ('https://inbox/', 'https://public/inbox', 'https://shared/inbox')
self.assert_deliveries(mock_post, inboxes, UPDATE_AS2)
update_as1 = {
@ -1132,7 +1132,7 @@ class WebTest(TestCase):
})
self.assertEqual(200, got.status_code)
self.assertEqual(('https://inbox',), mock_post.call_args[0])
self.assertEqual(('https://inbox/',), mock_post.call_args[0])
create = copy.deepcopy(CREATE_AS2)
create['object'].update({
'image': {'url': 'http://im/age', 'type': 'Image'},
@ -1358,7 +1358,7 @@ class WebTest(TestCase):
})
self.assertEqual(200, got.status_code, got.text)
inboxes = ('https://inbox', 'https://public/inbox', 'https://shared/inbox')
inboxes = ('https://inbox/', 'https://public/inbox', 'https://shared/inbox')
self.assert_deliveries(mock_post, inboxes, DELETE_AS2)
self.assert_object('https://user.com/post#bridgy-fed-delete',
@ -1491,7 +1491,7 @@ class WebTest(TestCase):
},
'to': ['https://www.w3.org/ns/activitystreams#Public'],
}
self.assert_deliveries(mock_post, ('https://shared/inbox', 'https://inbox'),
self.assert_deliveries(mock_post, ('https://shared/inbox', 'https://inbox/'),
expected_as2)
# updated Web user
@ -1533,7 +1533,7 @@ class WebTest(TestCase):
source_protocol='web',
status='complete',
our_as1=expected_as1,
delivered=['https://inbox', 'https://shared/inbox'],
delivered=['https://inbox/', 'https://shared/inbox'],
type='update',
object_ids=['https://user.com/'],
labels=['user', 'activity'],