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

salmon: return 400 if target post has no Atom version

pull/27/head
Ryan Barrett 2017-09-14 06:52:18 -07:00
rodzic db8e4249d8
commit 2320f1ce1e
2 zmienionych plików z 17 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
test/test_webmention.py
Wyświetl plik

@ -195,3 +195,17 @@ class WebmentionTest(testutil.TestCase):
'http://orig/.well-known/webfinger?resource=ryan@orig',
headers=common.HEADERS, timeout=util.HTTP_TIMEOUT)
self.assertEqual(('http://orig/@ryan/salmon',), mock_post.call_args[0])
def test_salmon_no_target_atom(self, mock_get, mock_post):
orig_no_atom = requests_response("""\
<html>
<body>foo</body>
</html>""", 'http://orig/url')
mock_get.side_effect = [self.reply, orig_no_atom]
got = app.get_response('/webmention', method='POST', body=urllib.urlencode({
'source': 'http://a/reply',
'target': 'http://orig/post',
}))
self.assertEquals(400, got.status_int)
self.assertIn('Target post http://orig/url has no Atom link', got.body)

13
webmention.py
Wyświetl plik

@ -1,12 +1,5 @@
"""Handles inbound webmentions.
TODO:
* mastodon doesn't advertise salmon endpoint in their individual post atom?!
https://mastodon.technology/users/snarfed/updates/73978.atom
* user-visible error messages for no activitypub/salmon
e.g. Hubzilla instances have to opt into federation.
https://project.hubzilla.org/help/admin/administrator_guide#Federation_Addons
TODO tests:
* actor/attributedTo could be string URL
* salmon rel via webfinger via author.name + domain
@ -117,8 +110,9 @@ class WebmentionHandler(webapp2.RequestHandler):
parsed = BeautifulSoup(target_resp.content, from_encoding=target_resp.encoding)
atom_url = parsed.find('link', rel='alternate', type=common.ATOM_CONTENT_TYPE)
assert atom_url # TODO
assert atom_url['href'] # TODO
if not atom_url or not atom_url['href']:
common.error(self, 'Target post %s has no Atom link' % target_resp.url,
status=400)
# fetch Atom target post, extract id and salmon endpoint
feed = common.requests_get(atom_url['href']).text
@ -167,7 +161,6 @@ class WebmentionHandler(webapp2.RequestHandler):
logging.info('Converted %s to Atom:\n%s', source_url, entry)
# sign reply and wrap in magic envelope
# TODO: use author h-card's u-url?
domain = urlparse.urlparse(source_url).netloc.split(':')[0]
key = models.MagicKey.get_or_create(domain)
logging.info('Using key for %s: %s', domain, key)