Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #541 from markdroth/create-pull-request/patch-b10c5f7

Browse Source 
Automated fix for refs/heads/httpcli_override_uri
pull/37540/head
Mark D. Roth 3 months ago committed by GitHub
parent b10c5f7306 c1a9be5875
commit 902b0d2097
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      test/core/security/credentials_test.cc

78
test/core/security/credentials_test.cc
Unescape View File

@ -694,7 +694,7 @@ TEST(CredentialsTest, TestChannelOauth2GoogleIamCompositeCreds) {
}
void validate_compute_engine_http_request(const grpc_http_request* request,
const grpc_core::URI& uri) {
const URI& uri) {
EXPECT_EQ(uri.authority(), "metadata.google.internal.");
EXPECT_EQ(uri.path(),
"/computeMetadata/v1/instance/service-accounts/default/token");
@ -704,9 +704,8 @@ void validate_compute_engine_http_request(const grpc_http_request* request,
}
int compute_engine_httpcli_get_success_override(
const grpc_http_request* request, const grpc_core::URI& uri,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
const grpc_http_request* request, const URI& uri, Timestamp /*deadline*/,
grpc_closure* on_done, grpc_http_response* response) {
validate_compute_engine_http_request(request, uri);
*response = http_response(200, valid_oauth2_json_response);
ExecCtx::Run(DEBUG_LOCATION, on_done, absl::OkStatus());
@ -714,9 +713,8 @@ int compute_engine_httpcli_get_success_override(
}
int compute_engine_httpcli_get_failure_override(
const grpc_http_request* request, const grpc_core::URI& uri,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
const grpc_http_request* request, const URI& uri, Timestamp /*deadline*/,
grpc_closure* on_done, grpc_http_response* response) {
validate_compute_engine_http_request(request, uri);
*response = http_response(403, "Not Authorized.");
ExecCtx::Run(DEBUG_LOCATION, on_done, absl::OkStatus());
@ -724,7 +722,7 @@ int compute_engine_httpcli_get_failure_override(
}
int httpcli_post_should_not_be_called(const grpc_http_request* /*request*/,
const grpc_core::URI& /*uri*/,
const URI& /*uri*/,
absl::string_view /*body*/,
Timestamp /*deadline*/,
grpc_closure* /*on_done*/,
@ -734,8 +732,7 @@ int httpcli_post_should_not_be_called(const grpc_http_request* /*request*/,
}
int httpcli_get_should_not_be_called(const grpc_http_request* /*request*/,
const grpc_core::URI& /*uri*/,
Timestamp /*deadline*/,
const URI& /*uri*/, Timestamp /*deadline*/,
grpc_closure* /*on_done*/,
grpc_http_response* /*response*/) {
CHECK(false) << "HTTP GET should not be called";
@ -743,7 +740,7 @@ int httpcli_get_should_not_be_called(const grpc_http_request* /*request*/,
}
int httpcli_put_should_not_be_called(const grpc_http_request* /*request*/,
const grpc_core::URI& /*uri*/,
const URI& /*uri*/,
absl::string_view /*body*/,
Timestamp /*deadline*/,
grpc_closure* /*on_done*/,
@ -808,7 +805,7 @@ TEST(CredentialsTest, TestComputeEngineCredsFailure) {
}
void validate_refresh_token_http_request(const grpc_http_request* request,
const grpc_core::URI& uri,
const URI& uri,
absl::string_view body) {
// The content of the assertion is tested extensively in json_token_test.
EXPECT_EQ(body, absl::StrFormat(GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING,
@ -824,8 +821,7 @@ void validate_refresh_token_http_request(const grpc_http_request* request,
}
int refresh_token_httpcli_post_success(const grpc_http_request* request,
const grpc_core::URI& uri,
absl::string_view body,
const URI& uri, absl::string_view body,
Timestamp /*deadline*/,
grpc_closure* on_done,
grpc_http_response* response) {
@ -836,8 +832,7 @@ int refresh_token_httpcli_post_success(const grpc_http_request* request,
}
int token_httpcli_post_failure(const grpc_http_request* /*request*/,
const grpc_core::URI& /*uri*/,
absl::string_view /*body*/,
const URI& /*uri*/, absl::string_view /*body*/,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
*response = http_response(403, "Not Authorized.");
@ -1007,8 +1002,7 @@ void assert_query_parameters(const URI& uri, absl::string_view expected_key,
}
void validate_sts_token_http_request(const grpc_http_request* request,
const grpc_core::URI& uri,
absl::string_view body,
const URI& uri, absl::string_view body,
bool expect_actor_token) {
// Check that the body is constructed properly.
std::string get_url_equivalent =
@ -1046,8 +1040,7 @@ void validate_sts_token_http_request(const grpc_http_request* request,
}
int sts_token_httpcli_post_success(const grpc_http_request* request,
const grpc_core::URI& uri,
absl::string_view body,
const URI& uri, absl::string_view body,
Timestamp /*deadline*/,
grpc_closure* on_done,
grpc_http_response* response) {
@ -1058,8 +1051,8 @@ int sts_token_httpcli_post_success(const grpc_http_request* request,
}
int sts_token_httpcli_post_success_no_actor_token(
const grpc_http_request* request, const grpc_core::URI& uri,
absl::string_view body, Timestamp /*deadline*/, grpc_closure* on_done,
const grpc_http_request* request, const URI& uri, absl::string_view body,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
validate_sts_token_http_request(request, uri, body, false);
*response = http_response(200, valid_sts_json_response);
@ -1590,7 +1583,7 @@ TEST(CredentialsTest, TestGoogleDefaultCredsExternalAccountCredentialsPscIam) {
}
int default_creds_metadata_server_detection_httpcli_get_success_override(
const grpc_http_request* /*request*/, const grpc_core::URI& uri,
const grpc_http_request* /*request*/, const URI& uri,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
*response = http_response(200, "");
@ -1678,7 +1671,7 @@ TEST(CredentialsTest, TestGoogleDefaultCredsNonGce) {
}
int default_creds_gce_detection_httpcli_get_failure_override(
const grpc_http_request* /*request*/, const grpc_core::URI& uri,
const grpc_http_request* /*request*/, const URI& uri,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
// No magic header.
@ -2093,7 +2086,7 @@ TEST(CredentialsTest, TestAuthMetadataContext) {
}
void validate_external_account_creds_token_exchage_request(
const grpc_http_request* request, const grpc_core::URI& request_uri,
const grpc_http_request* request, const URI& request_uri,
absl::string_view body) {
// Check that the body is constructed properly.
std::string get_url_equivalent =
@ -2125,8 +2118,7 @@ void validate_external_account_creds_token_exchage_request(
}
void validate_external_account_creds_token_exchage_request_with_url_encode(
const grpc_http_request* request, const grpc_core::URI& uri,
absl::string_view body) {
const grpc_http_request* request, const URI& uri, absl::string_view body) {
// Check that the body is constructed properly.
EXPECT_EQ(
body,
@ -2149,8 +2141,7 @@ void validate_external_account_creds_token_exchage_request_with_url_encode(
}
void validate_external_account_creds_service_account_impersonation_request(
const grpc_http_request* request, const grpc_core::URI& uri,
absl::string_view body) {
const grpc_http_request* request, const URI& uri, absl::string_view body) {
// Check that the body is constructed properly.
EXPECT_EQ(body, "scope=scope_1%20scope_2&lifetime=3600s");
// Check the rest of the request.
@ -2166,8 +2157,7 @@ void validate_external_account_creds_service_account_impersonation_request(
}
void validate_external_account_creds_serv_acc_imp_custom_lifetime_request(
const grpc_http_request* request, const grpc_core::URI& uri,
absl::string_view body) {
const grpc_http_request* request, const URI& uri, absl::string_view body) {
// Check that the body is constructed properly.
EXPECT_EQ(body, "scope=scope_1%20scope_2&lifetime=1800s");
// Check the rest of the request.
@ -2183,8 +2173,8 @@ void validate_external_account_creds_serv_acc_imp_custom_lifetime_request(
}
int external_acc_creds_serv_acc_imp_custom_lifetime_httpcli_post_success(
const grpc_http_request* request, const grpc_core::URI& uri,
absl::string_view body, Timestamp /*deadline*/, grpc_closure* on_done,
const grpc_http_request* request, const URI& uri, absl::string_view body,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
if (uri.path() == "/token") {
validate_external_account_creds_token_exchage_request(request, uri, body);
@ -2202,8 +2192,8 @@ int external_acc_creds_serv_acc_imp_custom_lifetime_httpcli_post_success(
}
int external_account_creds_httpcli_post_success(
const grpc_http_request* request, const grpc_core::URI& uri,
absl::string_view body, Timestamp /*deadline*/, grpc_closure* on_done,
const grpc_http_request* request, const URI& uri, absl::string_view body,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
if (uri.path() == "/token") {
validate_external_account_creds_token_exchage_request(request, uri, body);
@ -2226,7 +2216,7 @@ int external_account_creds_httpcli_post_success(
}
int external_account_creds_httpcli_post_failure_token_exchange_response_missing_access_token(
const grpc_http_request* /*request*/, const grpc_core::URI& uri,
const grpc_http_request* /*request*/, const URI& uri,
absl::string_view /*body*/, Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
if (uri.path() == "/token") {
@ -2244,7 +2234,7 @@ int external_account_creds_httpcli_post_failure_token_exchange_response_missing_
}
int url_external_account_creds_httpcli_get_success(
const grpc_http_request* /*request*/, const grpc_core::URI& uri,
const grpc_http_request* /*request*/, const URI& uri,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
if (uri.path() == "/generate_subject_token_format_text") {
@ -2265,7 +2255,7 @@ int url_external_account_creds_httpcli_get_success(
}
void validate_aws_external_account_creds_token_exchage_request(
const grpc_http_request* request, const grpc_core::URI& request_uri,
const grpc_http_request* request, const URI& request_uri,
absl::string_view body) {
// Check that the regional_cred_verification_url got constructed
// with the correct AWS Region ("test_regionz" or "test_region").
@ -2301,7 +2291,7 @@ void validate_aws_external_account_creds_token_exchage_request(
}
int aws_external_account_creds_httpcli_get_success(
const grpc_http_request* /*request*/, const grpc_core::URI& uri,
const grpc_http_request* /*request*/, const URI& uri,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
if (uri.path() == "/region_url") {
@ -2319,8 +2309,8 @@ int aws_external_account_creds_httpcli_get_success(
}
int aws_imdsv2_external_account_creds_httpcli_get_success(
const grpc_http_request* request, const grpc_core::URI& uri,
Timestamp deadline, grpc_closure* on_done, grpc_http_response* response) {
const grpc_http_request* request, const URI& uri, Timestamp deadline,
grpc_closure* on_done, grpc_http_response* response) {
EXPECT_EQ(request->hdr_count, 1);
if (request->hdr_count == 1) {
EXPECT_EQ(absl::string_view(request->hdrs[0].key),
@ -2333,7 +2323,7 @@ int aws_imdsv2_external_account_creds_httpcli_get_success(
}
int aws_imdsv2_external_account_creds_httpcli_put_success(
const grpc_http_request* request, const grpc_core::URI& uri,
const grpc_http_request* request, const URI& uri,
absl::string_view /*body*/, Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
EXPECT_EQ(request->hdr_count, 1);
@ -2349,8 +2339,8 @@ int aws_imdsv2_external_account_creds_httpcli_put_success(
}
int aws_external_account_creds_httpcli_post_success(
const grpc_http_request* request, const grpc_core::URI& uri,
absl::string_view body, Timestamp /*deadline*/, grpc_closure* on_done,
const grpc_http_request* request, const URI& uri, absl::string_view body,
Timestamp /*deadline*/, grpc_closure* on_done,
grpc_http_response* response) {
if (uri.path() == "/token") {
validate_aws_external_account_creds_token_exchage_request(request, uri,

Write Preview
Loading…
Cancel
Save