Merge branch 'bugfix/webfinger-xml-crash' into 'develop'

webfinger robustness improvements

See merge request pleroma/pleroma!195

lib/pleroma/web/web_finger/web_finger.ex

@@ -253,7 +253,7 @@ defmodule Pleroma.Web.WebFinger do
           String.replace(template, "{uri}", URI.encode(account))
 
         _ ->
-          "http://#{domain}/.well-known/webfinger?resource=acct:#{account}"
+          "https://#{domain}/.well-known/webfinger?resource=acct:#{account}"
       end
 
     with response <-

lib/pleroma/web/xml/xml.ex

@@ -32,6 +32,10 @@ defmodule Pleroma.Web.XML do
       :exit, _error ->
         Logger.debug("Couldn't parse XML: #{inspect(text)}")
         :error
+    rescue
+      e ->
+        Logger.debug("Couldn't parse XML: #{inspect(text)}")
+        :error
     end
   end
 end