Use declared scheme even if it does not match the transport (#160)

Fixes #159

Author: mtrudel

lib/bandit/pipeline.ex

@@ -52,10 +52,8 @@ defmodule Bandit.Pipeline do
   defp determine_scheme({secure?, _, _, _}, {scheme, _, _, _}) do
     case {scheme, secure?} do
       {nil, true} -> {:ok, "https"}
-      {"https", true} -> {:ok, "https"}
       {nil, false} -> {:ok, "http"}
-      {"http", false} -> {:ok, "http"}
-      _ -> {:error, "request target scheme does not agree with transport"}
+      {scheme, _} -> {:ok, scheme}
     end
   end
 

test/bandit/http1/request_test.exs

@@ -201,10 +201,11 @@ defmodule HTTP1RequestTest do
     end
 
     @tag capture_log: true
-    test "returns 400 if URI scheme does not match the transport", context do
+    test "uses request-line scheme even if it does not match the transport", context do
       client = SimpleHTTP1Client.tcp_client(context)
       SimpleHTTP1Client.send(client, "GET", "https://banana/echo_components")
-      assert {:ok, "400 Bad Request", _headers, <<>>} = SimpleHTTP1Client.recv_reply(client)
+      assert {:ok, "200 OK", _headers, body} = SimpleHTTP1Client.recv_reply(client)
+      assert Jason.decode!(body)["scheme"] == "https"
     end
 
     test "derives host from the URI, even if it differs from host header", context do

test/bandit/http2/protocol_test.exs

@@ -1661,7 +1661,7 @@ defmodule HTTP2ProtocolTest do
     end
 
     @tag capture_log: true
-    test "resets stream if scheme does not match transport", context do
+    test "uses :scheme even if it does not match transport", context do
       socket = SimpleH2Client.setup_connection(context)
 
       headers = [
@@ -1672,7 +1672,10 @@ defmodule HTTP2ProtocolTest do
       ]
 
       SimpleH2Client.send_headers(socket, 1, true, headers)
-      assert SimpleH2Client.recv_rst_stream(socket) == {:ok, 1, 1}
+
+      assert SimpleH2Client.successful_response?(socket, 1, false)
+      {:ok, 1, true, body} = SimpleH2Client.recv_body(socket)
+      assert Jason.decode!(body)["scheme"] == "http"
     end
 
     test "derives host from host header", context do
@@ -1938,7 +1941,7 @@ defmodule HTTP2ProtocolTest do
     end
 
     @tag capture_log: true
-    test "resets stream if scheme does not match transport", context do
+    test "uses :scheme even if it does not match transport", context do
       socket = SimpleH2Client.setup_connection(context)
 
       headers = [
@@ -1949,7 +1952,10 @@ defmodule HTTP2ProtocolTest do
       ]
 
       SimpleH2Client.send_headers(socket, 1, true, headers)
-      assert SimpleH2Client.recv_rst_stream(socket) == {:ok, 1, 1}
+
+      assert SimpleH2Client.successful_response?(socket, 1, false)
+      {:ok, 1, true, body} = SimpleH2Client.recv_body(socket)
+      assert Jason.decode!(body)["scheme"] == "http"
     end
 
     test "derives host from :authority header, even if it differs from host header", context do