fix first round of comments

pull/21779/head
Zhen Lian 5 years ago
parent ffcf4f477e
commit 9ded19e24d
  1. 3
      src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h
  2. 4
      src/core/lib/security/security_connector/tls/tls_security_connector.cc
  3. 4
      src/core/lib/security/security_connector/tls/tls_security_connector.h
  4. 11
      test/core/end2end/fixtures/h2_tls.cc
  5. 8
      test/core/security/tls_security_connector_test.cc

@ -273,7 +273,8 @@ struct grpc_tls_credentials_options
private: private:
grpc_ssl_client_certificate_request_type cert_request_type_; grpc_ssl_client_certificate_request_type cert_request_type_;
grpc_tls_server_verification_option server_verification_option_; grpc_tls_server_verification_option server_verification_option_ =
GRPC_TLS_SERVER_VERIFICATION;
grpc_core::RefCountedPtr<grpc_tls_key_materials_config> key_materials_config_; grpc_core::RefCountedPtr<grpc_tls_key_materials_config> key_materials_config_;
grpc_core::RefCountedPtr<grpc_tls_credential_reload_config> grpc_core::RefCountedPtr<grpc_tls_credential_reload_config>
credential_reload_config_; credential_reload_config_;

@ -112,7 +112,7 @@ grpc_status_code TlsFetchKeyMaterials(
return status; return status;
} }
grpc_error* TlsCheckPeer(const char* peer_name, const tsi_peer* peer) { grpc_error* TlsCheckHostName(const char* peer_name, const tsi_peer* peer) {
/* Check the peer name if specified. */ /* Check the peer name if specified. */
if (peer_name != nullptr && !grpc_ssl_host_matches_name(peer, peer_name)) { if (peer_name != nullptr && !grpc_ssl_host_matches_name(peer, peer_name)) {
char* msg; char* msg;
@ -195,7 +195,7 @@ void TlsChannelSecurityConnector::check_peer(
if (creds->options().server_verification_option() == if (creds->options().server_verification_option() ==
GRPC_TLS_SERVER_VERIFICATION) { GRPC_TLS_SERVER_VERIFICATION) {
/* Do the default host name check if specifying the target name. */ /* Do the default host name check if specifying the target name. */
error = TlsCheckPeer(target_name, &peer); error = TlsCheckHostName(target_name, &peer);
if (error != GRPC_ERROR_NONE) { if (error != GRPC_ERROR_NONE) {
grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error);
tsi_peer_destruct(&peer); tsi_peer_destruct(&peer);

@ -151,9 +151,9 @@ grpc_status_code TlsFetchKeyMaterials(
const grpc_tls_credentials_options& options, bool server_config, const grpc_tls_credentials_options& options, bool server_config,
grpc_ssl_certificate_config_reload_status* status); grpc_ssl_certificate_config_reload_status* status);
// TlsCheckPeer checks if |peer_name| matches the identity information // TlsCheckHostName checks if |peer_name| matches the identity information
// contained in |peer|. This is AKA hostname check. // contained in |peer|. This is AKA hostname check.
grpc_error* TlsCheckPeer(const char* peer_name, const tsi_peer* peer); grpc_error* TlsCheckHostName(const char* peer_name, const tsi_peer* peer);
} // namespace grpc_core } // namespace grpc_core

@ -16,16 +16,13 @@
* *
*/ */
#include "test/core/end2end/end2end_tests.h"
#include <stdio.h>
#include <string.h>
#include <grpc/grpc_security.h> #include <grpc/grpc_security.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include <stdio.h>
#include <string.h>
#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/env.h"
#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/string.h"
@ -37,6 +34,7 @@
#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
#include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h"
#include "test/core/end2end/data/ssl_test_data.h" #include "test/core/end2end/data/ssl_test_data.h"
#include "test/core/end2end/end2end_tests.h"
#include "test/core/util/port.h" #include "test/core/util/port.h"
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
@ -193,6 +191,7 @@ static int server_cred_reload_sync(void* /*config_user_data*/,
static grpc_channel_credentials* create_tls_channel_credentials( static grpc_channel_credentials* create_tls_channel_credentials(
fullstack_secure_fixture_data* ffd) { fullstack_secure_fixture_data* ffd) {
grpc_tls_credentials_options* options = grpc_tls_credentials_options_create(); grpc_tls_credentials_options* options = grpc_tls_credentials_options_create();
options->set_server_verification_option(GRPC_TLS_SERVER_VERIFICATION);
/* Set credential reload config. */ /* Set credential reload config. */
grpc_tls_credential_reload_config* reload_config = grpc_tls_credential_reload_config* reload_config =
grpc_tls_credential_reload_config_create(nullptr, client_cred_reload_sync, grpc_tls_credential_reload_config_create(nullptr, client_cred_reload_sync,

@ -255,21 +255,21 @@ TEST_F(TlsSecurityConnectorTest, CreateChannelSecurityConnectorFailInit) {
EXPECT_EQ(connector, nullptr); EXPECT_EQ(connector, nullptr);
} }
TEST_F(TlsSecurityConnectorTest, TlsCheckPeerSuccess) { TEST_F(TlsSecurityConnectorTest, TlsCheckHostNameSuccess) {
const char* target_name = "foo.test.google.fr"; const char* target_name = "foo.test.google.fr";
tsi_peer peer; tsi_peer peer;
GPR_ASSERT(tsi_construct_peer(1, &peer) == TSI_OK); GPR_ASSERT(tsi_construct_peer(1, &peer) == TSI_OK);
GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( GPR_ASSERT(tsi_construct_string_peer_property_from_cstring(
TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, target_name, TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, target_name,
&peer.properties[0]) == TSI_OK); &peer.properties[0]) == TSI_OK);
grpc_error* error = grpc_core::TlsCheckPeer(target_name, &peer); grpc_error* error = grpc_core::TlsCheckHostName(target_name, &peer);
tsi_peer_destruct(&peer); tsi_peer_destruct(&peer);
EXPECT_EQ(error, GRPC_ERROR_NONE); EXPECT_EQ(error, GRPC_ERROR_NONE);
GRPC_ERROR_UNREF(error); GRPC_ERROR_UNREF(error);
options_->Unref(); options_->Unref();
} }
TEST_F(TlsSecurityConnectorTest, TlsCheckPeerFail) { TEST_F(TlsSecurityConnectorTest, TlsCheckHostNameFail) {
const char* target_name = "foo.test.google.fr"; const char* target_name = "foo.test.google.fr";
const char* another_name = "bar.test.google.fr"; const char* another_name = "bar.test.google.fr";
tsi_peer peer; tsi_peer peer;
@ -277,7 +277,7 @@ TEST_F(TlsSecurityConnectorTest, TlsCheckPeerFail) {
GPR_ASSERT(tsi_construct_string_peer_property_from_cstring( GPR_ASSERT(tsi_construct_string_peer_property_from_cstring(
TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, another_name, TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, another_name,
&peer.properties[0]) == TSI_OK); &peer.properties[0]) == TSI_OK);
grpc_error* error = grpc_core::TlsCheckPeer(target_name, &peer); grpc_error* error = grpc_core::TlsCheckHostName(target_name, &peer);
tsi_peer_destruct(&peer); tsi_peer_destruct(&peer);
EXPECT_NE(error, GRPC_ERROR_NONE); EXPECT_NE(error, GRPC_ERROR_NONE);
GRPC_ERROR_UNREF(error); GRPC_ERROR_UNREF(error);

Loading…
Cancel
Save