Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
webfinger robustness improvements See merge request pleroma/pleroma!195
This commit is contained in:
commit
0a0c6bf394
|
@ -253,7 +253,7 @@ def finger(account) do
|
|||
String.replace(template, "{uri}", URI.encode(account))
|
||||
|
||||
_ ->
|
||||
"http://#{domain}/.well-known/webfinger?resource=acct:#{account}"
|
||||
"https://#{domain}/.well-known/webfinger?resource=acct:#{account}"
|
||||
end
|
||||
|
||||
with response <-
|
||||
|
|
|
@ -32,6 +32,10 @@ def parse_document(text) do
|
|||
:exit, _error ->
|
||||
Logger.debug("Couldn't parse XML: #{inspect(text)}")
|
||||
:error
|
||||
rescue
|
||||
e ->
|
||||
Logger.debug("Couldn't parse XML: #{inspect(text)}")
|
||||
:error
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -4,7 +4,7 @@ defmodule HTTPoisonMock do
|
|||
def get(url, body \\ [], headers \\ [])
|
||||
|
||||
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"],
|
||||
follow_redirect: true
|
||||
) do
|
||||
|
@ -16,7 +16,7 @@ def get(
|
|||
end
|
||||
|
||||
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"],
|
||||
follow_redirect: true
|
||||
) do
|
||||
|
@ -28,7 +28,7 @@ def get(
|
|||
end
|
||||
|
||||
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"],
|
||||
follow_redirect: true
|
||||
) do
|
||||
|
|
Loading…
Reference in New Issue