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

running clang-format -i on each modified files

Browse Source
pull/20873/head
Zhen Lian 5 years ago
parent e8d570618e
commit ddf565db33
5 changed files with 79 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/core/lib/security/security_connector/alts/alts_security_connector.cc
  2. 53
      src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
  3. 1
      src/core/tsi/alts/handshaker/alts_tsi_handshaker.h
  4. 15
      test/core/security/alts_security_connector_test.cc
  5. 50
      test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc

6
src/core/lib/security/security_connector/alts/alts_security_connector.cc
Unescape View File

@ -235,9 +235,9 @@ grpc_alts_auth_context_from_tsi_peer(const tsi_peer* peer) {
} }
/* Add alts context to auth context. */ /* Add alts context to auth context. */
if (strcmp(tsi_prop->name, TSI_ALTS_CONTEXT) == 0) { if (strcmp(tsi_prop->name, TSI_ALTS_CONTEXT) == 0) {
grpc_auth_context_add_property( grpc_auth_context_add_property(ctx.get(), TSI_ALTS_CONTEXT,
ctx.get(), TSI_ALTS_CONTEXT, tsi_prop->value.data,
tsi_prop->value.data, tsi_prop->value.length); tsi_prop->value.length);
} }
} }
if (!grpc_auth_context_peer_is_authenticated(ctx.get())) { if (!grpc_auth_context_peer_is_authenticated(ctx.get())) {

53
src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
Unescape View File

@ -29,7 +29,6 @@
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include <grpc/support/sync.h> #include <grpc/support/sync.h>
#include <grpc/support/thd_id.h> #include <grpc/support/thd_id.h>
#include "src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h"
#include "src/core/lib/gprpp/thd.h" #include "src/core/lib/gprpp/thd.h"
#include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/closure.h"
@ -114,8 +113,9 @@ static tsi_result handshaker_result_extract_peer(
index++; index++;
GPR_ASSERT(&peer->properties[index] != nullptr); GPR_ASSERT(&peer->properties[index] != nullptr);
ok = tsi_construct_string_peer_property( ok = tsi_construct_string_peer_property(
TSI_ALTS_CONTEXT, reinterpret_cast<char*>(GRPC_SLICE_START_PTR(result->serialized_context)), GRPC_SLICE_LENGTH(result->serialized_context), TSI_ALTS_CONTEXT,
&peer->properties[index]); reinterpret_cast<char*>(GRPC_SLICE_START_PTR(result->serialized_context)),
GRPC_SLICE_LENGTH(result->serialized_context), &peer->properties[index]);
if (ok != TSI_OK) { if (ok != TSI_OK) {
tsi_peer_destruct(peer); tsi_peer_destruct(peer);
gpr_log(GPR_ERROR, "Failed to set tsi peer property"); gpr_log(GPR_ERROR, "Failed to set tsi peer property");
@ -194,6 +194,7 @@ static void handshaker_result_destroy(tsi_handshaker_result* self) {
gpr_free(result->key_data); gpr_free(result->key_data);
gpr_free(result->unused_bytes); gpr_free(result->unused_bytes);
grpc_slice_unref_internal(result->rpc_versions); grpc_slice_unref_internal(result->rpc_versions);
grpc_slice_unref_internal(result->serialized_context);
gpr_free(result); gpr_free(result);
} }
@ -218,9 +219,10 @@ tsi_result alts_tsi_handshaker_result_create(grpc_gcp_HandshakerResp* resp,
gpr_log(GPR_ERROR, "Invalid identity"); gpr_log(GPR_ERROR, "Invalid identity");
return TSI_FAILED_PRECONDITION; return TSI_FAILED_PRECONDITION;
} }
upb_strview service_account = grpc_gcp_Identity_service_account(identity); upb_strview peer_service_account =
if (service_account.size == 0) { grpc_gcp_Identity_service_account(identity);
gpr_log(GPR_ERROR, "Invalid service account"); if (peer_service_account.size == 0) {
gpr_log(GPR_ERROR, "Invalid peer service account");
return TSI_FAILED_PRECONDITION; return TSI_FAILED_PRECONDITION;
} }
upb_strview key_data = grpc_gcp_HandshakerResult_key_data(hresult); upb_strview key_data = grpc_gcp_HandshakerResult_key_data(hresult);
@ -234,12 +236,14 @@ tsi_result alts_tsi_handshaker_result_create(grpc_gcp_HandshakerResp* resp,
gpr_log(GPR_ERROR, "Peer does not set RPC protocol versions."); gpr_log(GPR_ERROR, "Peer does not set RPC protocol versions.");
return TSI_FAILED_PRECONDITION; return TSI_FAILED_PRECONDITION;
} }
upb_strview application_protocol = grpc_gcp_HandshakerResult_application_protocol(hresult); upb_strview application_protocol =
grpc_gcp_HandshakerResult_application_protocol(hresult);
if (application_protocol.size == 0) { if (application_protocol.size == 0) {
gpr_log(GPR_ERROR, "Invalid application protocol"); gpr_log(GPR_ERROR, "Invalid application protocol");
return TSI_FAILED_PRECONDITION; return TSI_FAILED_PRECONDITION;
} }
upb_strview record_protocol = grpc_gcp_HandshakerResult_record_protocol(hresult); upb_strview record_protocol =
grpc_gcp_HandshakerResult_record_protocol(hresult);
if (record_protocol.size == 0) { if (record_protocol.size == 0) {
gpr_log(GPR_ERROR, "Invalid record protocol"); gpr_log(GPR_ERROR, "Invalid record protocol");
return TSI_FAILED_PRECONDITION; return TSI_FAILED_PRECONDITION;
@ -250,7 +254,8 @@ tsi_result alts_tsi_handshaker_result_create(grpc_gcp_HandshakerResp* resp,
gpr_log(GPR_ERROR, "Invalid local identity"); gpr_log(GPR_ERROR, "Invalid local identity");
return TSI_FAILED_PRECONDITION; return TSI_FAILED_PRECONDITION;
} }
upb_strview local_service_account = grpc_gcp_Identity_service_account(local_identity); upb_strview local_service_account =
grpc_gcp_Identity_service_account(local_identity);
if (local_service_account.size == 0) { if (local_service_account.size == 0) {
gpr_log(GPR_ERROR, "Invalid local service account"); gpr_log(GPR_ERROR, "Invalid local service account");
return TSI_FAILED_PRECONDITION; return TSI_FAILED_PRECONDITION;
@ -261,11 +266,12 @@ tsi_result alts_tsi_handshaker_result_create(grpc_gcp_HandshakerResp* resp,
static_cast<char*>(gpr_zalloc(kAltsAes128GcmRekeyKeyLength)); static_cast<char*>(gpr_zalloc(kAltsAes128GcmRekeyKeyLength));
memcpy(result->key_data, key_data.data, kAltsAes128GcmRekeyKeyLength); memcpy(result->key_data, key_data.data, kAltsAes128GcmRekeyKeyLength);
result->peer_identity = result->peer_identity =
static_cast<char*>(gpr_zalloc(service_account.size + 1)); static_cast<char*>(gpr_zalloc(peer_service_account.size + 1));
memcpy(result->peer_identity, service_account.data, service_account.size); memcpy(result->peer_identity, peer_service_account.data,
upb::Arena rpc_protocol_arena; peer_service_account.size);
upb::Arena rpc_versions_arena;
bool serialized = grpc_gcp_rpc_protocol_versions_encode( bool serialized = grpc_gcp_rpc_protocol_versions_encode(
peer_rpc_version, rpc_protocol_arena.ptr(), &result->rpc_versions); peer_rpc_version, rpc_versions_arena.ptr(), &result->rpc_versions);
if (!serialized) { if (!serialized) {
gpr_log(GPR_ERROR, "Failed to serialize peer's RPC protocol versions."); gpr_log(GPR_ERROR, "Failed to serialize peer's RPC protocol versions.");
return TSI_FAILED_PRECONDITION; return TSI_FAILED_PRECONDITION;
@ -274,18 +280,23 @@ tsi_result alts_tsi_handshaker_result_create(grpc_gcp_HandshakerResp* resp,
grpc_gcp_AltsContext* context = grpc_gcp_AltsContext_new(context_arena.ptr()); grpc_gcp_AltsContext* context = grpc_gcp_AltsContext_new(context_arena.ptr());
grpc_gcp_AltsContext_set_application_protocol(context, application_protocol); grpc_gcp_AltsContext_set_application_protocol(context, application_protocol);
grpc_gcp_AltsContext_set_record_protocol(context, record_protocol); grpc_gcp_AltsContext_set_record_protocol(context, record_protocol);
// ALTS currently only supports the security level of 2,
// which is "grpc_gcp_INTEGRITY_AND_PRIVACY"
grpc_gcp_AltsContext_set_security_level(context, 2); grpc_gcp_AltsContext_set_security_level(context, 2);
grpc_gcp_AltsContext_set_peer_service_account(context, service_account); grpc_gcp_AltsContext_set_peer_service_account(context, peer_service_account);
grpc_gcp_AltsContext_set_local_service_account(context, local_service_account); grpc_gcp_AltsContext_set_local_service_account(context,
grpc_gcp_AltsContext_set_peer_rpc_versions(context, const_cast<grpc_gcp_RpcProtocolVersions*>(peer_rpc_version)); local_service_account);
grpc_gcp_AltsContext_set_peer_rpc_versions(
context, const_cast<grpc_gcp_RpcProtocolVersions*>(peer_rpc_version));
size_t serialized_ctx_length; size_t serialized_ctx_length;
char* serialized_ctx = char* serialized_ctx = grpc_gcp_AltsContext_serialize(
grpc_gcp_AltsContext_serialize(context, context_arena.ptr(), &serialized_ctx_length); context, context_arena.ptr(), &serialized_ctx_length);
if (serialized_ctx == nullptr) { if (serialized_ctx == nullptr) {
gpr_log(GPR_ERROR, "Failed to serialize peer's ALTS context."); gpr_log(GPR_ERROR, "Failed to serialize peer's ALTS context.");
return TSI_FAILED_PRECONDITION; return TSI_FAILED_PRECONDITION;
} }
result->serialized_context = grpc_slice_from_copied_buffer(serialized_ctx, serialized_ctx_length); result->serialized_context =
grpc_slice_from_copied_buffer(serialized_ctx, serialized_ctx_length);
result->is_client = is_client; result->is_client = is_client;
result->base.vtable = &result_vtable; result->base.vtable = &result_vtable;
*self = &result->base; *self = &result->base;
@ -316,8 +327,8 @@ static void on_handshaker_service_resp_recv_dedicated(void* arg,
alts_shared_resource_dedicated* resource = alts_shared_resource_dedicated* resource =
grpc_alts_get_shared_resource_dedicated(); grpc_alts_get_shared_resource_dedicated();
grpc_cq_end_op(resource->cq, arg, GRPC_ERROR_NONE, grpc_cq_end_op(resource->cq, arg, GRPC_ERROR_NONE,
[](void* done_arg, grpc_cq_completion* storage) {}, nullptr, [](void* /*done_arg*/, grpc_cq_completion* /*storage*/) {},
&resource->storage); nullptr, &resource->storage);
} }
static tsi_result handshaker_next( static tsi_result handshaker_next(

1
src/core/tsi/alts/handshaker/alts_tsi_handshaker.h
Unescape View File

@ -28,6 +28,7 @@
#include "src/core/tsi/alts/handshaker/alts_handshaker_client.h" #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
#include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security.h"
#include "src/core/tsi/transport_security_interface.h" #include "src/core/tsi/transport_security_interface.h"
#include "src/proto/grpc/gcp/altscontext.upb.h"
#include "src/proto/grpc/gcp/handshaker.upb.h" #include "src/proto/grpc/gcp/handshaker.upb.h"
#define TSI_ALTS_SERVICE_ACCOUNT_PEER_PROPERTY "service_account" #define TSI_ALTS_SERVICE_ACCOUNT_PEER_PROPERTY "service_account"

15
test/core/security/alts_security_connector_test.cc
Unescape View File

@ -135,13 +135,14 @@ static void test_alts_peer_to_auth_context_success() {
GRPC_SLICE_START_PTR(serialized_peer_versions)), GRPC_SLICE_START_PTR(serialized_peer_versions)),
GRPC_SLICE_LENGTH(serialized_peer_versions), GRPC_SLICE_LENGTH(serialized_peer_versions),
&peer.properties[2]) == TSI_OK); &peer.properties[2]) == TSI_OK);
grpc_slice serialized_alts_ctx; char test_ctx[] = "test serialized context";
GPR_ASSERT(tsi_construct_string_peer_property( grpc_slice serialized_alts_ctx = grpc_slice_from_copied_string(test_ctx);
TSI_ALTS_CONTEXT, GPR_ASSERT(
reinterpret_cast<char*>( tsi_construct_string_peer_property(
GRPC_SLICE_START_PTR(serialized_alts_ctx)), TSI_ALTS_CONTEXT,
GRPC_SLICE_LENGTH(serialized_alts_ctx), reinterpret_cast<char*>(GRPC_SLICE_START_PTR(serialized_alts_ctx)),
&peer.properties[3]) == TSI_OK); GRPC_SLICE_LENGTH(serialized_alts_ctx),
&peer.properties[3]) == TSI_OK);
grpc_core::RefCountedPtr<grpc_auth_context> ctx = grpc_core::RefCountedPtr<grpc_auth_context> ctx =
grpc_alts_auth_context_from_tsi_peer(&peer); grpc_alts_auth_context_from_tsi_peer(&peer);
GPR_ASSERT(ctx != nullptr); GPR_ASSERT(ctx != nullptr);

50
test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
Unescape View File

@ -27,8 +27,8 @@
#include "src/core/tsi/alts/handshaker/alts_shared_resource.h" #include "src/core/tsi/alts/handshaker/alts_shared_resource.h"
#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h"
#include "src/proto/grpc/gcp/altscontext.upb.h"
#include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h" #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
#include "src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h"
#define ALTS_TSI_HANDSHAKER_TEST_RECV_BYTES "Hello World" #define ALTS_TSI_HANDSHAKER_TEST_RECV_BYTES "Hello World"
#define ALTS_TSI_HANDSHAKER_TEST_OUT_FRAME "Hello Google" #define ALTS_TSI_HANDSHAKER_TEST_OUT_FRAME "Hello Google"
@ -44,7 +44,8 @@
#define ALTS_TSI_HANDSHAKER_TEST_MIN_RPC_VERSION_MAJOR 2 #define ALTS_TSI_HANDSHAKER_TEST_MIN_RPC_VERSION_MAJOR 2
#define ALTS_TSI_HANDSHAKER_TEST_MIN_RPC_VERSION_MINOR 1 #define ALTS_TSI_HANDSHAKER_TEST_MIN_RPC_VERSION_MINOR 1
#define ALTS_TSI_HANDSHAKER_TEST_LOCAL_IDENTITY "chapilocal@service.google.com" #define ALTS_TSI_HANDSHAKER_TEST_LOCAL_IDENTITY "chapilocal@service.google.com"
#define ALTS_TSI_HANDSHAKER_TEST_APPLICATION_PROTOCOL "test application protocol" #define ALTS_TSI_HANDSHAKER_TEST_APPLICATION_PROTOCOL \
"test application protocol"
#define ALTS_TSI_HANDSHAKER_TEST_RECORD_PROTOCOL "test record protocol" #define ALTS_TSI_HANDSHAKER_TEST_RECORD_PROTOCOL "test record protocol"
using grpc_core::internal::alts_handshaker_client_check_fields_for_testing; using grpc_core::internal::alts_handshaker_client_check_fields_for_testing;
@ -154,7 +155,8 @@ static grpc_byte_buffer* generate_handshaker_response(
local_identity, local_identity,
upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_LOCAL_IDENTITY)); upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_LOCAL_IDENTITY));
grpc_gcp_HandshakerResult_set_application_protocol( grpc_gcp_HandshakerResult_set_application_protocol(
result, upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_APPLICATION_PROTOCOL)); result,
upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_APPLICATION_PROTOCOL));
grpc_gcp_HandshakerResult_set_record_protocol( grpc_gcp_HandshakerResult_set_record_protocol(
result, upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_RECORD_PROTOCOL)); result, upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_RECORD_PROTOCOL));
break; break;
@ -180,7 +182,8 @@ static grpc_byte_buffer* generate_handshaker_response(
local_identity, local_identity,
upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_LOCAL_IDENTITY)); upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_LOCAL_IDENTITY));
grpc_gcp_HandshakerResult_set_application_protocol( grpc_gcp_HandshakerResult_set_application_protocol(
result, upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_APPLICATION_PROTOCOL)); result,
upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_APPLICATION_PROTOCOL));
grpc_gcp_HandshakerResult_set_record_protocol( grpc_gcp_HandshakerResult_set_record_protocol(
result, upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_RECORD_PROTOCOL)); result, upb_strview_makez(ALTS_TSI_HANDSHAKER_TEST_RECORD_PROTOCOL));
break; break;
@ -286,24 +289,22 @@ static void on_client_next_success_cb(tsi_result status, void* user_data,
peer.properties[1].value.length) == 0); peer.properties[1].value.length) == 0);
/* Validate alts context. */ /* Validate alts context. */
upb::Arena context_arena; upb::Arena context_arena;
grpc_gcp_AltsContext* ctx = grpc_gcp_AltsContext* ctx = grpc_gcp_AltsContext_parse(
grpc_gcp_AltsContext_parse(peer.properties[3].value.data, peer.properties[3].value.length, context_arena.ptr()); peer.properties[3].value.data, peer.properties[3].value.length,
context_arena.ptr());
GPR_ASSERT(ctx != nullptr); GPR_ASSERT(ctx != nullptr);
upb_strview application_protocol = grpc_gcp_AltsContext_application_protocol(ctx); upb_strview application_protocol =
grpc_gcp_AltsContext_application_protocol(ctx);
upb_strview record_protocol = grpc_gcp_AltsContext_record_protocol(ctx); upb_strview record_protocol = grpc_gcp_AltsContext_record_protocol(ctx);
upb_strview peer_account = grpc_gcp_AltsContext_peer_service_account(ctx); upb_strview peer_account = grpc_gcp_AltsContext_peer_service_account(ctx);
upb_strview local_account = grpc_gcp_AltsContext_local_service_account(ctx); upb_strview local_account = grpc_gcp_AltsContext_local_service_account(ctx);
GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_APPLICATION_PROTOCOL, GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_APPLICATION_PROTOCOL,
application_protocol.data, application_protocol.data, application_protocol.size) == 0);
application_protocol.size) == 0);
GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_RECORD_PROTOCOL, GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_RECORD_PROTOCOL,
record_protocol.data, record_protocol.data, record_protocol.size) == 0);
record_protocol.size) == 0); GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_PEER_IDENTITY, peer_account.data,
GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_PEER_IDENTITY,
peer_account.data,
peer_account.size) == 0); peer_account.size) == 0);
GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_LOCAL_IDENTITY, GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_LOCAL_IDENTITY, local_account.data,
local_account.data,
local_account.size) == 0); local_account.size) == 0);
tsi_peer_destruct(&peer); tsi_peer_destruct(&peer);
/* Validate unused bytes. */ /* Validate unused bytes. */
@ -342,6 +343,25 @@ static void on_server_next_success_cb(tsi_result status, void* user_data,
GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_PEER_IDENTITY, GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_PEER_IDENTITY,
peer.properties[1].value.data, peer.properties[1].value.data,
peer.properties[1].value.length) == 0); peer.properties[1].value.length) == 0);
/* Validate alts context. */
upb::Arena context_arena;
grpc_gcp_AltsContext* ctx = grpc_gcp_AltsContext_parse(
peer.properties[3].value.data, peer.properties[3].value.length,
context_arena.ptr());
GPR_ASSERT(ctx != nullptr);
upb_strview application_protocol =
grpc_gcp_AltsContext_application_protocol(ctx);
upb_strview record_protocol = grpc_gcp_AltsContext_record_protocol(ctx);
upb_strview peer_account = grpc_gcp_AltsContext_peer_service_account(ctx);
upb_strview local_account = grpc_gcp_AltsContext_local_service_account(ctx);
GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_APPLICATION_PROTOCOL,
application_protocol.data, application_protocol.size) == 0);
GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_RECORD_PROTOCOL,
record_protocol.data, record_protocol.size) == 0);
GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_PEER_IDENTITY, peer_account.data,
peer_account.size) == 0);
GPR_ASSERT(memcmp(ALTS_TSI_HANDSHAKER_TEST_LOCAL_IDENTITY, local_account.data,
local_account.size) == 0);
tsi_peer_destruct(&peer); tsi_peer_destruct(&peer);
/* Validate unused bytes. */ /* Validate unused bytes. */
const unsigned char* bytes = nullptr; const unsigned char* bytes = nullptr;

Write Preview
Loading…
Cancel
Save