parent
65644a7bb6
commit
835eacc32d
|
|
@ -25,6 +25,7 @@ extern "C" {
|
|||
|
||||
#define GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME "transport_security_type"
|
||||
#define GRPC_SSL_TRANSPORT_SECURITY_TYPE "ssl"
|
||||
#define GRPC_TLS_TRANSPORT_SECURITY_TYPE "tls"
|
||||
|
||||
#define GRPC_X509_CN_PROPERTY_NAME "x509_common_name"
|
||||
#define GRPC_X509_SAN_PROPERTY_NAME "x509_subject_alternative_name"
|
||||
|
|
|
|||
|
|
@ -175,7 +175,8 @@ bool PortAuthorizationMatcher::Matches(const EvaluateArgs& args) const {
|
|||
|
||||
bool AuthenticatedAuthorizationMatcher::Matches(
|
||||
const EvaluateArgs& args) const {
|
||||
if (args.GetTransportSecurityType() != GRPC_SSL_TRANSPORT_SECURITY_TYPE) {
|
||||
if (args.GetTransportSecurityType() != GRPC_SSL_TRANSPORT_SECURITY_TYPE &&
|
||||
args.GetTransportSecurityType() != GRPC_TLS_TRANSPORT_SECURITY_TYPE) {
|
||||
// Connection is not authenticated.
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include "absl/strings/string_view.h"
|
||||
|
||||
#include <grpc/grpc.h>
|
||||
#include <grpc/grpc_security_constants.h>
|
||||
#include <grpc/support/alloc.h>
|
||||
#include <grpc/support/log.h>
|
||||
#include <grpc/support/string_util.h>
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@
|
|||
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
|
||||
#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
|
||||
|
||||
#define GRPC_TLS_TRANSPORT_SECURITY_TYPE "tls"
|
||||
|
||||
namespace grpc_core {
|
||||
|
||||
// Channel security connector using TLS as transport security protocol.
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@
|
|||
#include <gmock/gmock.h>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <grpc/grpc_security_constants.h>
|
||||
|
||||
#include "src/core/lib/security/authorization/evaluate_args.h"
|
||||
#include "src/core/lib/security/authorization/matchers.h"
|
||||
#include "test/core/util/evaluate_args_test_util.h"
|
||||
|
|
@ -341,7 +343,7 @@ TEST_F(AuthorizationMatchersTest,
|
|||
|
||||
TEST_F(AuthorizationMatchersTest, AuthenticatedMatcherSuccessfulUriSanMatches) {
|
||||
args_.AddPropertyToAuthContext(GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME,
|
||||
GRPC_SSL_TRANSPORT_SECURITY_TYPE);
|
||||
GRPC_TLS_TRANSPORT_SECURITY_TYPE);
|
||||
args_.AddPropertyToAuthContext(GRPC_PEER_URI_PROPERTY_NAME,
|
||||
"spiffe://foo.abc");
|
||||
args_.AddPropertyToAuthContext(GRPC_PEER_URI_PROPERTY_NAME,
|
||||
|
|
@ -357,7 +359,7 @@ TEST_F(AuthorizationMatchersTest, AuthenticatedMatcherSuccessfulUriSanMatches) {
|
|||
|
||||
TEST_F(AuthorizationMatchersTest, AuthenticatedMatcherFailedUriSanMatches) {
|
||||
args_.AddPropertyToAuthContext(GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME,
|
||||
GRPC_SSL_TRANSPORT_SECURITY_TYPE);
|
||||
GRPC_TLS_TRANSPORT_SECURITY_TYPE);
|
||||
args_.AddPropertyToAuthContext(GRPC_PEER_URI_PROPERTY_NAME,
|
||||
"spiffe://bar.abc");
|
||||
EvaluateArgs args = args_.MakeEvaluateArgs();
|
||||
|
|
|
|||
Loading…
Reference in New Issue