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:
		
						commit
						567359790e
					
				
					 2 changed files with 14 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -35,4 +35,8 @@ def webfinger(conn, %{"resource" => resource}) do
 | 
			
		|||
        send_resp(conn, 404, "Unsupported format")
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def webfinger(conn, _params) do
 | 
			
		||||
    send_resp(conn, 400, "Bad Request")
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,9 +29,18 @@ test "Webfinger XML" 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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue