Merge branch 'bugfix/html-webfinger-host-meta' into 'develop'
webfinger: handle situations where the well-known endpoint returns HTML See merge request pleroma/pleroma!94
This commit is contained in:
commit
d41bfd1d47
@ -4,6 +4,7 @@ defmodule Pleroma.Web.XML do
|
||||
def string_from_xpath(_, :error), do: nil
|
||||
|
||||
def string_from_xpath(xpath, doc) do
|
||||
try do
|
||||
{:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
|
||||
|
||||
res =
|
||||
@ -12,6 +13,11 @@ defmodule Pleroma.Web.XML do
|
||||
|> String.trim()
|
||||
|
||||
if res == "", do: nil, else: res
|
||||
catch
|
||||
e ->
|
||||
Logger.debug("Couldn't find xpath #{xpath} in XML doc")
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
def parse_document(text) do
|
||||
|
Loading…
Reference in New Issue
Block a user