Commit d41bfd1d authored by lain's avatar lain
Browse files

Merge branch 'bugfix/html-webfinger-host-meta' into 'develop'

webfinger: handle situations where the well-known endpoint returns HTML

See merge request !94
parents 2dc0c419 bf9d3d4a
Pipeline #1121 passed with stage
in 2 minutes and 15 seconds
......@@ -4,14 +4,20 @@ defmodule Pleroma.Web.XML do
def string_from_xpath(_, :error), do: nil
def string_from_xpath(xpath, doc) do
{:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
try do
{:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
res =
res
|> to_string
|> String.trim()
res =
res
|> to_string
|> 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
def parse_document(text) do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment