Add support for abstract unix domain sockets (#27906)
* Add failing end2end test for inconsistent percent-decoding of URIs * Add passing h2_local_abstract_uds end2end tests * null-safe string_view * mac doesn't UDS * mac doesn't do *abstract* UDSpull/27943/head
AJ Heller
3 years ago
committed by
GitHub
parent
13d98176b5
commit
c79cdc0ae8
24 changed files with 217 additions and 53 deletions
@ -0,0 +1,70 @@ |
||||
// Copyright 2021 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 <unistd.h> |
||||
|
||||
#include "absl/strings/str_format.h" |
||||
|
||||
#include <grpc/support/string_util.h> |
||||
|
||||
#include "test/core/end2end/end2end_tests.h" |
||||
#include "test/core/end2end/fixtures/local_util.h" |
||||
#include "test/core/util/test_config.h" |
||||
|
||||
static int unique{0}; |
||||
|
||||
static grpc_end2end_test_fixture chttp2_create_fixture_fullstack_uds( |
||||
grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { |
||||
grpc_end2end_test_fixture f = |
||||
grpc_end2end_local_chttp2_create_fixture_fullstack(); |
||||
gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); |
||||
static_cast<grpc_end2end_local_fullstack_fixture_data*>(f.fixture_data) |
||||
->localaddr = absl::StrFormat( |
||||
"unix-abstract:grpc_fullstack_test.%%00.%d.%" PRId64 ".%" PRId32 ".%d", |
||||
getpid(), now.tv_sec, now.tv_nsec, ++unique); |
||||
return f; |
||||
} |
||||
|
||||
static void chttp2_init_client_fullstack_uds(grpc_end2end_test_fixture* f, |
||||
grpc_channel_args* client_args) { |
||||
grpc_end2end_local_chttp2_init_client_fullstack(f, client_args, UDS); |
||||
} |
||||
|
||||
static void chttp2_init_server_fullstack_uds(grpc_end2end_test_fixture* f, |
||||
grpc_channel_args* client_args) { |
||||
grpc_end2end_local_chttp2_init_server_fullstack(f, client_args, UDS); |
||||
} |
||||
|
||||
/* All test configurations */ |
||||
static grpc_end2end_test_config configs[] = { |
||||
{"chttp2/fullstack_local_abstract_uds_percent_encoded", |
||||
FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | |
||||
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | |
||||
FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER | |
||||
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, |
||||
nullptr, chttp2_create_fixture_fullstack_uds, |
||||
chttp2_init_client_fullstack_uds, chttp2_init_server_fullstack_uds, |
||||
grpc_end2end_local_chttp2_tear_down_fullstack}}; |
||||
|
||||
int main(int argc, char** argv) { |
||||
size_t i; |
||||
grpc::testing::TestEnvironment env(argc, argv); |
||||
grpc_end2end_tests_pre_init(); |
||||
grpc_init(); |
||||
for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { |
||||
grpc_end2end_tests(argc, argv, configs[i]); |
||||
} |
||||
grpc_shutdown(); |
||||
return 0; |
||||
} |
||||
@ -0,0 +1,75 @@ |
||||
/*
|
||||
* |
||||
* 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 <inttypes.h> |
||||
#include <unistd.h> |
||||
|
||||
#include "absl/strings/str_format.h" |
||||
|
||||
#include <grpc/support/string_util.h> |
||||
|
||||
#include "test/core/end2end/end2end_tests.h" |
||||
#include "test/core/end2end/fixtures/local_util.h" |
||||
#include "test/core/util/test_config.h" |
||||
|
||||
static int unique = 1; |
||||
|
||||
static grpc_end2end_test_fixture chttp2_create_fixture_fullstack_uds( |
||||
grpc_channel_args* /*client_args*/, grpc_channel_args* /*server_args*/) { |
||||
grpc_end2end_test_fixture f = |
||||
grpc_end2end_local_chttp2_create_fixture_fullstack(); |
||||
gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); |
||||
static_cast<grpc_end2end_local_fullstack_fixture_data*>(f.fixture_data) |
||||
->localaddr = absl::StrFormat( |
||||
"unix:/tmp/grpc_fullstack_test.%%25.%d.%" PRId64 ".%" PRId32 ".%d", |
||||
getpid(), now.tv_sec, now.tv_nsec, unique++); |
||||
return f; |
||||
} |
||||
|
||||
static void chttp2_init_client_fullstack_uds(grpc_end2end_test_fixture* f, |
||||
grpc_channel_args* client_args) { |
||||
grpc_end2end_local_chttp2_init_client_fullstack(f, client_args, UDS); |
||||
} |
||||
|
||||
static void chttp2_init_server_fullstack_uds(grpc_end2end_test_fixture* f, |
||||
grpc_channel_args* client_args) { |
||||
grpc_end2end_local_chttp2_init_server_fullstack(f, client_args, UDS); |
||||
} |
||||
|
||||
/* All test configurations */ |
||||
static grpc_end2end_test_config configs[] = { |
||||
{"chttp2/fullstack_local_uds_percent_encoded", |
||||
FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | |
||||
FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | |
||||
FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER | |
||||
FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, |
||||
nullptr, chttp2_create_fixture_fullstack_uds, |
||||
chttp2_init_client_fullstack_uds, chttp2_init_server_fullstack_uds, |
||||
grpc_end2end_local_chttp2_tear_down_fullstack}}; |
||||
|
||||
int main(int argc, char** argv) { |
||||
size_t i; |
||||
grpc::testing::TestEnvironment env(argc, argv); |
||||
grpc_end2end_tests_pre_init(); |
||||
grpc_init(); |
||||
for (i = 0; i < sizeof(configs) / sizeof(*configs); i++) { |
||||
grpc_end2end_tests(argc, argv, configs[i]); |
||||
} |
||||
grpc_shutdown(); |
||||
return 0; |
||||
} |
||||
Loading…
Reference in new issue