Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .tool-versions

This file was deleted.

3 changes: 1 addition & 2 deletions lib/grpc/server/interceptors/cors.ex
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ defmodule GRPC.Server.Interceptors.CORS do

@impl true
def call(req, stream, next, {allow_origin, allow_headers}) do
if stream.access_mode != :grpc and
Map.get(stream.http_request_headers, "sec-fetch-mode") == "cors" do
if stream.access_mode != :grpc do
headers =
%{}
|> add_allowed_origins(req, stream, allow_origin)
Expand Down
40 changes: 0 additions & 40 deletions test/grpc/server/interceptors/cors_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -271,44 +271,4 @@ defmodule GRPC.Server.Interceptors.CORSTest do
"Incorrect header when using function"
)
end

test "CORS only on cors sec-fetch-mode" do
request = %FakeRequest{}

stream = %{
create_stream()
| access_mode: :grpcweb,
http_request_headers: Map.put(@default_http_headers, "sec-fetch-mode", "same-origin")
}

{:ok, :ok} =
CORSInterceptor.call(
request,
%{stream | access_mode: :grpcweb},
fn _request, _stream -> {:ok, :ok} end,
CORSInterceptor.init(allow_origin: "*")
)

refute_received({:setting_headers, _}, "Set CORS header")
end

test "No CORS if missing sec-fetch-mode header" do
request = %FakeRequest{}

stream = %{
create_stream()
| access_mode: :grpcweb,
http_request_headers: Map.delete(@default_http_headers, "sec-fetch-mode")
}

{:ok, :ok} =
CORSInterceptor.call(
request,
%{stream | access_mode: :grpcweb},
fn _request, _stream -> {:ok, :ok} end,
CORSInterceptor.init(allow_origin: "*")
)

refute_received({:setting_headers, _}, "Set CORS header")
end
end
Loading