Skip to content

Commit a3d997c

Browse files
yihuazhangyihuazhang
committed
Add a TLS credential surface API (experimental)
1 parent 5884861 commit a3d997c

22 files changed

+724
-0
lines changed

Diff for: ‎BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -1614,6 +1614,7 @@ grpc_cc_library(
16141614
"src/core/lib/security/credentials/oauth2/oauth2_credentials.cc",
16151615
"src/core/lib/security/credentials/plugin/plugin_credentials.cc",
16161616
"src/core/lib/security/credentials/ssl/ssl_credentials.cc",
1617+
"src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc",
16171618
"src/core/lib/security/security_connector/alts/alts_security_connector.cc",
16181619
"src/core/lib/security/security_connector/fake/fake_security_connector.cc",
16191620
"src/core/lib/security/security_connector/load_system_roots_fallback.cc",
@@ -1648,6 +1649,7 @@ grpc_cc_library(
16481649
"src/core/lib/security/credentials/oauth2/oauth2_credentials.h",
16491650
"src/core/lib/security/credentials/plugin/plugin_credentials.h",
16501651
"src/core/lib/security/credentials/ssl/ssl_credentials.h",
1652+
"src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h",
16511653
"src/core/lib/security/security_connector/alts/alts_security_connector.h",
16521654
"src/core/lib/security/security_connector/fake/fake_security_connector.h",
16531655
"src/core/lib/security/security_connector/load_system_roots.h",

Diff for: ‎CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1151,6 +1151,7 @@ add_library(grpc
11511151
src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
11521152
src/core/lib/security/credentials/plugin/plugin_credentials.cc
11531153
src/core/lib/security/credentials/ssl/ssl_credentials.cc
1154+
src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
11541155
src/core/lib/security/security_connector/alts/alts_security_connector.cc
11551156
src/core/lib/security/security_connector/fake/fake_security_connector.cc
11561157
src/core/lib/security/security_connector/load_system_roots_fallback.cc
@@ -1609,6 +1610,7 @@ add_library(grpc_cronet
16091610
src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
16101611
src/core/lib/security/credentials/plugin/plugin_credentials.cc
16111612
src/core/lib/security/credentials/ssl/ssl_credentials.cc
1613+
src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
16121614
src/core/lib/security/security_connector/alts/alts_security_connector.cc
16131615
src/core/lib/security/security_connector/fake/fake_security_connector.cc
16141616
src/core/lib/security/security_connector/load_system_roots_fallback.cc

Diff for: ‎Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -3672,6 +3672,7 @@ LIBGRPC_SRC = \
36723672
src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
36733673
src/core/lib/security/credentials/plugin/plugin_credentials.cc \
36743674
src/core/lib/security/credentials/ssl/ssl_credentials.cc \
3675+
src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc \
36753676
src/core/lib/security/security_connector/alts/alts_security_connector.cc \
36763677
src/core/lib/security/security_connector/fake/fake_security_connector.cc \
36773678
src/core/lib/security/security_connector/load_system_roots_fallback.cc \
@@ -4124,6 +4125,7 @@ LIBGRPC_CRONET_SRC = \
41244125
src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
41254126
src/core/lib/security/credentials/plugin/plugin_credentials.cc \
41264127
src/core/lib/security/credentials/ssl/ssl_credentials.cc \
4128+
src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc \
41274129
src/core/lib/security/security_connector/alts/alts_security_connector.cc \
41284130
src/core/lib/security/security_connector/fake/fake_security_connector.cc \
41294131
src/core/lib/security/security_connector/load_system_roots_fallback.cc \
@@ -25370,6 +25372,7 @@ src/core/lib/security/credentials/local/local_credentials.cc: $(OPENSSL_DEP)
2537025372
src/core/lib/security/credentials/oauth2/oauth2_credentials.cc: $(OPENSSL_DEP)
2537125373
src/core/lib/security/credentials/plugin/plugin_credentials.cc: $(OPENSSL_DEP)
2537225374
src/core/lib/security/credentials/ssl/ssl_credentials.cc: $(OPENSSL_DEP)
25375+
src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc: $(OPENSSL_DEP)
2537325376
src/core/lib/security/security_connector/alts/alts_security_connector.cc: $(OPENSSL_DEP)
2537425377
src/core/lib/security/security_connector/fake/fake_security_connector.cc: $(OPENSSL_DEP)
2537525378
src/core/lib/security/security_connector/load_system_roots_fallback.cc: $(OPENSSL_DEP)

Diff for: ‎build.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,7 @@ filegroups:
837837
- src/core/lib/security/credentials/oauth2/oauth2_credentials.h
838838
- src/core/lib/security/credentials/plugin/plugin_credentials.h
839839
- src/core/lib/security/credentials/ssl/ssl_credentials.h
840+
- src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h
840841
- src/core/lib/security/security_connector/alts/alts_security_connector.h
841842
- src/core/lib/security/security_connector/fake/fake_security_connector.h
842843
- src/core/lib/security/security_connector/load_system_roots.h
@@ -869,6 +870,7 @@ filegroups:
869870
- src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
870871
- src/core/lib/security/credentials/plugin/plugin_credentials.cc
871872
- src/core/lib/security/credentials/ssl/ssl_credentials.cc
873+
- src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
872874
- src/core/lib/security/security_connector/alts/alts_security_connector.cc
873875
- src/core/lib/security/security_connector/fake/fake_security_connector.cc
874876
- src/core/lib/security/security_connector/load_system_roots_fallback.cc

Diff for: ‎config.m4

+2
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ if test "$PHP_GRPC" != "no"; then
283283
src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
284284
src/core/lib/security/credentials/plugin/plugin_credentials.cc \
285285
src/core/lib/security/credentials/ssl/ssl_credentials.cc \
286+
src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc \
286287
src/core/lib/security/security_connector/alts/alts_security_connector.cc \
287288
src/core/lib/security/security_connector/fake/fake_security_connector.cc \
288289
src/core/lib/security/security_connector/load_system_roots_fallback.cc \
@@ -728,6 +729,7 @@ if test "$PHP_GRPC" != "no"; then
728729
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/oauth2)
729730
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/plugin)
730731
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/ssl)
732+
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/credentials/tls)
731733
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/security_connector)
732734
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/security_connector/alts)
733735
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/security_connector/fake)

