alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bugfix/webfinger-xml-crash' into 'develop' 

webfinger robustness improvements

See merge request pleroma/pleroma!195
This commit is contained in:
lambda 2018-06-06 16:44:44 +00:00
parent b5d8213e70 1620ec502c
commit 0a0c6bf394
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/web_finger/web_finger.ex
View File

@ -253,7 +253,7 @@ def finger(account) do
String.replace(template, "{uri}", URI.encode(account)) String.replace(template, "{uri}", URI.encode(account))
_ -> _ ->
"http://#{domain}/.well-known/webfinger?resource=acct:#{account}" "https://#{domain}/.well-known/webfinger?resource=acct:#{account}"
end end
with response <- with response <-

4
lib/pleroma/web/xml/xml.ex
View File

@ -32,6 +32,10 @@ def parse_document(text) do
:exit, _error -> :exit, _error ->
Logger.debug("Couldn't parse XML: #{inspect(text)}") Logger.debug("Couldn't parse XML: #{inspect(text)}")
:error :error
rescue
e ->
Logger.debug("Couldn't parse XML: #{inspect(text)}")
:error
end end
end end
end end

6
test/support/httpoison_mock.ex
View File

@ -4,7 +4,7 @@ defmodule HTTPoisonMock do
def get(url, body \\ [], headers \\ []) def get(url, body \\ [], headers \\ [])
def get( def get(
"http://gerzilla.de/.well-known/webfinger?resource=acct:kaniini@gerzilla.de", "https://gerzilla.de/.well-known/webfinger?resource=acct:kaniini@gerzilla.de",
[Accept: "application/xrd+xml,application/jrd+json"], [Accept: "application/xrd+xml,application/jrd+json"],
follow_redirect: true follow_redirect: true
) do ) do
@ -16,7 +16,7 @@ def get(
end end
def get( def get(
"http://framatube.org/.well-known/webfinger?resource=acct:framasoft@framatube.org", "https://framatube.org/.well-known/webfinger?resource=acct:framasoft@framatube.org",
[Accept: "application/xrd+xml,application/jrd+json"], [Accept: "application/xrd+xml,application/jrd+json"],
follow_redirect: true follow_redirect: true
) do ) do
@ -28,7 +28,7 @@ def get(
end end
def get( def get(
"http://gnusocial.de/.well-known/webfinger?resource=acct:winterdienst@gnusocial.de", "https://gnusocial.de/.well-known/webfinger?resource=acct:winterdienst@gnusocial.de",
[Accept: "application/xrd+xml,application/jrd+json"], [Accept: "application/xrd+xml,application/jrd+json"],
follow_redirect: true follow_redirect: true
) do ) do