alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
lambda 2018-12-17 09:19:27 +00:00
parent 8fadc1b6a2 cddab5700b
commit 567359790e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/web_finger/web_finger_controller.ex
View File

@ -35,4 +35,8 @@ def webfinger(conn, %{"resource" => resource}) do
send_resp(conn, 404, "Unsupported format") send_resp(conn, 404, "Unsupported format")
end end
end end
def webfinger(conn, _params) do
send_resp(conn, 400, "Bad Request")
end
end end

11
test/web/web_finger/web_finger_controller_test.exs
View File

@ -29,9 +29,18 @@ test "Webfinger XML" do
response = response =
build_conn() 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") |> get("/.well-known/webfinger?resource=acct:#{user.nickname}@localhost")
assert response(response, 200) assert response(response, 200)
end 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 end