-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request grpc#933 from ctiller/bugscrub2
A couple of fixes + a test for client side authentication of hostnames
- Loading branch information
Showing
8 changed files
with
488 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| /* | ||
| * | ||
| * Copyright 2015, Google Inc. | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google Inc. nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| * | ||
| */ | ||
|
|
||
| #include "test/core/end2end/end2end_tests.h" | ||
|
|
||
| #include <stdio.h> | ||
| #include <string.h> | ||
| #include <unistd.h> | ||
|
|
||
| #include "src/core/support/string.h" | ||
| #include <grpc/byte_buffer.h> | ||
| #include <grpc/grpc.h> | ||
| #include <grpc/support/alloc.h> | ||
| #include <grpc/support/log.h> | ||
| #include <grpc/support/time.h> | ||
| #include <grpc/support/useful.h> | ||
| #include "test/core/end2end/cq_verifier.h" | ||
|
|
||
| enum { TIMEOUT = 200000 }; | ||
|
|
||
| static void *tag(gpr_intptr t) { return (void *)t; } | ||
|
|
||
| static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, | ||
| const char *test_name, | ||
| grpc_channel_args *client_args, | ||
| grpc_channel_args *server_args) { | ||
| grpc_end2end_test_fixture f; | ||
| gpr_log(GPR_INFO, "%s/%s", test_name, config.name); | ||
| f = config.create_fixture(client_args, server_args); | ||
| config.init_client(&f, client_args); | ||
| config.init_server(&f, server_args); | ||
| return f; | ||
| } | ||
|
|
||
| static gpr_timespec n_seconds_time(int n) { | ||
| return GRPC_TIMEOUT_SECONDS_TO_DEADLINE(n); | ||
| } | ||
|
|
||
| static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } | ||
|
|
||
| static void drain_cq(grpc_completion_queue *cq) { | ||
| grpc_event *ev; | ||
| grpc_completion_type type; | ||
| do { | ||
| ev = grpc_completion_queue_next(cq, five_seconds_time()); | ||
| GPR_ASSERT(ev); | ||
| type = ev->type; | ||
| grpc_event_finish(ev); | ||
| } while (type != GRPC_QUEUE_SHUTDOWN); | ||
| } | ||
|
|
||
| static void shutdown_server(grpc_end2end_test_fixture *f) { | ||
| if (!f->server) return; | ||
| grpc_server_shutdown(f->server); | ||
| grpc_server_destroy(f->server); | ||
| f->server = NULL; | ||
| } | ||
|
|
||
| static void shutdown_client(grpc_end2end_test_fixture *f) { | ||
| if (!f->client) return; | ||
| grpc_channel_destroy(f->client); | ||
| f->client = NULL; | ||
| } | ||
|
|
||
| static void end_test(grpc_end2end_test_fixture *f) { | ||
| shutdown_server(f); | ||
| shutdown_client(f); | ||
|
|
||
| grpc_completion_queue_shutdown(f->server_cq); | ||
| drain_cq(f->server_cq); | ||
| grpc_completion_queue_destroy(f->server_cq); | ||
| grpc_completion_queue_shutdown(f->client_cq); | ||
| drain_cq(f->client_cq); | ||
| grpc_completion_queue_destroy(f->client_cq); | ||
| } | ||
|
|
||
| static void simple_request_body(grpc_end2end_test_fixture f) { | ||
| grpc_call *c; | ||
| gpr_timespec deadline = five_seconds_time(); | ||
| cq_verifier *v_client = cq_verifier_create(f.client_cq); | ||
| grpc_op ops[6]; | ||
| grpc_op *op; | ||
| grpc_metadata_array initial_metadata_recv; | ||
| grpc_metadata_array trailing_metadata_recv; | ||
| grpc_metadata_array request_metadata_recv; | ||
| grpc_call_details call_details; | ||
| grpc_status_code status; | ||
| char *details = NULL; | ||
| size_t details_capacity = 0; | ||
|
|
||
| c = grpc_channel_create_call(f.client, f.client_cq, "/foo", | ||
| "slartibartfast.local", deadline); | ||
| GPR_ASSERT(c); | ||
|
|
||
| grpc_metadata_array_init(&initial_metadata_recv); | ||
| grpc_metadata_array_init(&trailing_metadata_recv); | ||
| grpc_metadata_array_init(&request_metadata_recv); | ||
| grpc_call_details_init(&call_details); | ||
|
|
||
| op = ops; | ||
| op->op = GRPC_OP_SEND_INITIAL_METADATA; | ||
| op->data.send_initial_metadata.count = 0; | ||
| op++; | ||
| op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT; | ||
| op++; | ||
| op->op = GRPC_OP_RECV_INITIAL_METADATA; | ||
| op->data.recv_initial_metadata = &initial_metadata_recv; | ||
| op++; | ||
| op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; | ||
| op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv; | ||
| op->data.recv_status_on_client.status = &status; | ||
| op->data.recv_status_on_client.status_details = &details; | ||
| op->data.recv_status_on_client.status_details_capacity = &details_capacity; | ||
| op++; | ||
| GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(c, ops, op - ops, tag(1))); | ||
|
|
||
| cq_expect_completion(v_client, tag(1), GRPC_OP_OK); | ||
| cq_verify(v_client); | ||
|
|
||
| GPR_ASSERT(status == GRPC_STATUS_UNAUTHENTICATED); | ||
|
|
||
| gpr_free(details); | ||
| grpc_metadata_array_destroy(&initial_metadata_recv); | ||
| grpc_metadata_array_destroy(&trailing_metadata_recv); | ||
| grpc_metadata_array_destroy(&request_metadata_recv); | ||
| grpc_call_details_destroy(&call_details); | ||
|
|
||
| grpc_call_destroy(c); | ||
|
|
||
| cq_verifier_destroy(v_client); | ||
| } | ||
|
|
||
| static void test_invoke_simple_request(grpc_end2end_test_config config) { | ||
| grpc_end2end_test_fixture f; | ||
|
|
||
| f = begin_test(config, __FUNCTION__, NULL, NULL); | ||
| simple_request_body(f); | ||
| end_test(&f); | ||
| config.tear_down_data(&f); | ||
| } | ||
|
|
||
| void grpc_end2end_tests(grpc_end2end_test_config config) { | ||
| if (config.feature_mask & FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION) { | ||
| test_invoke_simple_request(config); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters