Merge branch 'fix_486' into 'develop'

[akkoma] / lib / pleroma / web / web_finger / web_finger_controller.ex

diff --git a/lib/pleroma/web/web_finger/web_finger_controller.ex b/lib/pleroma/web/web_finger/web_finger_controller.ex
index eb54346c1fef761cd896e9e6c4d6ff02f8d65e74..b77c75ec559dd789d0b6d68a7771888fa56eb24d 100644 (file)
--- a/lib/pleroma/web/web_finger/web_finger_controller.ex
+++ b/lib/pleroma/web/web_finger/web_finger_controller.ex
@@ -1,10 +1,16 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.WebFinger.WebFingerController do
   use Pleroma.Web, :controller
 
   alias Pleroma.Web.WebFinger
 
+  plug(Pleroma.Web.FederatingPlug)
+
   def host_meta(conn, _params) do
-    xml = WebFinger.host_meta
+    xml = WebFinger.host_meta()
 
     conn
     |> put_resp_content_type("application/xrd+xml")
@@ -21,14 +27,20 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do
         else
           _e -> send_resp(conn, 404, "Couldn't find user")
         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
+
+  def webfinger(conn, _params) do
+    send_resp(conn, 400, "Bad Request")
+  end
 end