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

[build] Move certificate provider registry into its own build target (#30836)

Browse Source 
* [build] Move cert registry into its own build target

* Automated change: Fix sanity tests

* fix

* forgot to save file

Co-authored-by: ctiller <ctiller@users.noreply.github.com>
dependabot/npm_and_yarn/examples/node/node-forge-1.3.1
Craig Tiller 2 years ago committed by GitHub
parent 31c68b5f10
commit 7ba58bb925
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 99 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      BUILD
  2. 4
      CMakeLists.txt
  3. 4
      Makefile
  4. 8
      build_autogenerated.yaml
  5. 3
      config.m4
  6. 3
      config.w32
  7. 8
      gRPC-C++.podspec
  8. 10
      gRPC-Core.podspec
  9. 6
      grpc.gemspec
  10. 2
      grpc.gyp
  11. 6
      package.xml
  12. 2
      src/core/ext/xds/certificate_provider_store.cc
  13. 2
      src/core/ext/xds/certificate_provider_store.h
  14. 2
      src/core/ext/xds/file_watcher_certificate_provider_factory.cc
  15. 2
      src/core/ext/xds/file_watcher_certificate_provider_factory.h
  16. 2
      src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h
  17. 5
      src/core/ext/xds/xds_bootstrap_grpc.cc
  18. 6
      src/core/lib/security/certificate_provider/certificate_provider_factory.h
  19. 2
      src/core/lib/security/certificate_provider/certificate_provider_registry.cc
  20. 8
      src/core/lib/security/certificate_provider/certificate_provider_registry.h
  21. 2
      src/python/grpcio/grpc_core_dependencies.py
  22. 12
      test/core/client_channel/BUILD
  23. 12
      test/core/security/BUILD
  24. 2
      test/core/security/certificate_provider_registry_test.cc
  25. 2
      test/core/xds/certificate_provider_store_test.cc
  26. 2
      test/core/xds/xds_bootstrap_test.cc
  27. 2
      test/cpp/end2end/xds/xds_end2end_test.cc
  28. 6
      tools/doxygen/Doxyfile.c++.internal
  29. 6
      tools/doxygen/Doxyfile.core.internal

36
BUILD
Unescape View File

@ -4350,10 +4350,38 @@ grpc_cc_library(
],
)
grpc_cc_library(
name = "certificate_provider_factory",
hdrs = [
"src/core/lib/security/certificate_provider/certificate_provider_factory.h",
],
deps = [
"gpr",
"grpc_base",
"json",
"ref_counted",
"ref_counted_ptr",
],
)
grpc_cc_library(
name = "certificate_provider_registry",
srcs = [
"src/core/lib/security/certificate_provider/certificate_provider_registry.cc",
],
hdrs = [
"src/core/lib/security/certificate_provider/certificate_provider_registry.h",
],
external_deps = ["absl/strings"],
deps = [
"certificate_provider_factory",
"gpr_public_hdrs",
],
)
grpc_cc_library(
name = "grpc_xds_client",
srcs = [
"src/core/ext/xds/certificate_provider_registry.cc",
"src/core/ext/xds/certificate_provider_store.cc",
"src/core/ext/xds/file_watcher_certificate_provider_factory.cc",
"src/core/ext/xds/xds_bootstrap_grpc.cc",
@ -4374,8 +4402,6 @@ grpc_cc_library(
"src/core/lib/security/credentials/xds/xds_credentials.cc",
],
hdrs = [
"src/core/ext/xds/certificate_provider_factory.h",
"src/core/ext/xds/certificate_provider_registry.h",
"src/core/ext/xds/certificate_provider_store.h",
"src/core/ext/xds/file_watcher_certificate_provider_factory.h",
"src/core/ext/xds/xds_bootstrap_grpc.h",
@ -4414,6 +4440,8 @@ grpc_cc_library(
language = "c++",
tags = ["nofixdeps"],
deps = [
"certificate_provider_factory",
"certificate_provider_registry",
"channel_creds_registry",
"channel_fwd",
"config",
@ -4610,11 +4638,11 @@ grpc_cc_library(
],
language = "c++",
deps = [
"certificate_provider_factory",
"error",
"gpr_platform",
"grpc_tls_credentials",
"grpc_trace",
"grpc_xds_client",
"json",
"json_util",
"ref_counted_ptr",

4
CMakeLists.txt generated
Unescape View File

@ -2061,7 +2061,6 @@ add_library(grpc
src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c
src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c
src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c
src/core/ext/xds/certificate_provider_registry.cc
src/core/ext/xds/certificate_provider_store.cc
src/core/ext/xds/file_watcher_certificate_provider_factory.cc
src/core/ext/xds/xds_api.cc
@ -2234,6 +2233,7 @@ add_library(grpc
src/core/lib/security/authorization/grpc_server_authz_filter.cc
src/core/lib/security/authorization/matchers.cc
src/core/lib/security/authorization/rbac_policy.cc
src/core/lib/security/certificate_provider/certificate_provider_registry.cc
src/core/lib/security/context/security_context.cc
src/core/lib/security/credentials/alts/alts_credentials.cc
src/core/lib/security/credentials/alts/check_gcp_environment.cc
@ -6924,7 +6924,7 @@ endif()
if(gRPC_BUILD_TESTS)
add_executable(certificate_provider_registry_test
test/core/client_channel/certificate_provider_registry_test.cc
test/core/security/certificate_provider_registry_test.cc
third_party/googletest/googletest/src/gtest-all.cc
third_party/googletest/googlemock/src/gmock-all.cc
)

4
Makefile generated
Unescape View File

@ -1376,7 +1376,6 @@ LIBGRPC_SRC = \
src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c \
src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c \
src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c \
src/core/ext/xds/certificate_provider_registry.cc \
src/core/ext/xds/certificate_provider_store.cc \
src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
src/core/ext/xds/xds_api.cc \
@ -1549,6 +1548,7 @@ LIBGRPC_SRC = \
src/core/lib/security/authorization/grpc_server_authz_filter.cc \
src/core/lib/security/authorization/matchers.cc \
src/core/lib/security/authorization/rbac_policy.cc \
src/core/lib/security/certificate_provider/certificate_provider_registry.cc \
src/core/lib/security/context/security_context.cc \
src/core/lib/security/credentials/alts/alts_credentials.cc \
src/core/lib/security/credentials/alts/check_gcp_environment.cc \
@ -3164,7 +3164,6 @@ src/core/ext/upbdefs-generated/xds/type/matcher/v3/matcher.upbdefs.c: $(OPENSSL_
src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c: $(OPENSSL_DEP)
src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c: $(OPENSSL_DEP)
src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c: $(OPENSSL_DEP)
src/core/ext/xds/certificate_provider_registry.cc: $(OPENSSL_DEP)
src/core/ext/xds/certificate_provider_store.cc: $(OPENSSL_DEP)
src/core/ext/xds/file_watcher_certificate_provider_factory.cc: $(OPENSSL_DEP)
src/core/ext/xds/xds_api.cc: $(OPENSSL_DEP)
@ -3194,6 +3193,7 @@ src/core/lib/matchers/matchers.cc: $(OPENSSL_DEP)
src/core/lib/security/authorization/grpc_authorization_engine.cc: $(OPENSSL_DEP)
src/core/lib/security/authorization/matchers.cc: $(OPENSSL_DEP)
src/core/lib/security/authorization/rbac_policy.cc: $(OPENSSL_DEP)
src/core/lib/security/certificate_provider/certificate_provider_registry.cc: $(OPENSSL_DEP)
src/core/lib/security/credentials/alts/alts_credentials.cc: $(OPENSSL_DEP)
src/core/lib/security/credentials/alts/check_gcp_environment.cc: $(OPENSSL_DEP)
src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc: $(OPENSSL_DEP)

8
build_autogenerated.yaml generated
Unescape View File

@ -722,8 +722,6 @@ libs:
- src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h
- src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h
- src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h
- src/core/ext/xds/certificate_provider_factory.h
- src/core/ext/xds/certificate_provider_registry.h
- src/core/ext/xds/certificate_provider_store.h
- src/core/ext/xds/file_watcher_certificate_provider_factory.h
- src/core/ext/xds/upb_utils.h
@ -931,6 +929,8 @@ libs:
- src/core/lib/security/authorization/grpc_server_authz_filter.h
- src/core/lib/security/authorization/matchers.h
- src/core/lib/security/authorization/rbac_policy.h
- src/core/lib/security/certificate_provider/certificate_provider_factory.h
- src/core/lib/security/certificate_provider/certificate_provider_registry.h
- src/core/lib/security/context/security_context.h
- src/core/lib/security/credentials/alts/alts_credentials.h
- src/core/lib/security/credentials/alts/check_gcp_environment.h
@ -1435,7 +1435,6 @@ libs:
- src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c
- src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c
- src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c
- src/core/ext/xds/certificate_provider_registry.cc
- src/core/ext/xds/certificate_provider_store.cc
- src/core/ext/xds/file_watcher_certificate_provider_factory.cc
- src/core/ext/xds/xds_api.cc
@ -1608,6 +1607,7 @@ libs:
- src/core/lib/security/authorization/grpc_server_authz_filter.cc
- src/core/lib/security/authorization/matchers.cc
- src/core/lib/security/authorization/rbac_policy.cc
- src/core/lib/security/certificate_provider/certificate_provider_registry.cc
- src/core/lib/security/context/security_context.cc
- src/core/lib/security/credentials/alts/alts_credentials.cc
- src/core/lib/security/credentials/alts/check_gcp_environment.cc
@ -4589,7 +4589,7 @@ targets:
language: c++
headers: []
src:
- test/core/client_channel/certificate_provider_registry_test.cc
- test/core/security/certificate_provider_registry_test.cc
deps:
- grpc_test_util
- name: certificate_provider_store_test

3
config.m4 generated
Unescape View File

@ -423,7 +423,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c \
src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c \
src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c \
src/core/ext/xds/certificate_provider_registry.cc \
src/core/ext/xds/certificate_provider_store.cc \
src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
src/core/ext/xds/xds_api.cc \
@ -638,6 +637,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/security/authorization/grpc_server_authz_filter.cc \
src/core/lib/security/authorization/matchers.cc \
src/core/lib/security/authorization/rbac_policy.cc \
src/core/lib/security/certificate_provider/certificate_provider_registry.cc \
src/core/lib/security/context/security_context.cc \
src/core/lib/security/credentials/alts/alts_credentials.cc \
src/core/lib/security/credentials/alts/check_gcp_environment.cc \
@ -1347,6 +1347,7 @@ if test "$PHP_GRPC" != "no"; then
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resolver)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resource_quota)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/authorization)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/certificate_provider)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/context)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials)
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/alts)

3
config.w32 generated
Unescape View File

@ -389,7 +389,6 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\regex.upbdefs.c " +
"src\\core\\ext\\upbdefs-generated\\xds\\type\\matcher\\v3\\string.upbdefs.c " +
"src\\core\\ext\\upbdefs-generated\\xds\\type\\v3\\typed_struct.upbdefs.c " +
"src\\core\\ext\\xds\\certificate_provider_registry.cc " +
"src\\core\\ext\\xds\\certificate_provider_store.cc " +
"src\\core\\ext\\xds\\file_watcher_certificate_provider_factory.cc " +
"src\\core\\ext\\xds\\xds_api.cc " +
@ -604,6 +603,7 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\security\\authorization\\grpc_server_authz_filter.cc " +
"src\\core\\lib\\security\\authorization\\matchers.cc " +
"src\\core\\lib\\security\\authorization\\rbac_policy.cc " +
"src\\core\\lib\\security\\certificate_provider\\certificate_provider_registry.cc " +
"src\\core\\lib\\security\\context\\security_context.cc " +
"src\\core\\lib\\security\\credentials\\alts\\alts_credentials.cc " +
"src\\core\\lib\\security\\credentials\\alts\\check_gcp_environment.cc " +
@ -1470,6 +1470,7 @@ if (PHP_GRPC != "no") {
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\resource_quota");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\authorization");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\certificate_provider");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\context");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials");
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\alts");

8
gRPC-C++.podspec generated
Unescape View File

@ -626,8 +626,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h',
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h',
'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h',
'src/core/ext/xds/certificate_provider_factory.h',
'src/core/ext/xds/certificate_provider_registry.h',
'src/core/ext/xds/certificate_provider_store.h',
'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
'src/core/ext/xds/upb_utils.h',
@ -860,6 +858,8 @@ Pod::Spec.new do |s|
'src/core/lib/security/authorization/grpc_server_authz_filter.h',
'src/core/lib/security/authorization/matchers.h',
'src/core/lib/security/authorization/rbac_policy.h',
'src/core/lib/security/certificate_provider/certificate_provider_factory.h',
'src/core/lib/security/certificate_provider/certificate_provider_registry.h',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/alts/alts_credentials.h',
'src/core/lib/security/credentials/alts/check_gcp_environment.h',
@ -1486,8 +1486,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h',
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h',
'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h',
'src/core/ext/xds/certificate_provider_factory.h',
'src/core/ext/xds/certificate_provider_registry.h',
'src/core/ext/xds/certificate_provider_store.h',
'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
'src/core/ext/xds/upb_utils.h',
@ -1720,6 +1718,8 @@ Pod::Spec.new do |s|
'src/core/lib/security/authorization/grpc_server_authz_filter.h',
'src/core/lib/security/authorization/matchers.h',
'src/core/lib/security/authorization/rbac_policy.h',
'src/core/lib/security/certificate_provider/certificate_provider_factory.h',
'src/core/lib/security/certificate_provider/certificate_provider_registry.h',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/alts/alts_credentials.h',
'src/core/lib/security/credentials/alts/check_gcp_environment.h',

10
gRPC-Core.podspec generated
Unescape View File

@ -947,9 +947,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h',
'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c',
'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h',
'src/core/ext/xds/certificate_provider_factory.h',
'src/core/ext/xds/certificate_provider_registry.cc',
'src/core/ext/xds/certificate_provider_registry.h',
'src/core/ext/xds/certificate_provider_store.cc',
'src/core/ext/xds/certificate_provider_store.h',
'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
@ -1396,6 +1393,9 @@ Pod::Spec.new do |s|
'src/core/lib/security/authorization/matchers.h',
'src/core/lib/security/authorization/rbac_policy.cc',
'src/core/lib/security/authorization/rbac_policy.h',
'src/core/lib/security/certificate_provider/certificate_provider_factory.h',
'src/core/lib/security/certificate_provider/certificate_provider_registry.cc',
'src/core/lib/security/certificate_provider/certificate_provider_registry.h',
'src/core/lib/security/context/security_context.cc',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/alts/alts_credentials.cc',
@ -2112,8 +2112,6 @@ Pod::Spec.new do |s|
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.h',
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h',
'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h',
'src/core/ext/xds/certificate_provider_factory.h',
'src/core/ext/xds/certificate_provider_registry.h',
'src/core/ext/xds/certificate_provider_store.h',
'src/core/ext/xds/file_watcher_certificate_provider_factory.h',
'src/core/ext/xds/upb_utils.h',
@ -2346,6 +2344,8 @@ Pod::Spec.new do |s|
'src/core/lib/security/authorization/grpc_server_authz_filter.h',
'src/core/lib/security/authorization/matchers.h',
'src/core/lib/security/authorization/rbac_policy.h',
'src/core/lib/security/certificate_provider/certificate_provider_factory.h',
'src/core/lib/security/certificate_provider/certificate_provider_registry.h',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/alts/alts_credentials.h',
'src/core/lib/security/credentials/alts/check_gcp_environment.h',

6
grpc.gemspec generated
Unescape View File

@ -860,9 +860,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h )
s.files += %w( src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c )
s.files += %w( src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h )
s.files += %w( src/core/ext/xds/certificate_provider_factory.h )
s.files += %w( src/core/ext/xds/certificate_provider_registry.cc )
s.files += %w( src/core/ext/xds/certificate_provider_registry.h )
s.files += %w( src/core/ext/xds/certificate_provider_store.cc )
s.files += %w( src/core/ext/xds/certificate_provider_store.h )
s.files += %w( src/core/ext/xds/file_watcher_certificate_provider_factory.cc )
@ -1309,6 +1306,9 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/security/authorization/matchers.h )
s.files += %w( src/core/lib/security/authorization/rbac_policy.cc )
s.files += %w( src/core/lib/security/authorization/rbac_policy.h )
s.files += %w( src/core/lib/security/certificate_provider/certificate_provider_factory.h )
s.files += %w( src/core/lib/security/certificate_provider/certificate_provider_registry.cc )
s.files += %w( src/core/lib/security/certificate_provider/certificate_provider_registry.h )
s.files += %w( src/core/lib/security/context/security_context.cc )
s.files += %w( src/core/lib/security/context/security_context.h )
s.files += %w( src/core/lib/security/credentials/alts/alts_credentials.cc )

