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

webmention => AP support for u-follow-of => Follow

create
Ryan Barrett 2018-10-24 21:28:52 -07:00
rodzic 42ad9d1998
commit 2bb418dc72
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
3 zmienionych plików z 70 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
common.py
Wyświetl plik

@ -281,7 +281,7 @@ def postprocess_as2(activity, target=None, key=None):
if obj:
if isinstance(obj, dict) and not obj.get('id'):
obj['id'] = target_id or obj.get('url')
elif obj != target_id:
elif target_id and obj != target_id:
activity['object'] = target_id
# id is required for most things. default to url if it's not set.

2
models.py
Wyświetl plik

@ -91,7 +91,7 @@ class Response(StringIdModel):
@classmethod
def get_or_create(cls, source=None, target=None, **kwargs):
logging.info('source target: %s %s', source, target)
logging.info('Response source target: %s %s', source, target)
return cls.get_or_insert(cls._id(source, target), **kwargs)
def source(self):

68
tests/test_webmention.py
Wyświetl plik

@ -184,6 +184,42 @@ class WebmentionTest(testutil.TestCase):
self.as2_update = copy.deepcopy(self.as2_create)
self.as2_update['type'] = 'Update'
self.follow_html = """\
<html>
<body class="h-entry">
<a class="u-url" href="http://a/follow"></a>
<a class="u-follow-of" href="http://followee"></a>
<a class="p-author h-card" href="https://orig">Ms. ☕ Baz</a>
</body>
</html>
"""
self.follow = requests_response(
self.follow_html, content_type=CONTENT_TYPE_HTML)
self.follow_mf2 = mf2py.parse(self.follow_html, url='http://a/follow')
self.follow_as2 = {
'@context': 'https://www.w3.org/ns/activitystreams',
'type': 'Follow',
'id': 'http://localhost/r/http://a/follow',
'url': 'http://localhost/r/http://a/follow',
'object': 'http://followee',
'actor': {
'id': 'http://localhost/orig',
'name': 'Ms. ☕ Baz',
'preferredUsername': 'orig',
'type': 'Person',
'url': 'http://localhost/r/https://orig',
},
'cc': ['https://www.w3.org/ns/activitystreams#Public'],
}
self.actor = requests_response({
'objectType' : 'person',
'displayName': 'Mrs. ☕ Foo',
'url': 'https://foo.com/about-me',
'inbox': 'https://foo.com/inbox',
}, content_type=CONTENT_TYPE_AS2)
self.activitypub_gets = [self.reply, self.orig_as2, self.actor]
def verify_salmon(self, mock_post):
args, kwargs = mock_post.call_args
self.assertEqual(('http://orig/salmon',), args)
@ -386,6 +422,38 @@ class WebmentionTest(testutil.TestCase):
{'type': 'Image', 'url': 'http://orig/pic'},
self.assert_equals(repost_as2, kwargs['json'])
def test_activitypub_follow(self, mock_get, mock_post):
mock_get.side_effect = [self.follow, self.actor]
mock_post.return_value = requests_response('abc xyz')
got = app.get_response(
'/webmention', method='POST', body=urllib.urlencode({
'source': 'http://a/follow',
'target': 'https://fed.brid.gy/',
}))
self.assertEquals(200, got.status_int)
mock_get.assert_has_calls((
self.req('http://a/follow'),
self.req('http://followee', headers=CONNEG_HEADERS_AS2_HTML),
))
args, kwargs = mock_post.call_args
self.assertEqual(('https://foo.com/inbox',), args)
self.assertEqual(self.follow_as2, kwargs['json'])
headers = kwargs['headers']
self.assertEqual(CONTENT_TYPE_AS2, headers['Content-Type'])
rsa_key = kwargs['auth'].header_signer._rsa._key
self.assertEqual(self.key.private_pem(), rsa_key.exportKey())
resp = Response.get_by_id('http://a/follow http://followee')
self.assertEqual('out', resp.direction)
self.assertEqual('activitypub', resp.protocol)
self.assertEqual('complete', resp.status)
self.assertEqual(self.follow_mf2, json.loads(resp.source_mf2))
def test_salmon_reply(self, mock_get, mock_post):
mock_get.side_effect = [self.reply, self.orig_html_atom, self.orig_atom]