webfinger: support JSON output

This commit is contained in:
William Pitcock 2018-03-21 17:58:31 +00:00
parent c50c7745bc
commit 8aa639a450
4 changed files with 57 additions and 13 deletions

View file

@ -39,7 +39,7 @@ def user_fetcher(username) do
end end
pipeline :well_known do pipeline :well_known do
plug :accepts, ["xml", "xrd+xml"] plug :accepts, ["xml", "xrd+xml", "json", "jrd+json"]
end end
pipeline :config do pipeline :config do

View file

@ -17,22 +17,55 @@ def host_meta do
|> XmlBuilder.to_doc |> XmlBuilder.to_doc
end end
def webfinger(resource) do def webfinger(resource, "JSON") do
host = Pleroma.Web.Endpoint.host host = Pleroma.Web.Endpoint.host
regex = ~r/(acct:)?(?<username>\w+)@#{host}/ regex = ~r/(acct:)?(?<username>\w+)@#{host}/
with %{"username" => username} <- Regex.named_captures(regex, resource) do with %{"username" => username} <- Regex.named_captures(regex, resource) do
user = User.get_by_nickname(username) user = User.get_by_nickname(username)
{:ok, represent_user(user)} {:ok, represent_user(user, "JSON")}
else _e -> else _e ->
with user when not is_nil(user) <- User.get_cached_by_ap_id(resource) do with user when not is_nil(user) <- User.get_cached_by_ap_id(resource) do
{:ok, represent_user(user)} {:ok, represent_user(user, "JSON")}
else _e -> else _e ->
{:error, "Couldn't find user"} {:error, "Couldn't find user"}
end end
end end
end end
def represent_user(user) do def webfinger(resource, "XML") do
host = Pleroma.Web.Endpoint.host
regex = ~r/(acct:)?(?<username>\w+)@#{host}/
with %{"username" => username} <- Regex.named_captures(regex, resource) do
user = User.get_by_nickname(username)
{:ok, represent_user(user, "XML")}
else _e ->
with user when not is_nil(user) <- User.get_cached_by_ap_id(resource) do
{:ok, represent_user(user, "XML")}
else _e ->
{:error, "Couldn't find user"}
end
end
end
def represent_user(user, "JSON") do
{:ok, user} = ensure_keys_present(user)
{:ok, _private, public} = Salmon.keys_from_pem(user.info["keys"])
magic_key = Salmon.encode_key(public)
%{
"subject" => "acct:#{user.nickname}@#{Pleroma.Web.Endpoint.host}",
"aliases" => [user.ap_id],
"links" => [
%{"rel" => "http://schemas.google.com/g/2010#updates-from", "type" => "application/atom+xml", "href" => OStatus.feed_path(user)},
%{"rel" => "http://webfinger.net/rel/profile-page", "type" => "text/html", "href" => user.ap_id},
%{"rel" => "salmon", "href" => OStatus.salmon_path(user)},
%{"rel" => "magic-public-key", "href" => "data:application/magic-public-key,#{magic_key}"},
%{"rel" => "self", "type" => "application/activity+json", "href" => user.ap_id},
%{"rel" => "http://ostatus.org/schema/1.0/subscribe", "template" => OStatus.remote_follow_path()}
]
}
end
def represent_user(user, "XML") do
{:ok, user} = ensure_keys_present(user) {:ok, user} = ensure_keys_present(user)
{:ok, _private, public} = Salmon.keys_from_pem(user.info["keys"]) {:ok, _private, public} = Salmon.keys_from_pem(user.info["keys"])
magic_key = Salmon.encode_key(public) magic_key = Salmon.encode_key(public)

View file

@ -12,12 +12,23 @@ def host_meta(conn, _params) do
end end
def webfinger(conn, %{"resource" => resource}) do def webfinger(conn, %{"resource" => resource}) do
with {:ok, response} <- WebFinger.webfinger(resource) do case get_format(conn) do
n when n in ["xml", "xrd+xml"] ->
with {:ok, response} <- WebFinger.webfinger(resource, "XML") do
conn conn
|> put_resp_content_type("application/xrd+xml") |> put_resp_content_type("application/xrd+xml")
|> send_resp(200, response) |> send_resp(200, response)
else else
_e -> send_resp(conn, 404, "Couldn't find user") _e -> send_resp(conn, 404, "Couldn't find user")
end end
n when n in ["json", "jrd+json"] ->
with {:ok, response} <- WebFinger.webfinger(resource, "JSON") do
json(conn, response)
else
_e -> send_resp(conn, 404, "Couldn't find user")
end
_ ->
send_resp(conn, 404, "Unsupported format")
end
end end
end end

View file

@ -15,14 +15,14 @@ test "returns a link to the xml lrdd" do
test "works for fqns" do test "works for fqns" do
user = insert(:user) user = insert(:user)
{:ok, result} = WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.Endpoint.host}") {:ok, result} = WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.Endpoint.host}", "XML")
assert is_binary(result) assert is_binary(result)
end end
test "works for ap_ids" do test "works for ap_ids" do
user = insert(:user) user = insert(:user)
{:ok, result} = WebFinger.webfinger(user.ap_id) {:ok, result} = WebFinger.webfinger(user.ap_id, "XML")
assert is_binary(result) assert is_binary(result)
end end
end end