Skip to content

Add more checks for CORS preflight requests #2140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 1 commit into from
Mar 6, 2019
Merged

Add more checks for CORS preflight requests #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions src/envoy/http/jwt_auth/jwt_authenticator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,18 @@ void JwtAuthenticator::Verify(HeaderMap &headers,
// Per the spec
// http://www.w3.org/TR/cors/#cross-origin-request-with-preflight-0, CORS
// pre-flight requests shouldn't include user credentials.
if (headers_->Method() && Http::Headers::get().MethodValues.Options ==
headers_->Method()->value().c_str()) {
// From
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers:
// "... This header is required if the request has an
// Access-Control-Request-Headers header.", which indicates that
// Access-Control-Request-Headers header may not always be present in a CORS
// request.
if (headers.Method() &&
Http::Headers::get().MethodValues.Options ==
headers.Method()->value().c_str() &&
headers.Origin() && !headers.Origin()->value().empty() &&
headers.AccessControlRequestMethod() &&
!headers.AccessControlRequestMethod()->value().empty()) {
ENVOY_LOG(debug, "CORS preflight request is passed through.");
DoneWithStatus(Status::OK);
return;
Expand Down
14 changes: 10 additions & 4 deletions src/envoy/http/jwt_auth/jwt_authenticator_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,10 @@ TEST_F(JwtAuthenticatorTest, TestMissingJwtWhenHttpMethodIsCORS) {
}));

auto cors_headers =
TestHeaderMapImpl{{":method", "OPTIONS"}, {":path", "/any/cors-path"}};
TestHeaderMapImpl{{":method", "OPTIONS"},
{"origin", "test-origin"},
{"access-control-request-method", "GET"},
{":path", "/any/cors-path"}};
auth_->Verify(cors_headers, &mock_cb_);
}

Expand All @@ -552,9 +555,12 @@ TEST_F(JwtAuthenticatorTest, TestInvalidJWTWhenHttpMethodIsCORS) {
}));

std::string token = "invalidToken";
auto cors_headers = TestHeaderMapImpl{{":method", "OPTIONS"},
{":path", "/any/cors-path"},
{"Authorization", "Bearer " + token}};
auto cors_headers =
TestHeaderMapImpl{{":method", "OPTIONS"},
{"origin", "test-origin"},
{"access-control-request-method", "GET"},
{":path", "/any/cors-path"},
{"Authorization", "Bearer " + token}};
auth_->Verify(cors_headers, &mock_cb_);
}

Expand Down