X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fweb_finger%2Fweb_finger.ex;h=a54f3c54d5c8bd4422f99a5928d2c240175729eb;hb=7de3a652147d9b7da9cf3fd82d8a8438df93bae8;hp=da38f662c075315b4f3a34214f14eaa7c6716620;hpb=51dc2b1696ee4d2c444b4809a1859379af6e3bc8;p=akkoma

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index da38f662c..a54f3c54d 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -62,11 +62,6 @@ defmodule Pleroma.Web.WebFinger do
     end
   end
 
-  # FIXME: Make this call the host-meta to find the actual address.
-  defp webfinger_address(domain) do
-    "//#{domain}/.well-known/webfinger"
-  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
@@ -91,10 +86,15 @@ defmodule Pleroma.Web.WebFinger do
   end
 
   def find_lrdd_template(domain) do
-    with {:ok, %{status_code: status_code, body: body}} <- @httpoison.get("http://#{domain}/.well-known/host-meta", [], follow_redirect: true) do
+    with {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- @httpoison.get("http://#{domain}/.well-known/host-meta", [], follow_redirect: true, timeout: 10_000, recv_timeout: 20_000) do
       get_template_from_xml(body)
     else
-      e -> {:error, "Can't find lrdd template: #{inspect(e)}"}
+      e ->
+        with {:ok, %{body: body}} <- @httpoison.get("https://#{domain}/.well-known/host-meta", []) do
+          get_template_from_xml(body)
+        else
+          e -> {:error, "Can't find lrdd template: #{inspect(e)}"}
+        end
     end
   end
 
@@ -105,13 +105,10 @@ defmodule Pleroma.Web.WebFinger do
                URI.parse(account).host
              end
 
-    {:ok, template} = find_lrdd_template(domain)
-
-    address = String.replace(template, "{uri}", URI.encode(account))
-
-    response = @httpoison.get(address, ["Accept": "application/xrd+xml"])
-
-    with {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response,
+    with {:ok, template} <- find_lrdd_template(domain),
+         address <- String.replace(template, "{uri}", URI.encode(account)),
+         response <- @httpoison.get(address, ["Accept": "application/xrd+xml"], timeout: 10_000, recv_timeout: 20_000),
+         {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response,
          doc when doc != :error<- XML.parse_document(body),
          {:ok, data} <- webfinger_from_xml(doc) do
       {:ok, data}