pleroma

commit: 567359790ea623949585629c41580961c59a01ff
parent: 8fadc1b6a2c0490a118f4236de35a337cfc4e565
Author: lambda <pleromagit@rogerbraun.net>
Date:   Mon, 17 Dec 2018 09:19:27 +0000

Merge branch 'testfix/webfinger-jrd' into 'develop'

WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test

See merge request pleroma/pleroma!554
Diffstat:
M
lib/pleroma/web/web_finger/web_finger_controller.ex
4
++++
M
test/web/web_finger/web_finger_controller_test.exs
11
++++++++++-

2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/web/web_finger/web_finger_controller.ex b/lib/pleroma/web/web_finger/web_finger_controller.ex
@@ -35,4 +35,8 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do
         send_resp(conn, 404, "Unsupported format")
     end
   end
+
+  def webfinger(conn, _params) do
+    send_resp(conn, 400, "Bad Request")
+  end
 end
diff --git a/test/web/web_finger/web_finger_controller_test.exs b/test/web/web_finger/web_finger_controller_test.exs
@@ -29,9 +29,18 @@ defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do
 
     response =
       build_conn()
-      |> put_req_header("accept", "application/jrd+json")
+      |> put_req_header("accept", "application/xrd+xml")
       |> get("/.well-known/webfinger?resource=acct:#{user.nickname}@localhost")
 
     assert response(response, 200)
   end
+
+  test "Sends a 400 when resource param is missing" do
+    response =
+      build_conn()
+      |> put_req_header("accept", "application/xrd+xml,application/jrd+json")
+      |> get("/.well-known/webfinger")
+
+    assert response(response, 400)
+  end
 end