aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2018-12-15 17:34:37 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2018-12-15 17:56:12 +0100
commitcddab5700b4903ba280fada57a79b8efe10f0bf6 (patch)
treebfee0834fb379fe844b0c46f8f02bd750fdcd38a
parent5af91020f83acf3acad8511799e4b4e9ecda5b76 (diff)
downloadpleroma-cddab5700b4903ba280fada57a79b8efe10f0bf6.tar.gz
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
-rw-r--r--lib/pleroma/web/web_finger/web_finger_controller.ex4
-rw-r--r--test/web/web_finger/web_finger_controller_test.exs11
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/pleroma/web/web_finger/web_finger_controller.ex b/lib/pleroma/web/web_finger/web_finger_controller.ex
index 002353166..8c60300a4 100644
--- 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
index cac003e76..3bc878532 100644
--- 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