sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

webfinger: implement json response parsing

This commit is contained in:
William Pitcock 2018-03-21 18:53:36 +00:00
parent 1decd2ecb2
commit 4d3af2af71
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ defmodule Pleroma.Web.WebFinger do
alias Pleroma.{Repo, User, XmlBuilder} alias Pleroma.{Repo, User, XmlBuilder}
alias Pleroma.Web alias Pleroma.Web
alias Pleroma.Web.{XML, Salmon, OStatus} alias Pleroma.Web.{XML, Salmon, OStatus}
require Poison
require Logger require Logger
def host_meta do def host_meta do
@ -117,6 +118,19 @@ defmodule Pleroma.Web.WebFinger do
{:ok, data} {:ok, data}
end end
# TODO: maybe fill in other details from JRD webfinger response
defp webfinger_from_json(doc) do
data = Enum.reduce(doc["links"], %{"subject" => doc["subject"]}, fn (link, data) ->
case link["type"] do
"application/activity+json" ->
Map.put(data, "ap_id", link["href"])
_ ->
Logger.debug("Unhandled type: #{inspect(link["type"])}")
end
end)
{:ok, data}
end
def get_template_from_xml(body) do def get_template_from_xml(body) do
xpath = "//Link[@rel='lrdd' and @type='application/xrd+xml']/@template" xpath = "//Link[@rel='lrdd' and @type='application/xrd+xml']/@template"
with doc when doc != :error <- XML.parse_document(body), with doc when doc != :error <- XML.parse_document(body),
@ -150,14 +164,18 @@ defmodule Pleroma.Web.WebFinger do
{:ok, template} -> {:ok, template} ->
address = String.replace(template, "{uri}", URI.encode(account)) address = String.replace(template, "{uri}", URI.encode(account))
_ -> _ ->
address = "http://#{domain}/.well-known/webfinger?resource=#{account}" address = "http://#{domain}/.well-known/webfinger?resource=acct:#{account}"
end end
with response <- @httpoison.get(address, ["Accept": "application/xrd+xml"]), with response <- @httpoison.get(address, ["Accept": "application/xrd+xml,application/jrd+json"], follow_redirect: true),
{:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response, {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response do
doc when doc != :error<- XML.parse_document(body), doc = XML.parse_document(body)
{:ok, data} <- webfinger_from_xml(doc) do if doc != :error do
{:ok, data} webfinger_from_xml(doc)
else
{:ok, doc} = Poison.decode(body)
webfinger_from_json(doc)
end
else else
e -> e ->
Logger.debug(fn -> "Couldn't finger #{account}" end) Logger.debug(fn -> "Couldn't finger #{account}" end)