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

Accept webfinger without a key.

This commit is contained in:
eal 2018-02-05 16:20:07 +02:00
parent 61c16193de
commit 4c5165e840
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,8 +64,12 @@ defmodule Pleroma.Web.WebFinger do
end
defp webfinger_from_xml(doc) do
magic_key = XML.string_from_xpath(~s{//Link[@rel="magic-public-key"]/@href}, doc)
"data:application/magic-public-key," <> magic_key = magic_key
magic_key = with key <- XML.string_from_xpath(~s{//Link[@rel="magic-public-key"]/@href}, doc),
"data:application/magic-public-key," <> magic_key <- key do
magic_key
else
_e -> nil
end
topic = XML.string_from_xpath(~s{//Link[@rel="http://schemas.google.com/g/2010#updates-from"]/@href}, doc)
subject = XML.string_from_xpath("//Subject", doc)
salmon = XML.string_from_xpath(~s{//Link[@rel="salmon"]/@href}, doc)