2
grpc.gyp generated
Unescape View File

@ -755,7 +755,6 @@
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c',
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c',
'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c',
'src/core/ext/xds/certificate_provider_registry.cc',
'src/core/ext/xds/certificate_provider_store.cc',
'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
'src/core/ext/xds/xds_api.cc',
@ -928,6 +927,7 @@
'src/core/lib/security/authorization/grpc_server_authz_filter.cc',
'src/core/lib/security/authorization/matchers.cc',
'src/core/lib/security/authorization/rbac_policy.cc',
'src/core/lib/security/certificate_provider/certificate_provider_registry.cc',
'src/core/lib/security/context/security_context.cc',
'src/core/lib/security/credentials/alts/alts_credentials.cc',
'src/core/lib/security/credentials/alts/check_gcp_environment.cc',

6
package.xml generated
Unescape View File

@ -842,9 +842,6 @@
<file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_store.cc" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/certificate_provider_store.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/xds/file_watcher_certificate_provider_factory.cc" role="src" />
@ -1291,6 +1288,9 @@
<file baseinstalldir="/" name="src/core/lib/security/authorization/matchers.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/authorization/rbac_policy.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/authorization/rbac_policy.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/certificate_provider/certificate_provider_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/certificate_provider/certificate_provider_registry.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/certificate_provider/certificate_provider_registry.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/context/security_context.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/context/security_context.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/credentials/alts/alts_credentials.cc" role="src" />