Diff for: ‎config.w32

+2
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ if (PHP_GRPC != "no") {
258258
"src\\core\\lib\\security\\credentials\\oauth2\\oauth2_credentials.cc " +
259259
"src\\core\\lib\\security\\credentials\\plugin\\plugin_credentials.cc " +
260260
"src\\core\\lib\\security\\credentials\\ssl\\ssl_credentials.cc " +
261+
"src\\core\\lib\\security\\credentials\\tls\\grpc_tls_credentials_options.cc " +
261262
"src\\core\\lib\\security\\security_connector\\alts\\alts_security_connector.cc " +
262263
"src\\core\\lib\\security\\security_connector\\fake\\fake_security_connector.cc " +
263264
"src\\core\\lib\\security\\security_connector\\load_system_roots_fallback.cc " +
@@ -743,6 +744,7 @@ if (PHP_GRPC != "no") {
743744
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\oauth2");
744745
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\plugin");
745746
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\ssl");
747+
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\credentials\\tls");
746748
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\security_connector");
747749
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\security_connector\\alts");
748750
FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\security\\security_connector\\fake");

Diff for: ‎gRPC-C++.podspec

+1
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ Pod::Spec.new do |s|
300300
'src/core/lib/security/credentials/oauth2/oauth2_credentials.h',
301301
'src/core/lib/security/credentials/plugin/plugin_credentials.h',
302302
'src/core/lib/security/credentials/ssl/ssl_credentials.h',
303+
'src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h',
303304
'src/core/lib/security/security_connector/alts/alts_security_connector.h',
304305
'src/core/lib/security/security_connector/fake/fake_security_connector.h',
305306
'src/core/lib/security/security_connector/load_system_roots.h',

Diff for: ‎gRPC-Core.podspec

+3
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ Pod::Spec.new do |s|
294294
'src/core/lib/security/credentials/oauth2/oauth2_credentials.h',
295295
'src/core/lib/security/credentials/plugin/plugin_credentials.h',
296296
'src/core/lib/security/credentials/ssl/ssl_credentials.h',
297+
'src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h',
297298
'src/core/lib/security/security_connector/alts/alts_security_connector.h',
298299
'src/core/lib/security/security_connector/fake/fake_security_connector.h',
299300
'src/core/lib/security/security_connector/load_system_roots.h',
@@ -731,6 +732,7 @@ Pod::Spec.new do |s|
731732
'src/core/lib/security/credentials/oauth2/oauth2_credentials.cc',
732733
'src/core/lib/security/credentials/plugin/plugin_credentials.cc',
733734
'src/core/lib/security/credentials/ssl/ssl_credentials.cc',
735+
'src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc',
734736
'src/core/lib/security/security_connector/alts/alts_security_connector.cc',
735737
'src/core/lib/security/security_connector/fake/fake_security_connector.cc',
736738
'src/core/lib/security/security_connector/load_system_roots_fallback.cc',
@@ -923,6 +925,7 @@ Pod::Spec.new do |s|
923925
'src/core/lib/security/credentials/oauth2/oauth2_credentials.h',
924926
'src/core/lib/security/credentials/plugin/plugin_credentials.h',
925927
'src/core/lib/security/credentials/ssl/ssl_credentials.h',
928+
'src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h',
926929
'src/core/lib/security/security_connector/alts/alts_security_connector.h',
927930
'src/core/lib/security/security_connector/fake/fake_security_connector.h',
928931
'src/core/lib/security/security_connector/load_system_roots.h',

Diff for: ‎grpc.def

+9
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,15 @@ EXPORTS
131131
grpc_alts_server_credentials_create
132132
grpc_local_credentials_create
133133
grpc_local_server_credentials_create
134+
grpc_tls_credentials_options_create
135+
grpc_tls_credentials_options_set_cert_request_type
136+
grpc_tls_credentials_options_set_key_materials_config
137+
grpc_tls_credentials_options_set_credential_reload_config
138+
grpc_tls_credentials_options_set_server_authorization_check_config
139+
grpc_tls_key_materials_config_create
140+
grpc_tls_key_materials_config_set_key_materials
141+
grpc_tls_credential_reload_config_create
142+
grpc_tls_server_authorization_check_config_create
134143
grpc_raw_byte_buffer_create
135144
grpc_raw_compressed_byte_buffer_create
136145
grpc_byte_buffer_copy

Diff for: ‎grpc.gemspec

+2
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ Gem::Specification.new do |s|
224224
s.files += %w( src/core/lib/security/credentials/oauth2/oauth2_credentials.h )
225225
s.files += %w( src/core/lib/security/credentials/plugin/plugin_credentials.h )
226226
s.files += %w( src/core/lib/security/credentials/ssl/ssl_credentials.h )
227+
s.files += %w( src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h )
227228
s.files += %w( src/core/lib/security/security_connector/alts/alts_security_connector.h )
228229
s.files += %w( src/core/lib/security/security_connector/fake/fake_security_connector.h )
229230
s.files += %w( src/core/lib/security/security_connector/load_system_roots.h )
@@ -665,6 +666,7 @@ Gem::Specification.new do |s|
665666
s.files += %w( src/core/lib/security/credentials/oauth2/oauth2_credentials.cc )
666667
s.files += %w( src/core/lib/security/credentials/plugin/plugin_credentials.cc )
667668
s.files += %w( src/core/lib/security/credentials/ssl/ssl_credentials.cc )
669+
s.files += %w( src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc )
668670
s.files += %w( src/core/lib/security/security_connector/alts/alts_security_connector.cc )
669671
s.files += %w( src/core/lib/security/security_connector/fake/fake_security_connector.cc )
670672
s.files += %w( src/core/lib/security/security_connector/load_system_roots_fallback.cc )

Diff for: ‎grpc.gyp

+1
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@
465465
'src/core/lib/security/credentials/oauth2/oauth2_credentials.cc',
466466
'src/core/lib/security/credentials/plugin/plugin_credentials.cc',
467467
'src/core/lib/security/credentials/ssl/ssl_credentials.cc',
468+
'src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc',
468469
'src/core/lib/security/security_connector/alts/alts_security_connector.cc',
469470
'src/core/lib/security/security_connector/fake/fake_security_connector.cc',
470471
'src/core/lib/security/security_connector/load_system_roots_fallback.cc',

0 commit comments

Comments
 (0)