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

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:
lambda 2018-04-07 12:19:49 +00:00
parent 2dc0c41946 bf9d3d4aba
commit d41bfd1d47
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ defmodule Pleroma.Web.XML do
def string_from_xpath(_, :error), do: nil def string_from_xpath(_, :error), do: nil
def string_from_xpath(xpath, doc) do def string_from_xpath(xpath, doc) do
try do
{:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc) {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
res = res =
@ -12,6 +13,11 @@ def string_from_xpath(xpath, doc) do
|> String.trim() |> String.trim()
if res == "", do: nil, else: res if res == "", do: nil, else: res
catch
e ->
Logger.debug("Couldn't find xpath #{xpath} in XML doc")
nil
end
end end
def parse_document(text) do def parse_document(text) do