2
src/core/ext/xds/certificate_provider_store.cc
Unescape View File

@ -22,7 +22,7 @@
#include <grpc/support/log.h>
#include "src/core/ext/xds/certificate_provider_registry.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
namespace grpc_core {

2
src/core/ext/xds/certificate_provider_store.h
Unescape View File

@ -30,13 +30,13 @@
#include <grpc/grpc_security.h>
#include "src/core/ext/xds/certificate_provider_factory.h"
#include "src/core/lib/gpr/useful.h"
#include "src/core/lib/gprpp/orphanable.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/sync.h"
#include "src/core/lib/gprpp/unique_type_name.h"
#include "src/core/lib/iomgr/iomgr_fwd.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"

2
src/core/ext/xds/file_watcher_certificate_provider_factory.cc
Unescape View File

@ -31,8 +31,8 @@
#include <grpc/support/log.h>
#include <grpc/support/time.h>
#include "src/core/ext/xds/certificate_provider_registry.h"
#include "src/core/lib/json/json_util.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
namespace grpc_core {

2
src/core/ext/xds/file_watcher_certificate_provider_factory.h
Unescape View File

@ -25,11 +25,11 @@
#include <grpc/grpc_security.h>
#include "src/core/ext/xds/certificate_provider_factory.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/iomgr/error.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
namespace grpc_core {

2
src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h
Unescape View File

@ -28,11 +28,11 @@
#include <grpc/grpc_security.h>
#include "src/core/ext/xds/certificate_provider_factory.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/iomgr/error.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
namespace grpc_core {

5
src/core/ext/xds/xds_bootstrap_grpc.cc
Unescape View File

@ -35,11 +35,12 @@
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "src/core/ext/xds/certificate_provider_factory.h"
#include "src/core/ext/xds/certificate_provider_registry.h"
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_util.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include "src/core/lib/security/credentials/channel_creds_registry.h"
namespace grpc_core {

6
src/core/ext/xds/certificate_provider_factory.h → src/core/lib/security/certificate_provider/certificate_provider_factory.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_FACTORY_H
#define GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_FACTORY_H
#ifndef GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
#define GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
#include <grpc/support/port_platform.h>
@ -63,4 +63,4 @@ class CertificateProviderFactory {
} // namespace grpc_core
#endif // GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_FACTORY_H
#endif // GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H

2
src/core/ext/xds/certificate_provider_registry.cc → src/core/lib/security/certificate_provider/certificate_provider_registry.cc
Unescape View File

@ -18,7 +18,7 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/certificate_provider_registry.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include <string.h>

8
src/core/ext/xds/certificate_provider_registry.h → src/core/lib/security/certificate_provider/certificate_provider_registry.h
Unescape View File

@ -16,8 +16,8 @@
//
//
#ifndef GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_REGISTRY_H
#define GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_REGISTRY_H
#ifndef GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
#define GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
#include <grpc/support/port_platform.h>
@ -25,7 +25,7 @@
#include "absl/strings/string_view.h"
#include "src/core/ext/xds/certificate_provider_factory.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
namespace grpc_core {
@ -56,4 +56,4 @@ class CertificateProviderRegistry {
} // namespace grpc_core
#endif // GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_REGISTRY_H
#endif // GRPC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H

2
src/python/grpcio/grpc_core_dependencies.py generated
Unescape View File

@ -398,7 +398,6 @@ CORE_SOURCE_FILES = [
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/regex.upbdefs.c',
'src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c',
'src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c',
'src/core/ext/xds/certificate_provider_registry.cc',
'src/core/ext/xds/certificate_provider_store.cc',
'src/core/ext/xds/file_watcher_certificate_provider_factory.cc',
'src/core/ext/xds/xds_api.cc',
@ -613,6 +612,7 @@ CORE_SOURCE_FILES = [
'src/core/lib/security/authorization/grpc_server_authz_filter.cc',
'src/core/lib/security/authorization/matchers.cc',
'src/core/lib/security/authorization/rbac_policy.cc',
'src/core/lib/security/certificate_provider/certificate_provider_registry.cc',
'src/core/lib/security/context/security_context.cc',
'src/core/lib/security/credentials/alts/alts_credentials.cc',
'src/core/lib/security/credentials/alts/check_gcp_environment.cc',

12
test/core/client_channel/BUILD
Unescape View File

@ -30,18 +30,6 @@ grpc_cc_test(
],
)
grpc_cc_test(
name = "certificate_provider_registry_test",
srcs = ["certificate_provider_registry_test.cc"],
external_deps = ["gtest"],
language = "C++",
deps = [
"//:gpr",
"//:grpc",
"//test/core/util:grpc_test_util",
],
)
grpc_cc_test(
name = "http_proxy_mapper_test",
srcs = ["http_proxy_mapper_test.cc"],

12
test/core/security/BUILD
Unescape View File

@ -536,3 +536,15 @@ grpc_cc_test(
"//test/core/util:grpc_test_util_base",
],
)
grpc_cc_test(
name = "certificate_provider_registry_test",
srcs = ["certificate_provider_registry_test.cc"],
external_deps = ["gtest"],
language = "C++",
deps = [
"//:gpr",
"//:grpc",
"//test/core/util:grpc_test_util",
],
)

2
test/core/client_channel/certificate_provider_registry_test.cc → test/core/security/certificate_provider_registry_test.cc
Unescape View File

@ -18,7 +18,7 @@
#include <grpc/support/port_platform.h>
#include "src/core/ext/xds/certificate_provider_registry.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include <gmock/gmock.h>

2
test/core/xds/certificate_provider_store_test.cc
Unescape View File

@ -22,8 +22,8 @@
#include <gmock/gmock.h>
#include "src/core/ext/xds/certificate_provider_registry.h"
#include "src/core/lib/gprpp/unique_type_name.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include "test/core/util/test_config.h"
namespace grpc_core {

2
test/core/xds/xds_bootstrap_test.cc
Unescape View File

@ -20,11 +20,11 @@
#include "absl/strings/numbers.h"
#include "absl/strings/str_format.h"
#include "src/core/ext/xds/certificate_provider_registry.h"
#include "src/core/ext/xds/xds_bootstrap_grpc.h"
#include "src/core/ext/xds/xds_client_grpc.h"
#include "src/core/lib/gpr/env.h"
#include "src/core/lib/gpr/tmpfile.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include "test/core/util/test_config.h"
namespace grpc_core {

2
test/cpp/end2end/xds/xds_end2end_test.cc
Unescape View File

@ -61,7 +61,6 @@
#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h"
#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
#include "src/core/ext/filters/http/client/http_client_filter.h"
#include "src/core/ext/xds/certificate_provider_registry.h"
#include "src/core/ext/xds/xds_api.h"
#include "src/core/ext/xds/xds_channel_args.h"
#include "src/core/ext/xds/xds_client.h"
@ -80,6 +79,7 @@
#include "src/core/lib/iomgr/load_file.h"
#include "src/core/lib/iomgr/sockaddr.h"
#include "src/core/lib/resolver/server_address.h"
#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
#include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
#include "src/cpp/client/secure_credentials.h"

6
tools/doxygen/Doxyfile.c++.internal generated
Unescape View File

@ -1843,9 +1843,6 @@ src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c \
src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h \
src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c \
src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h \
src/core/ext/xds/certificate_provider_factory.h \
src/core/ext/xds/certificate_provider_registry.cc \
src/core/ext/xds/certificate_provider_registry.h \
src/core/ext/xds/certificate_provider_store.cc \
src/core/ext/xds/certificate_provider_store.h \
src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
@ -2292,6 +2289,9 @@ src/core/lib/security/authorization/matchers.cc \
src/core/lib/security/authorization/matchers.h \
src/core/lib/security/authorization/rbac_policy.cc \
src/core/lib/security/authorization/rbac_policy.h \
src/core/lib/security/certificate_provider/certificate_provider_factory.h \
src/core/lib/security/certificate_provider/certificate_provider_registry.cc \
src/core/lib/security/certificate_provider/certificate_provider_registry.h \
src/core/lib/security/context/security_context.cc \
src/core/lib/security/context/security_context.h \
src/core/lib/security/credentials/alts/alts_credentials.cc \

6
tools/doxygen/Doxyfile.core.internal generated
Unescape View File

@ -1631,9 +1631,6 @@ src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.c \
src/core/ext/upbdefs-generated/xds/type/matcher/v3/string.upbdefs.h \
src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c \
src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.h \
src/core/ext/xds/certificate_provider_factory.h \
src/core/ext/xds/certificate_provider_registry.cc \
src/core/ext/xds/certificate_provider_registry.h \
src/core/ext/xds/certificate_provider_store.cc \
src/core/ext/xds/certificate_provider_store.h \
src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
@ -2085,6 +2082,9 @@ src/core/lib/security/authorization/matchers.cc \
src/core/lib/security/authorization/matchers.h \
src/core/lib/security/authorization/rbac_policy.cc \
src/core/lib/security/authorization/rbac_policy.h \
src/core/lib/security/certificate_provider/certificate_provider_factory.h \
src/core/lib/security/certificate_provider/certificate_provider_registry.cc \
src/core/lib/security/certificate_provider/certificate_provider_registry.h \
src/core/lib/security/context/security_context.cc \
src/core/lib/security/context/security_context.h \
src/core/lib/security/credentials/alts/alts_credentials.cc \

Write Preview
Loading…
Cancel
Save