outbound webfinger: use full acct: URIs

pull/27/head
Ryan Barrett 2017-10-04 07:09:02 -07:00
rodzic 4f79e6ebd5
commit 63a9e47002
2 zmienionych plików z 7 dodań i 6 usunięć

Wyświetl plik

@ -210,8 +210,8 @@ class WebmentionTest(testutil.TestCase):
self.assertEquals(200, got.status_int)
mock_get.assert_any_call(
'http://orig/.well-known/webfinger?resource=ryan@orig',
headers=common.HEADERS, timeout=util.HTTP_TIMEOUT)
'http://orig/.well-known/webfinger?resource=acct:ryan@orig',
headers=common.HEADERS, timeout=util.HTTP_TIMEOUT, verify=False)
self.assertEqual(('http://orig/@ryan/salmon',), mock_post.call_args[0])
def test_salmon_no_target_atom(self, mock_get, mock_post):

Wyświetl plik

@ -156,13 +156,14 @@ class WebmentionHandler(webapp2.RequestHandler):
# try webfinger
parsed = urlparse.urlparse(target_url)
# TODO: test missing email
acct = entry.author_detail.get('email') or '@'.join(
email = entry.author_detail.get('email') or '@'.join(
(entry.author_detail.name, parsed.netloc))
try:
# TODO: always https?
resp = common.requests_get(
'%s://%s/.well-known/webfinger?resource=%s' %
(parsed.scheme, parsed.netloc, acct),
log=True)
'%s://%s/.well-known/webfinger?resource=acct:%s' %
(parsed.scheme, parsed.netloc, email),
log=True, verify=False)
endpoint = django_salmon.get_salmon_replies_link(resp.json())
except requests.HTTPError as e:
pass