Adding connect auth feature. Proxy-Authorization header is being inserted when user creds are present in uri

pull/11884/head
Yash Tibrewal 7 years ago
parent 19fc5526b2
commit f7350ea6b7
  1. 2
      CMakeLists.txt
  2. 2
      Makefile
  3. 53
      src/core/ext/filters/client_channel/http_proxy.c
  4. 8
      test/core/end2end/end2end_nosec_tests.c
  5. 8
      test/core/end2end/end2end_tests.c
  6. 26
      test/core/end2end/fixtures/h2_http_proxy.c
  7. 43
      test/core/end2end/fixtures/http_proxy_fixture.c
  8. 21
      test/core/end2end/fixtures/http_proxy_fixture.h
  9. 1
      test/core/end2end/gen_build_yaml.py
  10. 1
      test/core/end2end/generate_tests.bzl
  11. 302
      test/core/end2end/tests/payload_with_proxy_auth.c
  12. 2
      tools/run_tests/generated/sources_and_headers.json
  13. 904
      tools/run_tests/generated/tests.json
  14. 2
      vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj
  15. 3
      vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters
  16. 2
      vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj
  17. 3
      vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters

@ -4337,6 +4337,7 @@ add_library(end2end_tests
test/core/end2end/tests/no_logging.c test/core/end2end/tests/no_logging.c
test/core/end2end/tests/no_op.c test/core/end2end/tests/no_op.c
test/core/end2end/tests/payload.c test/core/end2end/tests/payload.c
test/core/end2end/tests/payload_with_proxy_auth.c
test/core/end2end/tests/ping.c test/core/end2end/tests/ping.c
test/core/end2end/tests/ping_pong_streaming.c test/core/end2end/tests/ping_pong_streaming.c
test/core/end2end/tests/registered_call.c test/core/end2end/tests/registered_call.c
@ -4436,6 +4437,7 @@ add_library(end2end_nosec_tests
test/core/end2end/tests/no_logging.c test/core/end2end/tests/no_logging.c
test/core/end2end/tests/no_op.c test/core/end2end/tests/no_op.c
test/core/end2end/tests/payload.c test/core/end2end/tests/payload.c
test/core/end2end/tests/payload_with_proxy_auth.c
test/core/end2end/tests/ping.c test/core/end2end/tests/ping.c
test/core/end2end/tests/ping_pong_streaming.c test/core/end2end/tests/ping_pong_streaming.c
test/core/end2end/tests/registered_call.c test/core/end2end/tests/registered_call.c

@ -7926,6 +7926,7 @@ LIBEND2END_TESTS_SRC = \
test/core/end2end/tests/no_logging.c \ test/core/end2end/tests/no_logging.c \
test/core/end2end/tests/no_op.c \ test/core/end2end/tests/no_op.c \
test/core/end2end/tests/payload.c \ test/core/end2end/tests/payload.c \
test/core/end2end/tests/payload_with_proxy_auth.c \
test/core/end2end/tests/ping.c \ test/core/end2end/tests/ping.c \
test/core/end2end/tests/ping_pong_streaming.c \ test/core/end2end/tests/ping_pong_streaming.c \
test/core/end2end/tests/registered_call.c \ test/core/end2end/tests/registered_call.c \
@ -8020,6 +8021,7 @@ LIBEND2END_NOSEC_TESTS_SRC = \
test/core/end2end/tests/no_logging.c \ test/core/end2end/tests/no_logging.c \
test/core/end2end/tests/no_op.c \ test/core/end2end/tests/no_op.c \
test/core/end2end/tests/payload.c \ test/core/end2end/tests/payload.c \
test/core/end2end/tests/payload_with_proxy_auth.c \
test/core/end2end/tests/ping.c \ test/core/end2end/tests/ping.c \
test/core/end2end/tests/ping_pong_streaming.c \ test/core/end2end/tests/ping_pong_streaming.c \
test/core/end2end/tests/registered_call.c \ test/core/end2end/tests/registered_call.c \

@ -30,13 +30,17 @@
#include "src/core/ext/filters/client_channel/uri_parser.h" #include "src/core/ext/filters/client_channel/uri_parser.h"
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/support/env.h" #include "src/core/lib/support/env.h"
#include "src/core/lib/support/string.h"
#include "src/core/lib/slice/b64.h"
static char* grpc_get_http_proxy_server(grpc_exec_ctx* exec_ctx) { static void grpc_get_http_proxy_server(grpc_exec_ctx* exec_ctx,
char **name_to_resolve,
char **user_cred) {
*name_to_resolve = NULL;
char* uri_str = gpr_getenv("http_proxy"); char* uri_str = gpr_getenv("http_proxy");
if (uri_str == NULL) return NULL; if (uri_str == NULL) return;
grpc_uri* uri = grpc_uri* uri =
grpc_uri_parse(exec_ctx, uri_str, false /* suppress_errors */); grpc_uri_parse(exec_ctx, uri_str, false /* suppress_errors */);
char* proxy_name = NULL;
if (uri == NULL || uri->authority == NULL) { if (uri == NULL || uri->authority == NULL) {
gpr_log(GPR_ERROR, "cannot parse value of 'http_proxy' env var"); gpr_log(GPR_ERROR, "cannot parse value of 'http_proxy' env var");
goto done; goto done;
@ -45,15 +49,18 @@ static char* grpc_get_http_proxy_server(grpc_exec_ctx* exec_ctx) {
gpr_log(GPR_ERROR, "'%s' scheme not supported in proxy URI", uri->scheme); gpr_log(GPR_ERROR, "'%s' scheme not supported in proxy URI", uri->scheme);
goto done; goto done;
} }
if (strchr(uri->authority, '@') != NULL) { char *user_cred_end = strchr(uri->authority, '@');
gpr_log(GPR_ERROR, "userinfo not supported in proxy URI"); if (user_cred_end != NULL) {
goto done; *name_to_resolve = gpr_strdup(user_cred_end + 1);
*user_cred_end = '\0';
*user_cred = gpr_strdup(uri->authority);
gpr_log(GPR_INFO, "userinfo found in proxy URI");
} else {
*name_to_resolve = gpr_strdup(uri->authority);
} }
proxy_name = gpr_strdup(uri->authority);
done: done:
gpr_free(uri_str); gpr_free(uri_str);
grpc_uri_destroy(uri); grpc_uri_destroy(uri);
return proxy_name;
} }
static bool proxy_mapper_map_name(grpc_exec_ctx* exec_ctx, static bool proxy_mapper_map_name(grpc_exec_ctx* exec_ctx,
@ -62,7 +69,8 @@ static bool proxy_mapper_map_name(grpc_exec_ctx* exec_ctx,
const grpc_channel_args* args, const grpc_channel_args* args,
char** name_to_resolve, char** name_to_resolve,
grpc_channel_args** new_args) { grpc_channel_args** new_args) {
*name_to_resolve = grpc_get_http_proxy_server(exec_ctx); char *user_cred = NULL;
grpc_get_http_proxy_server(exec_ctx, name_to_resolve, &user_cred);
if (*name_to_resolve == NULL) return false; if (*name_to_resolve == NULL) return false;
grpc_uri* uri = grpc_uri* uri =
grpc_uri_parse(exec_ctx, server_uri, false /* suppress_errors */); grpc_uri_parse(exec_ctx, server_uri, false /* suppress_errors */);
@ -71,19 +79,40 @@ static bool proxy_mapper_map_name(grpc_exec_ctx* exec_ctx,
"'http_proxy' environment variable set, but cannot " "'http_proxy' environment variable set, but cannot "
"parse server URI '%s' -- not using proxy", "parse server URI '%s' -- not using proxy",
server_uri); server_uri);
if (uri != NULL) grpc_uri_destroy(uri); if (uri != NULL) {
gpr_free(user_cred);
grpc_uri_destroy(uri);
}
return false; return false;
} }
if (strcmp(uri->scheme, "unix") == 0) { if (strcmp(uri->scheme, "unix") == 0) {
gpr_log(GPR_INFO, "not using proxy for Unix domain socket '%s'", gpr_log(GPR_INFO, "not using proxy for Unix domain socket '%s'",
server_uri); server_uri);
gpr_free(user_cred);
grpc_uri_destroy(uri); grpc_uri_destroy(uri);
return false; return false;
} }
grpc_arg new_arg = grpc_channel_arg_string_create(
grpc_arg args_to_add[2];
args_to_add[0] = grpc_channel_arg_string_create(
GRPC_ARG_HTTP_CONNECT_SERVER, GRPC_ARG_HTTP_CONNECT_SERVER,
uri->path[0] == '/' ? uri->path + 1 : uri->path); uri->path[0] == '/' ? uri->path + 1 : uri->path);
*new_args = grpc_channel_args_copy_and_add(args, &new_arg, 1);
if(user_cred != NULL) {
/* Use base64 encoding for user credentials */
char *encoded_user_cred =
grpc_base64_encode(user_auth, strlen(user_cred), 0, 0);
char *header;
gpr_asprintf(&header, "Proxy-Authorization:Basic %s", encoded_user_cred);
gpr_free(encoded_user_cred);
args_to_add[1] = grpc_channel_arg_string_create(
GRPC_ARG_HTTP_CONNECT_HEADERS, header);
*new_args = grpc_channel_args_copy_and_add(args, args_to_add, 2);
gpr_free(header);
} else {
*new_args = grpc_channel_args_copy_and_add(args, args_to_add, 1);
}
gpr_free(user_cred);
grpc_uri_destroy(uri); grpc_uri_destroy(uri);
return true; return true;
} }

@ -102,6 +102,8 @@ extern void no_op(grpc_end2end_test_config config);
extern void no_op_pre_init(void); extern void no_op_pre_init(void);
extern void payload(grpc_end2end_test_config config); extern void payload(grpc_end2end_test_config config);
extern void payload_pre_init(void); extern void payload_pre_init(void);
extern void payload_with_proxy_auth(grpc_end2end_test_config config);
extern void payload_with_proxy_auth_pre_init(void);
extern void ping(grpc_end2end_test_config config); extern void ping(grpc_end2end_test_config config);
extern void ping_pre_init(void); extern void ping_pre_init(void);
extern void ping_pong_streaming(grpc_end2end_test_config config); extern void ping_pong_streaming(grpc_end2end_test_config config);
@ -179,6 +181,7 @@ void grpc_end2end_tests_pre_init(void) {
no_logging_pre_init(); no_logging_pre_init();
no_op_pre_init(); no_op_pre_init();
payload_pre_init(); payload_pre_init();
payload_with_proxy_auth_pre_init();
ping_pre_init(); ping_pre_init();
ping_pong_streaming_pre_init(); ping_pong_streaming_pre_init();
registered_call_pre_init(); registered_call_pre_init();
@ -242,6 +245,7 @@ void grpc_end2end_tests(int argc, char **argv,
no_logging(config); no_logging(config);
no_op(config); no_op(config);
payload(config); payload(config);
payload_with_proxy_auth(config);
ping(config); ping(config);
ping_pong_streaming(config); ping_pong_streaming(config);
registered_call(config); registered_call(config);
@ -408,6 +412,10 @@ void grpc_end2end_tests(int argc, char **argv,
payload(config); payload(config);
continue; continue;
} }
if (0 == strcmp("payload_with_proxy_auth", argv[i])) {
payload_with_proxy_auth(config);
continue;
}
if (0 == strcmp("ping", argv[i])) { if (0 == strcmp("ping", argv[i])) {
ping(config); ping(config);
continue; continue;

@ -104,6 +104,8 @@ extern void no_op(grpc_end2end_test_config config);
extern void no_op_pre_init(void); extern void no_op_pre_init(void);
extern void payload(grpc_end2end_test_config config); extern void payload(grpc_end2end_test_config config);
extern void payload_pre_init(void); extern void payload_pre_init(void);
extern void payload_with_proxy_auth(grpc_end2end_test_config config);
extern void payload_with_proxy_auth_pre_init(void);
extern void ping(grpc_end2end_test_config config); extern void ping(grpc_end2end_test_config config);
extern void ping_pre_init(void); extern void ping_pre_init(void);
extern void ping_pong_streaming(grpc_end2end_test_config config); extern void ping_pong_streaming(grpc_end2end_test_config config);
@ -182,6 +184,7 @@ void grpc_end2end_tests_pre_init(void) {
no_logging_pre_init(); no_logging_pre_init();
no_op_pre_init(); no_op_pre_init();
payload_pre_init(); payload_pre_init();
payload_with_proxy_auth_pre_init();
ping_pre_init(); ping_pre_init();
ping_pong_streaming_pre_init(); ping_pong_streaming_pre_init();
registered_call_pre_init(); registered_call_pre_init();
@ -246,6 +249,7 @@ void grpc_end2end_tests(int argc, char **argv,
no_logging(config); no_logging(config);
no_op(config); no_op(config);
payload(config); payload(config);
payload_with_proxy_auth(config);
ping(config); ping(config);
ping_pong_streaming(config); ping_pong_streaming(config);
registered_call(config); registered_call(config);
@ -416,6 +420,10 @@ void grpc_end2end_tests(int argc, char **argv,
payload(config); payload(config);
continue; continue;
} }
if (0 == strcmp("payload_with_proxy_auth", argv[i])) {
payload_with_proxy_auth(config);
continue;
}
if (0 == strcmp("ping", argv[i])) { if (0 == strcmp("ping", argv[i])) {
ping(config); ping(config);
continue; continue;

@ -47,11 +47,26 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack(
grpc_channel_args *client_args, grpc_channel_args *server_args) { grpc_channel_args *client_args, grpc_channel_args *server_args) {
grpc_end2end_test_fixture f; grpc_end2end_test_fixture f;
memset(&f, 0, sizeof(f)); memset(&f, 0, sizeof(f));
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data)); fullstack_fixture_data *ffd = gpr_malloc(sizeof(fullstack_fixture_data));
const int server_port = grpc_pick_unused_port_or_die(); const int server_port = grpc_pick_unused_port_or_die();
gpr_join_host_port(&ffd->server_addr, "localhost", server_port); gpr_join_host_port(&ffd->server_addr, "localhost", server_port);
ffd->proxy = grpc_end2end_http_proxy_create();
/*const grpc_arg *proxy_auth_arg =
grpc_channel_args_find(client_args, "test_uses_proxy_auth");
ffd->proxy = grpc_end2end_http_proxy_create(proxy_args);*/
//If we are testing proxy auth, add the proxy auth arg to proxy channel args
grpc_channel_args *proxy_args = NULL;
const grpc_arg *proxy_auth_arg = grpc_channel_args_find(
client_args, GRPC_END2END_HTTP_PROXY_TEST_CONNECT_AUTH_PRESENT);
if(proxy_auth_arg) {
proxy_args = grpc_channel_args_copy_and_add(NULL, proxy_auth_arg, 1);
}
ffd->proxy = grpc_end2end_http_proxy_create(proxy_args);
grpc_channel_args_destroy(&exec_ctx, proxy_args);
grpc_exec_ctx_finish(&exec_ctx);
f.fixture_data = ffd; f.fixture_data = ffd;
f.cq = grpc_completion_queue_create_for_next(NULL); f.cq = grpc_completion_queue_create_for_next(NULL);
@ -64,8 +79,17 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f,
grpc_channel_args *client_args) { grpc_channel_args *client_args) {
fullstack_fixture_data *ffd = f->fixture_data; fullstack_fixture_data *ffd = f->fixture_data;
char *proxy_uri; char *proxy_uri;
// If testing for proxy auth, add credentials to proxy uri
if(grpc_channel_args_find(
client_args, GRPC_END2END_HTTP_PROXY_TEST_CONNECT_AUTH_PRESENT) == NULL) {
gpr_asprintf(&proxy_uri, "http://%s", gpr_asprintf(&proxy_uri, "http://%s",
grpc_end2end_http_proxy_get_proxy_name(ffd->proxy)); grpc_end2end_http_proxy_get_proxy_name(ffd->proxy));
} else {
gpr_asprintf(&proxy_uri, "http://%s@%s",
GRPC_END2END_HTTP_PROXY_TEST_CONNECT_CRED,
grpc_end2end_http_proxy_get_proxy_name(ffd->proxy));
}
gpr_setenv("http_proxy", proxy_uri); gpr_setenv("http_proxy", proxy_uri);
gpr_free(proxy_uri); gpr_free(proxy_uri);
f->client = grpc_insecure_channel_create(ffd->server_addr, client_args, NULL); f->client = grpc_insecure_channel_create(ffd->server_addr, client_args, NULL);

@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include <grpc/grpc.h>
#include <grpc/slice_buffer.h> #include <grpc/slice_buffer.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/atm.h> #include <grpc/support/atm.h>
@ -47,6 +48,7 @@
#include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/tcp_server.h"
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/slice/b64.h"
#include "test/core/util/port.h" #include "test/core/util/port.h"
struct grpc_end2end_http_proxy { struct grpc_end2end_http_proxy {
@ -352,6 +354,42 @@ static void on_read_request_done(grpc_exec_ctx* exec_ctx, void* arg,
GRPC_ERROR_UNREF(error); GRPC_ERROR_UNREF(error);
return; return;
} }
// If proxy auth is being used, check if the header is present
if(grpc_channel_args_find(
conn->proxy->channel_args,
GRPC_END2END_HTTP_PROXY_TEST_CONNECT_AUTH_PRESENT) != NULL) {
bool found = false, failed = false;
for(size_t i = 0; i < conn->http_request.hdr_count; i++) {
if(strcmp(conn->http_request.hdrs[i].key, "Proxy-Authorization") == 0) {
found = true;
// Authentication type should be Basic
if(strncmp(conn->http_request.hdrs[i].value, "Basic",
strlen("Basic")) != 0) {
failed = true;
break;
}
// Check if encoded string is as expected
char *encoded_str_start =
strchr(conn->http_request.hdrs[i].value, ' ') + 1;
grpc_slice decoded_slice =
grpc_base64_decode(exec_ctx, encoded_str_start, 0);
if(grpc_slice_str_cmp(
decoded_slice, GRPC_END2END_HTTP_PROXY_TEST_CONNECT_CRED) != 0) {
failed = true;
break;
}
break;
}
}
if(!found || failed) {
const char *msg = "HTTP Connect could not verify authentication";
error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(msg);
proxy_connection_failed(exec_ctx, conn, true /* is_client */,
"HTTP proxy read request", error);
GRPC_ERROR_UNREF(error);
return;
}
}
// Resolve address. // Resolve address.
grpc_resolved_addresses* resolved_addresses = NULL; grpc_resolved_addresses* resolved_addresses = NULL;
error = grpc_blocking_resolve_address(conn->http_request.path, "80", error = grpc_blocking_resolve_address(conn->http_request.path, "80",
@ -436,7 +474,8 @@ static void thread_main(void* arg) {
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
} }
grpc_end2end_http_proxy* grpc_end2end_http_proxy_create(void) { grpc_end2end_http_proxy* grpc_end2end_http_proxy_create(
grpc_channel_args *args) {
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_end2end_http_proxy* proxy = grpc_end2end_http_proxy* proxy =
(grpc_end2end_http_proxy*)gpr_malloc(sizeof(*proxy)); (grpc_end2end_http_proxy*)gpr_malloc(sizeof(*proxy));
@ -448,7 +487,7 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create(void) {
gpr_join_host_port(&proxy->proxy_name, "localhost", proxy_port); gpr_join_host_port(&proxy->proxy_name, "localhost", proxy_port);
gpr_log(GPR_INFO, "Proxy address: %s", proxy->proxy_name); gpr_log(GPR_INFO, "Proxy address: %s", proxy->proxy_name);
// Create TCP server. // Create TCP server.
proxy->channel_args = grpc_channel_args_copy(NULL); proxy->channel_args = grpc_channel_args_copy(args);
grpc_error* error = grpc_tcp_server_create( grpc_error* error = grpc_tcp_server_create(
&exec_ctx, NULL, proxy->channel_args, &proxy->server); &exec_ctx, NULL, proxy->channel_args, &proxy->server);
GPR_ASSERT(error == GRPC_ERROR_NONE); GPR_ASSERT(error == GRPC_ERROR_NONE);

@ -16,11 +16,30 @@
* *
*/ */
#ifndef GRPC_TEST_CORE_END2END_FIXTURES_HTTP_PROXY_FIXTURE_H
#define GRPC_TEST_CORE_END2END_FIXTURES_HTTP_PROXY_FIXTURE_H
#include <grpc/grpc.h>
/* The test credentials being used for HTTP Proxy Authorization */
#define GRPC_END2END_HTTP_PROXY_TEST_CONNECT_CRED "aladdin:opensesame"
/* A channel arg key used to indicate that the channel uses proxy authorization.
* The value is of no consequence as just the presence of the argument is
* enough. It is currently kept as of type integer but can be changed as seen
* fit.
*/
#define GRPC_END2END_HTTP_PROXY_TEST_CONNECT_AUTH_PRESENT \
"grpc.test.connect_auth"
typedef struct grpc_end2end_http_proxy grpc_end2end_http_proxy; typedef struct grpc_end2end_http_proxy grpc_end2end_http_proxy;
grpc_end2end_http_proxy* grpc_end2end_http_proxy_create(); grpc_end2end_http_proxy* grpc_end2end_http_proxy_create(
grpc_channel_args *args);
void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy); void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy);
const char* grpc_end2end_http_proxy_get_proxy_name( const char* grpc_end2end_http_proxy_get_proxy_name(
grpc_end2end_http_proxy* proxy); grpc_end2end_http_proxy* proxy);
#endif /* GRPC_TEST_CORE_END2END_FIXTURES_HTTP_PROXY_FIXTURE_H */

@ -122,6 +122,7 @@ END2END_TESTS = {
'no_logging': default_test_options._replace(traceable=False), 'no_logging': default_test_options._replace(traceable=False),
'no_op': default_test_options, 'no_op': default_test_options,
'payload': default_test_options, 'payload': default_test_options,
'payload_with_proxy_auth': default_test_options,
'load_reporting_hook': default_test_options, 'load_reporting_hook': default_test_options,
'ping_pong_streaming': default_test_options._replace(cpu_cost=LOWCPU), 'ping_pong_streaming': default_test_options._replace(cpu_cost=LOWCPU),
'ping': connectivity_test_options._replace(proxyable=False, cpu_cost=LOWCPU), 'ping': connectivity_test_options._replace(proxyable=False, cpu_cost=LOWCPU),

@ -106,6 +106,7 @@ END2END_TESTS = {
'no_logging': test_options(traceable=False), 'no_logging': test_options(traceable=False),
'no_op': test_options(), 'no_op': test_options(),
'payload': test_options(), 'payload': test_options(),
'payload_with_proxy_auth': test_options(),
'load_reporting_hook': test_options(), 'load_reporting_hook': test_options(),
'ping_pong_streaming': test_options(), 'ping_pong_streaming': test_options(),
'ping': test_options(needs_fullstack=True, proxyable=False), 'ping': test_options(needs_fullstack=True, proxyable=False),

@ -0,0 +1,302 @@
/*
*
* Copyright 2015 gRPC authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
#include "test/core/end2end/end2end_tests.h"
#include "test/core/end2end/fixtures/http_proxy_fixture.h"
#include <stdio.h>
#include <string.h>
#include <grpc/byte_buffer.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"
static void *tag(intptr_t 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, "Running test: %s/%s", test_name, config.name);
f = config.create_fixture(client_args, server_args);
config.init_server(&f, server_args);
config.init_client(&f, client_args);
return f;
}
static gpr_timespec n_seconds_from_now(int n) {
return grpc_timeout_seconds_to_deadline(n);
}
static gpr_timespec five_seconds_from_now(void) {
return n_seconds_from_now(5);
}
static void drain_cq(grpc_completion_queue *cq) {
grpc_event ev;
do {
ev = grpc_completion_queue_next(cq, five_seconds_from_now(), NULL);
} while (ev.type != GRPC_QUEUE_SHUTDOWN);
}
static void shutdown_server(grpc_end2end_test_fixture *f) {
if (!f->server) return;
grpc_server_shutdown_and_notify(f->server, f->shutdown_cq, tag(1000));
GPR_ASSERT(grpc_completion_queue_pluck(f->shutdown_cq, tag(1000),
grpc_timeout_seconds_to_deadline(5),
NULL)
.type == GRPC_OP_COMPLETE);
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->cq);
drain_cq(f->cq);
grpc_completion_queue_destroy(f->cq);
grpc_completion_queue_destroy(f->shutdown_cq);
}
/* Creates and returns a grpc_slice containing random alphanumeric characters.
*/
static grpc_slice generate_random_slice() {
size_t i;
static const char chars[] = "abcdefghijklmnopqrstuvwxyz1234567890";
char *output;
const size_t output_size = 1024 * 1024;
output = gpr_malloc(output_size);
for (i = 0; i < output_size - 1; ++i) {
output[i] = chars[rand() % (int)(sizeof(chars) - 1)];
}
output[output_size - 1] = '\0';
grpc_slice out = grpc_slice_from_copied_string(output);
gpr_free(output);
return out;
}
static void request_response_with_payload_and_proxy_auth
(grpc_end2end_test_config config,
grpc_end2end_test_fixture f) {
/* Create large request and response bodies. These are big enough to require
* multiple round trips to deliver to the peer, and their exact contents of
* will be verified on completion. */
grpc_slice request_payload_slice = generate_random_slice();
grpc_slice response_payload_slice = generate_random_slice();
grpc_call *c;
grpc_call *s;
grpc_byte_buffer *request_payload =
grpc_raw_byte_buffer_create(&request_payload_slice, 1);
grpc_byte_buffer *response_payload =
grpc_raw_byte_buffer_create(&response_payload_slice, 1);
cq_verifier *cqv = cq_verifier_create(f.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_byte_buffer *request_payload_recv = NULL;
grpc_byte_buffer *response_payload_recv = NULL;
grpc_call_details call_details;
grpc_status_code status;
grpc_call_error error;
grpc_slice details;
int was_cancelled = 2;
gpr_timespec deadline = n_seconds_from_now(60);
c = grpc_channel_create_call(
f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq,
grpc_slice_from_static_string("/foo"),
get_host_override_slice("foo.test.google.fr:1234", config), deadline,
NULL);
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);
memset(ops, 0, sizeof(ops));
op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 0;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_SEND_MESSAGE;
op->data.send_message.send_message = request_payload;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata.recv_initial_metadata = &initial_metadata_recv;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_RECV_MESSAGE;
op->data.recv_message.recv_message = &response_payload_recv;
op->flags = 0;
op->reserved = NULL;
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->flags = 0;
op->reserved = NULL;
op++;
error = grpc_call_start_batch(c, ops, (size_t)(op - ops), tag(1), NULL);
GPR_ASSERT(GRPC_CALL_OK == error);
error =
grpc_server_request_call(f.server, &s, &call_details,
&request_metadata_recv, f.cq, f.cq, tag(101));
GPR_ASSERT(GRPC_CALL_OK == error);
CQ_EXPECT_COMPLETION(cqv, tag(101), 1);
cq_verify(cqv);
memset(ops, 0, sizeof(ops));
op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 0;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_RECV_MESSAGE;
op->data.recv_message.recv_message = &request_payload_recv;
op->flags = 0;
op->reserved = NULL;
op++;
error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(102), NULL);
GPR_ASSERT(GRPC_CALL_OK == error);
CQ_EXPECT_COMPLETION(cqv, tag(102), 1);
cq_verify(cqv);
memset(ops, 0, sizeof(ops));
op = ops;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_SEND_MESSAGE;
op->data.send_message.send_message = response_payload;
op->flags = 0;
op->reserved = NULL;
op++;
op->op = GRPC_OP_SEND_STATUS_FROM_SERVER;
op->data.send_status_from_server.trailing_metadata_count = 0;
op->data.send_status_from_server.status = GRPC_STATUS_OK;
grpc_slice status_details = grpc_slice_from_static_string("xyz");
op->data.send_status_from_server.status_details = &status_details;
op->flags = 0;
op->reserved = NULL;
op++;
error = grpc_call_start_batch(s, ops, (size_t)(op - ops), tag(103), NULL);
GPR_ASSERT(GRPC_CALL_OK == error);
CQ_EXPECT_COMPLETION(cqv, tag(103), 1);
CQ_EXPECT_COMPLETION(cqv, tag(1), 1);
cq_verify(cqv);
GPR_ASSERT(status == GRPC_STATUS_OK);
GPR_ASSERT(0 == grpc_slice_str_cmp(details, "xyz"));
GPR_ASSERT(0 == grpc_slice_str_cmp(call_details.method, "/foo"));
validate_host_override_string("foo.test.google.fr:1234", call_details.host,
config);
GPR_ASSERT(was_cancelled == 0);
GPR_ASSERT(byte_buffer_eq_slice(request_payload_recv, request_payload_slice));
GPR_ASSERT(
byte_buffer_eq_slice(response_payload_recv, response_payload_slice));
grpc_slice_unref(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_unref(c);
grpc_call_unref(s);
cq_verifier_destroy(cqv);
grpc_byte_buffer_destroy(request_payload);
grpc_byte_buffer_destroy(response_payload);
grpc_byte_buffer_destroy(request_payload_recv);
grpc_byte_buffer_destroy(response_payload_recv);
}
/* Client sends a request with payload, server reads then returns a response
payload and status. */
static void test_invoke_request_response_with_payload_and_proxy_auth(
grpc_end2end_test_config config) {
/* Indicate that the proxy requires user auth */
grpc_arg client_arg = {.type = GRPC_ARG_INTEGER,
.key = GRPC_END2END_HTTP_PROXY_TEST_CONNECT_AUTH_PRESENT,
.value.integer = 0};
grpc_channel_args client_args = {.num_args = 1, .args = &client_arg};
grpc_end2end_test_fixture f = begin_test(
config, "test_invoke_request_response_with_payload_and_proxy_auth",
&client_args, NULL);
request_response_with_payload_and_proxy_auth(config, f);
end_test(&f);
config.tear_down_data(&f);
}
static void test_invoke_10_request_response_with_payload_and_proxy_auth(
grpc_end2end_test_config config) {
int i;
/* Indicate that the proxy requires user auth */
grpc_arg client_arg = {.type = GRPC_ARG_INTEGER,
.key = GRPC_END2END_HTTP_PROXY_TEST_CONNECT_AUTH_PRESENT,
.value.integer = 0};
grpc_channel_args client_args = {.num_args = 1, .args = &client_arg};
grpc_end2end_test_fixture f = begin_test(
config, "test_invoke_10_request_response_with_payload_and_proxy_auth",
&client_args, NULL);
for (i = 0; i < 10; i++) {
request_response_with_payload_and_proxy_auth(config, f);
}
end_test(&f);
config.tear_down_data(&f);
}
void payload_with_proxy_auth(grpc_end2end_test_config config) {
test_invoke_request_response_with_payload_and_proxy_auth(config);
test_invoke_10_request_response_with_payload_and_proxy_auth(config);
}
void payload_with_proxy_auth_pre_init(void) {}

@ -7256,6 +7256,7 @@
"test/core/end2end/tests/no_logging.c", "test/core/end2end/tests/no_logging.c",
"test/core/end2end/tests/no_op.c", "test/core/end2end/tests/no_op.c",
"test/core/end2end/tests/payload.c", "test/core/end2end/tests/payload.c",
"test/core/end2end/tests/payload_with_proxy_auth.c",
"test/core/end2end/tests/ping.c", "test/core/end2end/tests/ping.c",
"test/core/end2end/tests/ping_pong_streaming.c", "test/core/end2end/tests/ping_pong_streaming.c",
"test/core/end2end/tests/registered_call.c", "test/core/end2end/tests/registered_call.c",
@ -7333,6 +7334,7 @@
"test/core/end2end/tests/no_logging.c", "test/core/end2end/tests/no_logging.c",
"test/core/end2end/tests/no_op.c", "test/core/end2end/tests/no_op.c",
"test/core/end2end/tests/payload.c", "test/core/end2end/tests/payload.c",
"test/core/end2end/tests/payload_with_proxy_auth.c",
"test/core/end2end/tests/ping.c", "test/core/end2end/tests/ping.c",
"test/core/end2end/tests/ping_pong_streaming.c", "test/core/end2end/tests/ping_pong_streaming.c",
"test/core/end2end/tests/registered_call.c", "test/core/end2end/tests/registered_call.c",

File diff suppressed because it is too large Load Diff

@ -227,6 +227,8 @@
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload_with_proxy_auth.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping_pong_streaming.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping_pong_streaming.c">

@ -115,6 +115,9 @@
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
<Filter>test\core\end2end\tests</Filter> <Filter>test\core\end2end\tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload_with_proxy_auth.c">
<Filter>test\core\end2end\tests</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c">
<Filter>test\core\end2end\tests</Filter> <Filter>test\core\end2end\tests</Filter>
</ClCompile> </ClCompile>

@ -229,6 +229,8 @@
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload_with_proxy_auth.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c">
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping_pong_streaming.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping_pong_streaming.c">

@ -118,6 +118,9 @@
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
<Filter>test\core\end2end\tests</Filter> <Filter>test\core\end2end\tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload_with_proxy_auth.c">
<Filter>test\core\end2end\tests</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c"> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c">
<Filter>test\core\end2end\tests</Filter> <Filter>test\core\end2end\tests</Filter>
</ClCompile> </ClCompile>

Loading…
Cancel
Save