grpc 1.34.0 → 1.37.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of grpc might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Makefile +893 -2840
- data/etc/roots.pem +257 -573
- data/include/grpc/compression.h +1 -1
- data/include/grpc/grpc.h +28 -0
- data/include/grpc/grpc_security.h +77 -14
- data/include/grpc/impl/codegen/atm_windows.h +4 -0
- data/include/grpc/impl/codegen/byte_buffer.h +1 -1
- data/include/grpc/impl/codegen/grpc_types.h +1 -1
- data/include/grpc/impl/codegen/log.h +0 -2
- data/include/grpc/impl/codegen/port_platform.h +2 -0
- data/include/grpc/impl/codegen/sync_windows.h +4 -0
- data/include/grpc/slice_buffer.h +3 -3
- data/include/grpc/support/sync.h +3 -3
- data/include/grpc/support/time.h +7 -7
- data/src/core/ext/filters/client_channel/backend_metric.cc +2 -4
- data/src/core/ext/filters/client_channel/client_channel.cc +2823 -1559
- data/src/core/ext/filters/client_channel/client_channel.h +0 -6
- data/src/core/ext/filters/client_channel/client_channel_factory.h +2 -1
- data/src/core/ext/filters/client_channel/client_channel_plugin.cc +1 -1
- data/src/core/ext/filters/client_channel/config_selector.h +13 -1
- data/src/core/ext/filters/client_channel/dynamic_filters.cc +191 -0
- data/src/core/ext/filters/client_channel/dynamic_filters.h +99 -0
- data/src/core/ext/filters/client_channel/global_subchannel_pool.cc +24 -142
- data/src/core/ext/filters/client_channel/global_subchannel_pool.h +15 -10
- data/src/core/ext/filters/client_channel/health/health_check_client.cc +6 -6
- data/src/core/ext/filters/client_channel/health/health_check_client.h +2 -2
- data/src/core/ext/filters/client_channel/http_connect_handshaker.cc +6 -7
- data/src/core/ext/filters/client_channel/http_proxy.cc +21 -20
- data/src/core/ext/filters/client_channel/lb_policy.cc +4 -1
- data/src/core/ext/filters/client_channel/lb_policy.h +2 -3
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +35 -35
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h +1 -2
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +1 -2
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +3 -3
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h +1 -1
- data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +1 -1
- data/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +8 -6
- data/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +23 -0
- data/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h +27 -0
- data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +369 -108
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds.h +0 -8
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h +29 -0
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +13 -27
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +2 -2
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc +1384 -0
- data/src/core/ext/filters/client_channel/local_subchannel_pool.cc +27 -67
- data/src/core/ext/filters/client_channel/local_subchannel_pool.h +10 -9
- data/src/core/ext/filters/client_channel/resolver.cc +5 -5
- data/src/core/ext/filters/client_channel/resolver.h +1 -12
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +41 -57
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +1 -32
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +4 -4
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +3 -1
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +444 -22
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +5 -0
- data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +21 -22
- data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +20 -17
- data/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc +377 -0
- data/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +21 -34
- data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +310 -160
- data/src/core/ext/filters/client_channel/resolver_factory.h +6 -6
- data/src/core/ext/filters/client_channel/resolver_registry.cc +40 -39
- data/src/core/ext/filters/client_channel/resolver_registry.h +2 -2
- data/src/core/ext/filters/client_channel/resolver_result_parsing.cc +11 -13
- data/src/core/ext/filters/client_channel/resolver_result_parsing.h +8 -8
- data/src/core/ext/filters/client_channel/retry_throttle.cc +5 -3
- data/src/core/ext/filters/client_channel/retry_throttle.h +3 -1
- data/src/core/ext/filters/client_channel/server_address.cc +9 -0
- data/src/core/ext/filters/client_channel/server_address.h +31 -0
- data/src/core/ext/filters/client_channel/service_config_call_data.h +19 -1
- data/src/core/ext/filters/client_channel/subchannel.cc +100 -193
- data/src/core/ext/filters/client_channel/subchannel.h +73 -111
- data/src/core/ext/filters/client_channel/subchannel_pool_interface.cc +16 -2
- data/src/core/ext/filters/client_channel/subchannel_pool_interface.h +10 -8
- data/src/core/ext/filters/client_idle/client_idle_filter.cc +1 -1
- data/src/core/ext/filters/deadline/deadline_filter.cc +4 -2
- data/src/core/ext/filters/fault_injection/fault_injection_filter.cc +495 -0
- data/src/core/ext/filters/fault_injection/fault_injection_filter.h +39 -0
- data/src/core/ext/filters/fault_injection/service_config_parser.cc +189 -0
- data/src/core/ext/filters/fault_injection/service_config_parser.h +85 -0
- data/src/core/ext/filters/http/client_authority_filter.cc +6 -6
- data/src/core/ext/filters/http/http_filters_plugin.cc +6 -3
- data/src/core/ext/filters/max_age/max_age_filter.cc +35 -32
- data/src/core/ext/filters/message_size/message_size_filter.cc +1 -1
- data/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +1 -1
- data/src/core/ext/filters/workarounds/workaround_utils.cc +1 -1
- data/src/core/ext/transport/chttp2/client/authority.cc +3 -3
- data/src/core/ext/transport/chttp2/client/chttp2_connector.cc +2 -2
- data/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +23 -10
- data/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +21 -10
- data/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +29 -16
- data/src/core/ext/transport/chttp2/server/chttp2_server.cc +623 -219
- data/src/core/ext/transport/chttp2/server/chttp2_server.h +11 -2
- data/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +11 -1
- data/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +12 -5
- data/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +62 -18
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +46 -15
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.h +12 -1
- data/src/core/ext/transport/chttp2/transport/flow_control.h +1 -1
- data/src/core/ext/transport/chttp2/transport/frame_data.cc +5 -1
- data/src/core/ext/transport/chttp2/transport/frame_settings.h +2 -1
- data/src/core/ext/transport/chttp2/transport/frame_window_update.cc +6 -6
- data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +1 -1
- data/src/core/ext/transport/chttp2/transport/internal.h +1 -0
- data/src/core/ext/transport/chttp2/transport/writing.cc +1 -1
- data/src/core/ext/transport/inproc/inproc_transport.cc +42 -8
- data/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c +406 -0
- data/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h +1459 -0
- data/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h +1 -0
- data/src/core/ext/upb-generated/envoy/annotations/resource.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/annotations/resource.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c +27 -28
- data/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h +139 -40
- data/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c +350 -0
- data/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h +1348 -0
- data/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c +13 -13
- data/src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h +44 -17
- data/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c +119 -124
- data/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h +450 -284
- data/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c +3 -3
- data/src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h +13 -5
- data/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c +24 -23
- data/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h +62 -21
- data/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c +21 -21
- data/src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h +88 -39
- data/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c +4 -4
- data/src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h +15 -6
- data/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c +69 -45
- data/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h +275 -78
- data/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c +19 -19
- data/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h +80 -43
- data/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.c +7 -7
- data/src/core/ext/upb-generated/envoy/config/core/v3/extension.upb.h +27 -11
- data/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c +30 -30
- data/src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h +136 -49
- data/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c +41 -41
- data/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h +172 -89
- data/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c +4 -4
- data/src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h +17 -9
- data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c +53 -47
- data/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h +188 -78
- data/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c +1 -2
- data/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c +2 -2
- data/src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h +9 -2
- data/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c +11 -5
- data/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h +48 -7
- data/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c +13 -14
- data/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h +59 -36
- data/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c +16 -16
- data/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h +61 -29
- data/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c +26 -26
- data/src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h +101 -66
- data/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c +2 -2
- data/src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h +11 -3
- data/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c +34 -32
- data/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h +151 -61
- data/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c +33 -29
- data/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h +138 -54
- data/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c +2 -3
- data/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h +13 -0
- data/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c +144 -0
- data/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h +488 -0
- data/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c +141 -0
- data/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h +452 -0
- data/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c +16 -16
- data/src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h +81 -35
- data/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c +15 -13
- data/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h +70 -37
- data/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c +257 -216
- data/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h +995 -495
- data/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c +5 -5
- data/src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h +26 -6
- data/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c +3 -4
- data/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h +17 -3
- data/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c +29 -0
- data/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h +67 -0
- data/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c +79 -0
- data/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h +268 -0
- data/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c +78 -0
- data/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h +281 -0
- data/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c +41 -0
- data/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h +113 -0
- data/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c +96 -98
- data/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h +378 -226
- data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c +0 -1
- data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h +1 -0
- data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c +28 -25
- data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h +124 -53
- data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c +9 -12
- data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h +29 -24
- data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c +32 -33
- data/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h +118 -67
- data/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c +51 -44
- data/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h +179 -129
- data/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c +1 -4
- data/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c +1 -4
- data/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c +7 -8
- data/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h +31 -16
- data/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c +1 -3
- data/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c +93 -0
- data/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h +323 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c +5 -5
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h +25 -11
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c +36 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h +90 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h +7 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c +6 -6
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h +29 -8
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c +2 -3
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h +16 -3
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c +46 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h +124 -0
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c +3 -3
- data/src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h +19 -0
- data/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c +7 -7
- data/src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h +46 -3
- data/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c +8 -8
- data/src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h +41 -8
- data/src/core/ext/upb-generated/envoy/type/v3/http.upb.h +1 -0
- data/src/core/ext/upb-generated/envoy/type/v3/percent.upb.c +3 -3
- data/src/core/ext/upb-generated/envoy/type/v3/percent.upb.h +15 -2
- data/src/core/ext/upb-generated/envoy/type/v3/range.upb.c +3 -3
- data/src/core/ext/upb-generated/envoy/type/v3/range.upb.h +19 -0
- data/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h +7 -0
- data/src/core/ext/upb-generated/google/api/annotations.upb.h +1 -0
- data/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.c +34 -34
- data/src/core/ext/upb-generated/google/api/expr/v1alpha1/checked.upb.h +149 -72
- data/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c +54 -37
- data/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h +171 -59
- data/src/core/ext/upb-generated/google/api/http.upb.c +3 -3
- data/src/core/ext/upb-generated/google/api/http.upb.h +25 -6
- data/src/core/ext/upb-generated/google/protobuf/any.upb.c +1 -1
- data/src/core/ext/upb-generated/google/protobuf/any.upb.h +7 -0
- data/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c +90 -90
- data/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h +455 -292
- data/src/core/ext/upb-generated/google/protobuf/duration.upb.c +1 -1
- data/src/core/ext/upb-generated/google/protobuf/duration.upb.h +7 -0
- data/src/core/ext/upb-generated/google/protobuf/empty.upb.c +1 -1
- data/src/core/ext/upb-generated/google/protobuf/empty.upb.h +7 -0
- data/src/core/ext/upb-generated/google/protobuf/struct.upb.c +4 -4
- data/src/core/ext/upb-generated/google/protobuf/struct.upb.h +22 -3
- data/src/core/ext/upb-generated/google/protobuf/timestamp.upb.c +1 -1
- data/src/core/ext/upb-generated/google/protobuf/timestamp.upb.h +7 -0
- data/src/core/ext/upb-generated/google/protobuf/wrappers.upb.c +9 -9
- data/src/core/ext/upb-generated/google/protobuf/wrappers.upb.h +55 -0
- data/src/core/ext/upb-generated/google/rpc/status.upb.c +1 -1
- data/src/core/ext/upb-generated/google/rpc/status.upb.h +10 -3
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c +4 -4
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h +11 -3
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c +41 -41
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h +149 -76
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c +5 -5
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h +21 -6
- data/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c +2 -2
- data/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h +13 -0
- data/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c +17 -17
- data/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h +82 -25
- data/src/core/ext/upb-generated/udpa/annotations/migrate.upb.c +3 -3
- data/src/core/ext/upb-generated/udpa/annotations/migrate.upb.h +19 -0
- data/src/core/ext/upb-generated/udpa/annotations/security.upb.c +1 -1
- data/src/core/ext/upb-generated/udpa/annotations/security.upb.h +7 -0
- data/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h +1 -0
- data/src/core/ext/upb-generated/udpa/annotations/status.upb.c +2 -2
- data/src/core/ext/upb-generated/udpa/annotations/status.upb.h +9 -2
- data/src/core/ext/upb-generated/udpa/annotations/versioning.upb.c +1 -1
- data/src/core/ext/upb-generated/udpa/annotations/versioning.upb.h +7 -0
- data/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c +3 -3
- data/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h +7 -0
- data/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.c +33 -0
- data/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.h +77 -0
- data/src/core/ext/upb-generated/validate/validate.upb.c +64 -64
- data/src/core/ext/upb-generated/validate/validate.upb.h +296 -157
- data/src/core/ext/upb-generated/{udpa/core/v1 → xds/core/v3}/authority.upb.c +6 -6
- data/src/core/ext/upb-generated/xds/core/v3/authority.upb.h +60 -0
- data/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c +52 -0
- data/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h +143 -0
- data/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c +42 -0
- data/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h +84 -0
- data/src/core/ext/upb-generated/xds/core/v3/resource.upb.c +36 -0
- data/src/core/ext/upb-generated/xds/core/v3/resource.upb.h +94 -0
- data/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c +54 -0
- data/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h +166 -0
- data/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c +36 -0
- data/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h +85 -0
- data/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c +354 -0
- data/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h +140 -0
- data/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c +168 -171
- data/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c +383 -0
- data/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h +115 -0
- data/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c +405 -420
- data/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h +2 -2
- data/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c +12 -9
- data/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c +177 -171
- data/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h +10 -0
- data/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c +88 -88
- data/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c +153 -153
- data/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c +10 -7
- data/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h +5 -0
- data/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c +4 -7
- data/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c +33 -20
- data/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c +56 -59
- data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c +116 -111
- data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c +129 -121
- data/src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c +21 -24
- data/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c +141 -0
- data/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h +70 -0
- data/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c +141 -0
- data/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h +70 -0
- data/src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c +17 -13
- data/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c +753 -724
- data/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h +10 -0
- data/src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c +22 -25
- data/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c +51 -0
- data/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h +35 -0
- data/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c +102 -0
- data/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h +55 -0
- data/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c +120 -0
- data/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h +45 -0
- data/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c +76 -0
- data/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h +35 -0
- data/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c +371 -377
- data/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c +12 -16
- data/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c +112 -108
- data/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c +45 -53
- data/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c +177 -180
- data/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c +92 -102
- data/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h +5 -0
- data/src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c +32 -42
- data/src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c +30 -40
- data/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c +4 -7
- data/src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c +38 -44
- data/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c +130 -0
- data/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h +50 -0
- data/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c +56 -0
- data/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h +35 -0
- data/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c +30 -33
- data/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c +63 -0
- data/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h +40 -0
- data/src/core/ext/upbdefs-generated/google/protobuf/any.upbdefs.c +8 -7
- data/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c +9 -9
- data/src/core/ext/upbdefs-generated/google/protobuf/duration.upbdefs.c +9 -8
- data/src/core/ext/upbdefs-generated/google/protobuf/empty.upbdefs.c +8 -8
- data/src/core/ext/upbdefs-generated/google/protobuf/struct.upbdefs.c +8 -8
- data/src/core/ext/upbdefs-generated/google/protobuf/timestamp.upbdefs.c +9 -8
- data/src/core/ext/upbdefs-generated/google/protobuf/wrappers.upbdefs.c +8 -8
- data/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.c +44 -0
- data/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.h +35 -0
- data/src/core/ext/upbdefs-generated/validate/validate.upbdefs.c +14 -11
- data/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c +42 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h +35 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c +62 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h +40 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c +45 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h +40 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c +49 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h +35 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c +67 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h +40 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c +50 -0
- data/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h +35 -0
- data/src/core/ext/xds/certificate_provider_store.cc +10 -7
- data/src/core/ext/xds/certificate_provider_store.h +12 -7
- data/src/core/ext/xds/file_watcher_certificate_provider_factory.cc +25 -0
- data/src/core/ext/xds/file_watcher_certificate_provider_factory.h +1 -4
- data/src/core/ext/xds/xds_api.cc +2265 -593
- data/src/core/ext/xds/xds_api.h +335 -102
- data/src/core/ext/xds/xds_bootstrap.cc +80 -45
- data/src/core/ext/xds/xds_bootstrap.h +17 -6
- data/src/core/ext/xds/xds_certificate_provider.cc +232 -67
- data/src/core/ext/xds/xds_certificate_provider.h +103 -26
- data/src/core/ext/xds/xds_client.cc +212 -63
- data/src/core/ext/xds/xds_client.h +35 -1
- data/src/core/ext/xds/xds_client_stats.cc +4 -3
- data/src/core/ext/xds/xds_client_stats.h +2 -2
- data/src/core/ext/xds/xds_http_fault_filter.cc +226 -0
- data/src/core/ext/xds/xds_http_fault_filter.h +63 -0
- data/src/core/ext/xds/xds_http_filters.cc +114 -0
- data/src/core/ext/xds/xds_http_filters.h +130 -0
- data/src/core/ext/xds/xds_server_config_fetcher.cc +532 -0
- data/src/core/lib/channel/channel_args.cc +8 -8
- data/src/core/lib/channel/channel_stack.cc +12 -0
- data/src/core/lib/channel/channel_stack.h +7 -0
- data/src/core/lib/channel/channel_trace.h +1 -1
- data/src/core/lib/channel/channelz.cc +105 -18
- data/src/core/lib/channel/channelz.h +30 -2
- data/src/core/lib/channel/channelz_registry.cc +14 -0
- data/src/core/lib/channel/channelz_registry.h +0 -1
- data/src/core/lib/channel/handshaker.cc +4 -46
- data/src/core/lib/channel/handshaker.h +1 -18
- data/src/core/lib/channel/status_util.cc +12 -2
- data/src/core/lib/channel/status_util.h +5 -0
- data/src/core/lib/compression/compression_args.cc +3 -2
- data/src/core/lib/debug/stats.h +2 -2
- data/src/core/lib/debug/stats_data.h +13 -13
- data/src/core/lib/gpr/alloc.cc +3 -2
- data/src/core/lib/gpr/log.cc +59 -17
- data/src/core/lib/gpr/log_linux.cc +3 -1
- data/src/core/lib/gpr/log_posix.cc +3 -1
- data/src/core/lib/gpr/log_windows.cc +3 -1
- data/src/core/lib/gpr/spinlock.h +10 -2
- data/src/core/lib/gpr/string.cc +22 -21
- data/src/core/lib/gpr/string.h +5 -6
- data/src/core/lib/gpr/sync.cc +4 -4
- data/src/core/lib/gpr/sync_abseil.cc +3 -6
- data/src/core/lib/gpr/sync_windows.cc +2 -2
- data/src/core/lib/gpr/time.cc +12 -12
- data/src/core/lib/gprpp/arena.h +3 -2
- data/src/core/lib/gprpp/atomic.h +3 -3
- data/src/core/lib/gprpp/dual_ref_counted.h +3 -3
- data/src/core/lib/gprpp/mpscq.cc +2 -2
- data/src/core/lib/gprpp/ref_counted.h +2 -2
- data/src/core/lib/gprpp/ref_counted_ptr.h +11 -1
- data/src/core/lib/gprpp/sync.h +129 -40
- data/src/core/lib/gprpp/thd.h +1 -1
- data/src/core/lib/gprpp/thd_posix.cc +6 -1
- data/src/core/lib/gprpp/thd_windows.cc +3 -1
- data/src/core/lib/gprpp/time_util.cc +77 -0
- data/src/core/lib/gprpp/time_util.h +42 -0
- data/src/core/lib/http/httpcli.cc +1 -1
- data/src/core/lib/http/httpcli.h +2 -3
- data/src/core/lib/http/httpcli_security_connector.cc +3 -3
- data/src/core/lib/http/parser.cc +1 -2
- data/src/core/lib/iomgr/buffer_list.h +1 -1
- data/src/core/lib/iomgr/call_combiner.cc +8 -5
- data/src/core/lib/iomgr/cfstream_handle.cc +2 -2
- data/src/core/lib/iomgr/combiner.cc +2 -1
- data/src/core/lib/iomgr/endpoint.h +1 -1
- data/src/core/lib/iomgr/error.cc +15 -11
- data/src/core/lib/iomgr/error.h +1 -1
- data/src/core/lib/iomgr/error_internal.h +1 -1
- data/src/core/lib/iomgr/ev_apple.cc +11 -8
- data/src/core/lib/iomgr/ev_epoll1_linux.cc +23 -16
- data/src/core/lib/iomgr/ev_epollex_linux.cc +21 -17
- data/src/core/lib/iomgr/ev_poll_posix.cc +9 -7
- data/src/core/lib/iomgr/ev_posix.cc +3 -3
- data/src/core/lib/iomgr/exec_ctx.cc +6 -2
- data/src/core/lib/iomgr/exec_ctx.h +6 -4
- data/src/core/lib/iomgr/executor.cc +2 -1
- data/src/core/lib/iomgr/executor.h +1 -1
- data/src/core/lib/iomgr/executor/threadpool.h +1 -1
- data/src/core/lib/iomgr/iomgr.cc +1 -1
- data/src/core/lib/iomgr/iomgr_posix.cc +0 -1
- data/src/core/lib/iomgr/iomgr_posix_cfstream.cc +0 -1
- data/src/core/lib/iomgr/load_file.h +1 -1
- data/src/core/lib/iomgr/lockfree_event.cc +19 -14
- data/src/core/lib/iomgr/lockfree_event.h +2 -2
- data/src/core/lib/iomgr/parse_address.cc +52 -46
- data/src/core/lib/iomgr/parse_address.h +13 -9
- data/src/core/lib/iomgr/poller/eventmanager_libuv.h +1 -1
- data/src/core/lib/iomgr/pollset_set_custom.cc +1 -1
- data/src/core/lib/iomgr/python_util.h +1 -1
- data/src/core/lib/iomgr/resolve_address.cc +4 -4
- data/src/core/lib/iomgr/resource_quota.cc +5 -5
- data/src/core/lib/iomgr/sockaddr_utils.cc +131 -11
- data/src/core/lib/iomgr/sockaddr_utils.h +26 -1
- data/src/core/lib/iomgr/socket_factory_posix.cc +3 -2
- data/src/core/lib/iomgr/socket_mutator.cc +3 -2
- data/src/core/lib/iomgr/socket_utils_common_posix.cc +1 -0
- data/src/core/lib/iomgr/tcp_client.cc +3 -3
- data/src/core/lib/iomgr/tcp_client_custom.cc +7 -6
- data/src/core/lib/iomgr/tcp_client_posix.cc +1 -1
- data/src/core/lib/iomgr/tcp_custom.cc +22 -17
- data/src/core/lib/iomgr/tcp_posix.cc +14 -14
- data/src/core/lib/iomgr/tcp_server_custom.cc +28 -22
- data/src/core/lib/iomgr/tcp_uv.cc +2 -2
- data/src/core/lib/iomgr/timer_custom.cc +3 -3
- data/src/core/lib/iomgr/timer_generic.cc +5 -5
- data/src/core/lib/iomgr/timer_manager.cc +3 -3
- data/src/core/lib/iomgr/udp_server.cc +1 -2
- data/src/core/lib/iomgr/udp_server.h +1 -2
- data/src/core/lib/iomgr/unix_sockets_posix.cc +17 -18
- data/src/core/lib/iomgr/wakeup_fd_nospecial.cc +1 -1
- data/src/core/lib/json/json.h +10 -0
- data/src/core/lib/matchers/matchers.cc +339 -0
- data/src/core/lib/matchers/matchers.h +160 -0
- data/src/core/lib/security/context/security_context.cc +4 -3
- data/src/core/lib/security/credentials/alts/alts_credentials.cc +2 -1
- data/src/core/lib/security/credentials/alts/alts_credentials.h +1 -1
- data/src/core/lib/security/credentials/alts/check_gcp_environment.cc +1 -1
- data/src/core/lib/security/credentials/credentials.cc +6 -6
- data/src/core/lib/security/credentials/credentials.h +2 -1
- data/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +413 -0
- data/src/core/lib/security/credentials/external/aws_external_account_credentials.h +80 -0
- data/src/core/lib/security/credentials/external/aws_request_signer.cc +15 -10
- data/src/core/lib/security/credentials/external/aws_request_signer.h +1 -2
- data/src/core/lib/security/credentials/external/external_account_credentials.cc +217 -31
- data/src/core/lib/security/credentials/external/external_account_credentials.h +7 -5
- data/src/core/lib/security/credentials/external/file_external_account_credentials.cc +5 -6
- data/src/core/lib/security/credentials/external/file_external_account_credentials.h +3 -4
- data/src/core/lib/security/credentials/external/url_external_account_credentials.cc +20 -18
- data/src/core/lib/security/credentials/external/url_external_account_credentials.h +5 -6
- data/src/core/lib/security/credentials/fake/fake_credentials.cc +3 -2
- data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +25 -18
- data/src/core/lib/security/credentials/insecure/insecure_credentials.cc +18 -5
- data/src/core/lib/security/credentials/jwt/json_token.cc +1 -4
- data/src/core/lib/security/credentials/jwt/jwt_verifier.cc +3 -6
- data/src/core/lib/security/credentials/local/local_credentials.cc +2 -1
- data/src/core/lib/security/credentials/local/local_credentials.h +1 -1
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +37 -44
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +5 -4
- data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +1 -1
- data/src/core/lib/security/credentials/ssl/ssl_credentials.cc +7 -6
- data/src/core/lib/security/credentials/ssl/ssl_credentials.h +2 -2
- data/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc +1 -6
- data/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h +1 -6
- data/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +326 -5
- data/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +64 -0
- data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +1 -1
- data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h +0 -1
- data/src/core/lib/security/credentials/tls/tls_credentials.cc +3 -2
- data/src/core/lib/security/credentials/tls/tls_credentials.h +1 -1
- data/src/core/lib/security/credentials/tls/tls_utils.cc +91 -0
- data/src/core/lib/security/credentials/tls/tls_utils.h +38 -0
- data/src/core/lib/security/credentials/xds/xds_credentials.cc +209 -10
- data/src/core/lib/security/credentials/xds/xds_credentials.h +27 -9
- data/src/core/lib/security/security_connector/alts/alts_security_connector.cc +1 -1
- data/src/core/lib/security/security_connector/fake/fake_security_connector.cc +1 -1
- data/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc +50 -17
- data/src/core/lib/security/security_connector/insecure/insecure_security_connector.h +23 -6
- data/src/core/lib/security/security_connector/local/local_security_connector.cc +1 -1
- data/src/core/lib/security/security_connector/security_connector.cc +3 -2
- data/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +4 -4
- data/src/core/lib/security/security_connector/ssl_utils.cc +11 -6
- data/src/core/lib/security/security_connector/ssl_utils.h +12 -19
- data/src/core/lib/security/security_connector/tls/tls_security_connector.cc +89 -26
- data/src/core/lib/security/security_connector/tls/tls_security_connector.h +2 -3
- data/src/core/lib/security/transport/secure_endpoint.cc +2 -2
- data/src/core/lib/security/transport/security_handshaker.cc +35 -7
- data/src/core/lib/slice/slice_intern.cc +9 -11
- data/src/core/lib/slice/slice_internal.h +2 -2
- data/src/core/lib/surface/call.cc +32 -24
- data/src/core/lib/surface/call_details.cc +8 -8
- data/src/core/lib/surface/channel.cc +16 -10
- data/src/core/lib/surface/channel.h +6 -5
- data/src/core/lib/surface/channel_init.cc +1 -1
- data/src/core/lib/surface/completion_queue.cc +24 -19
- data/src/core/lib/surface/completion_queue.h +16 -16
- data/src/core/lib/surface/init.cc +19 -20
- data/src/core/lib/surface/lame_client.cc +47 -54
- data/src/core/lib/surface/lame_client.h +5 -0
- data/src/core/lib/surface/server.cc +102 -51
- data/src/core/lib/surface/server.h +112 -18
- data/src/core/lib/surface/version.cc +2 -2
- data/src/core/lib/transport/authority_override.cc +6 -4
- data/src/core/lib/transport/authority_override.h +5 -2
- data/src/core/lib/transport/connectivity_state.h +6 -4
- data/src/core/lib/transport/error_utils.h +1 -1
- data/src/core/lib/transport/metadata.cc +6 -2
- data/src/core/lib/transport/metadata_batch.cc +27 -0
- data/src/core/lib/transport/metadata_batch.h +18 -4
- data/src/core/lib/transport/static_metadata.cc +1 -1
- data/src/core/lib/transport/status_metadata.cc +4 -3
- data/src/core/lib/transport/transport.h +7 -7
- data/src/core/lib/uri/uri_parser.cc +131 -249
- data/src/core/lib/uri/uri_parser.h +57 -21
- data/src/core/plugin_registry/grpc_plugin_registry.cc +22 -4
- data/src/core/tsi/alts/crypt/gsec.cc +5 -4
- data/src/core/tsi/alts/frame_protector/frame_handler.cc +8 -6
- data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +19 -25
- data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +39 -44
- data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h +1 -1
- data/src/core/tsi/alts/handshaker/transport_security_common_api.cc +1 -3
- data/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc +8 -6
- data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc +4 -4
- data/src/core/tsi/fake_transport_security.cc +16 -5
- data/src/core/tsi/ssl/session_cache/ssl_session.h +0 -3
- data/src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc +1 -1
- data/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +0 -2
- data/src/core/tsi/ssl/session_cache/ssl_session_cache.h +2 -4
- data/src/core/tsi/ssl_transport_security.cc +62 -52
- data/src/core/tsi/ssl_transport_security.h +6 -9
- data/src/core/tsi/transport_security.cc +6 -6
- data/src/core/tsi/transport_security_interface.h +1 -1
- data/src/ruby/ext/grpc/extconf.rb +9 -1
- data/src/ruby/ext/grpc/rb_channel.c +10 -1
- data/src/ruby/ext/grpc/rb_channel_credentials.c +11 -1
- data/src/ruby/ext/grpc/rb_channel_credentials.h +4 -0
- data/src/ruby/ext/grpc/rb_compression_options.c +1 -1
- data/src/ruby/ext/grpc/rb_enable_cpp.cc +1 -1
- data/src/ruby/ext/grpc/rb_event_thread.c +2 -0
- data/src/ruby/ext/grpc/rb_grpc.c +4 -0
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +14 -0
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +34 -13
- data/src/ruby/ext/grpc/rb_server.c +13 -1
- data/src/ruby/ext/grpc/rb_server_credentials.c +19 -3
- data/src/ruby/ext/grpc/rb_server_credentials.h +4 -0
- data/src/ruby/ext/grpc/rb_xds_channel_credentials.c +215 -0
- data/src/ruby/ext/grpc/rb_xds_channel_credentials.h +35 -0
- data/src/ruby/ext/grpc/rb_xds_server_credentials.c +169 -0
- data/src/ruby/ext/grpc/rb_xds_server_credentials.h +35 -0
- data/src/ruby/lib/grpc/generic/client_stub.rb +4 -2
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb +35 -0
- data/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb +18 -0
- data/src/ruby/spec/call_spec.rb +1 -1
- data/src/ruby/spec/channel_credentials_spec.rb +32 -0
- data/src/ruby/spec/channel_spec.rb +17 -6
- data/src/ruby/spec/client_auth_spec.rb +27 -1
- data/src/ruby/spec/errors_spec.rb +1 -1
- data/src/ruby/spec/generic/active_call_spec.rb +2 -2
- data/src/ruby/spec/generic/client_stub_spec.rb +4 -4
- data/src/ruby/spec/generic/rpc_server_spec.rb +1 -1
- data/src/ruby/spec/pb/codegen/package_option_spec.rb +2 -6
- data/src/ruby/spec/server_credentials_spec.rb +25 -0
- data/src/ruby/spec/server_spec.rb +22 -0
- data/third_party/abseil-cpp/absl/container/flat_hash_map.h +606 -0
- data/third_party/abseil-cpp/absl/container/internal/raw_hash_map.h +197 -0
- data/third_party/abseil-cpp/absl/status/internal/statusor_internal.h +399 -0
- data/third_party/abseil-cpp/absl/status/statusor.cc +71 -0
- data/third_party/abseil-cpp/absl/status/statusor.h +760 -0
- data/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc +1 -0
- data/third_party/boringssl-with-bazel/err_data.c +715 -713
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_enum.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_int.c +5 -5
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_object.c +3 -10
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_octet.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_type.c +4 -2
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_utctm.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/asn1/asn1_lib.c +15 -14
- data/third_party/boringssl-with-bazel/src/crypto/asn1/asn1_locl.h +30 -0
- data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_dec.c +28 -79
- data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_enc.c +39 -85
- data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_fre.c +5 -16
- data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_new.c +10 -61
- data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_typ.c +0 -2
- data/third_party/boringssl-with-bazel/src/crypto/asn1/tasn_utl.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/bio/socket_helper.c +4 -0
- data/third_party/boringssl-with-bazel/src/crypto/blake2/blake2.c +158 -0
- data/third_party/boringssl-with-bazel/src/crypto/bn_extra/bn_asn1.c +3 -10
- data/third_party/boringssl-with-bazel/src/crypto/bytestring/ber.c +8 -9
- data/third_party/boringssl-with-bazel/src/crypto/bytestring/cbs.c +60 -45
- data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_chacha20poly1305.c +6 -81
- data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/internal.h +87 -0
- data/third_party/boringssl-with-bazel/src/crypto/cpu-aarch64-win.c +41 -0
- data/third_party/boringssl-with-bazel/src/crypto/cpu-arm-linux.c +11 -2
- data/third_party/boringssl-with-bazel/src/crypto/cpu-arm.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/{dh → dh_extra}/dh_asn1.c +0 -0
- data/third_party/boringssl-with-bazel/src/crypto/{dh → dh_extra}/params.c +179 -0
- data/third_party/boringssl-with-bazel/src/crypto/digest_extra/digest_extra.c +25 -0
- data/third_party/boringssl-with-bazel/src/crypto/ec_extra/ec_asn1.c +2 -17
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bcm.c +3 -1
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/bn.c +13 -20
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/div.c +2 -3
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/internal.h +9 -1
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/cipher/cipher.c +21 -13
- data/third_party/boringssl-with-bazel/src/crypto/{dh → fipsmodule/dh}/check.c +0 -0
- data/third_party/boringssl-with-bazel/src/crypto/{dh → fipsmodule/dh}/dh.c +136 -213
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec.c +12 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/ec_key.c +9 -1
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/internal.h +28 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/rand.c +135 -43
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rand/urandom.c +0 -7
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/rsa/rsa_impl.c +51 -32
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/self_check/self_check.c +147 -0
- data/third_party/boringssl-with-bazel/src/crypto/hpke/hpke.c +18 -29
- data/third_party/boringssl-with-bazel/src/crypto/hpke/internal.h +13 -4
- data/third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305.c +10 -7
- data/third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_arm.c +13 -11
- data/third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_vec.c +4 -0
- data/third_party/boringssl-with-bazel/src/crypto/rand_extra/passive.c +34 -0
- data/third_party/boringssl-with-bazel/src/crypto/rand_extra/rand_extra.c +4 -0
- data/third_party/boringssl-with-bazel/src/crypto/stack/stack.c +7 -13
- data/third_party/boringssl-with-bazel/src/crypto/x509/rsa_pss.c +5 -1
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c +1 -29
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_ext.c +10 -7
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_r2x.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_set.c +8 -8
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_v3.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509cset.c +29 -23
- data/third_party/boringssl-with-bazel/src/crypto/x509/x_attrib.c +22 -17
- data/third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c +1 -2
- data/third_party/boringssl-with-bazel/src/crypto/x509/x_pkey.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c +39 -4
- data/third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_akey.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_alt.c +11 -10
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_bitst.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_conf.c +25 -25
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_cpols.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_enum.c +2 -1
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_genn.c +40 -20
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ia5.c +3 -4
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_lib.c +25 -36
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_prn.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_skey.c +6 -6
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_utl.c +6 -6
- data/third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h +3 -3
- data/third_party/boringssl-with-bazel/src/include/openssl/asn1.h +652 -545
- data/third_party/boringssl-with-bazel/src/include/openssl/asn1t.h +0 -167
- data/third_party/boringssl-with-bazel/src/include/openssl/base.h +10 -5
- data/third_party/boringssl-with-bazel/src/include/openssl/blake2.h +62 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/bytestring.h +22 -7
- data/third_party/boringssl-with-bazel/src/include/openssl/cipher.h +19 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/cpu.h +22 -32
- data/third_party/boringssl-with-bazel/src/include/openssl/dh.h +56 -26
- data/third_party/boringssl-with-bazel/src/include/openssl/digest.h +1 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/ec.h +15 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/evp.h +12 -2
- data/third_party/boringssl-with-bazel/src/include/openssl/rand.h +3 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/span.h +2 -1
- data/third_party/boringssl-with-bazel/src/include/openssl/ssl.h +67 -33
- data/third_party/boringssl-with-bazel/src/include/openssl/tls1.h +27 -8
- data/third_party/boringssl-with-bazel/src/include/openssl/x509.h +287 -99
- data/third_party/boringssl-with-bazel/src/include/openssl/x509v3.h +139 -36
- data/third_party/boringssl-with-bazel/src/ssl/handshake.cc +4 -3
- data/third_party/boringssl-with-bazel/src/ssl/handshake_client.cc +11 -20
- data/third_party/boringssl-with-bazel/src/ssl/handshake_server.cc +10 -5
- data/third_party/boringssl-with-bazel/src/ssl/internal.h +37 -16
- data/third_party/boringssl-with-bazel/src/ssl/s3_lib.cc +0 -1
- data/third_party/boringssl-with-bazel/src/ssl/ssl_asn1.cc +7 -8
- data/third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc +20 -14
- data/third_party/boringssl-with-bazel/src/ssl/ssl_session.cc +7 -8
- data/third_party/boringssl-with-bazel/src/ssl/ssl_transcript.cc +2 -2
- data/third_party/boringssl-with-bazel/src/ssl/t1_enc.cc +5 -7
- data/third_party/boringssl-with-bazel/src/ssl/t1_lib.cc +362 -50
- data/third_party/boringssl-with-bazel/src/ssl/tls13_client.cc +2 -2
- data/third_party/boringssl-with-bazel/src/ssl/tls13_enc.cc +48 -15
- data/third_party/boringssl-with-bazel/src/ssl/tls13_server.cc +66 -24
- data/third_party/upb/third_party/wyhash/wyhash.h +145 -0
- data/third_party/upb/upb/decode.c +248 -167
- data/third_party/upb/upb/decode.h +20 -1
- data/third_party/upb/upb/decode.int.h +163 -0
- data/third_party/upb/upb/decode_fast.c +1040 -0
- data/third_party/upb/upb/decode_fast.h +126 -0
- data/third_party/upb/upb/def.c +525 -516
- data/third_party/upb/upb/def.h +16 -31
- data/third_party/upb/upb/def.hpp +37 -123
- data/third_party/upb/upb/encode.c +227 -169
- data/third_party/upb/upb/encode.h +27 -2
- data/third_party/upb/upb/msg.c +167 -88
- data/third_party/upb/upb/msg.h +174 -34
- data/third_party/upb/upb/port_def.inc +74 -61
- data/third_party/upb/upb/port_undef.inc +3 -7
- data/third_party/upb/upb/reflection.c +36 -19
- data/third_party/upb/upb/table.c +34 -197
- data/third_party/upb/upb/table.int.h +14 -5
- data/third_party/upb/upb/text_encode.c +45 -22
- data/third_party/upb/upb/text_encode.h +4 -1
- data/third_party/upb/upb/upb.c +18 -41
- data/third_party/upb/upb/upb.h +36 -7
- data/third_party/upb/upb/upb.hpp +4 -4
- data/third_party/upb/upb/upb.int.h +29 -0
- data/third_party/xxhash/xxhash.h +5443 -0
- metadata +152 -82
- data/src/core/ext/filters/client_channel/lb_policy/xds/eds.cc +0 -909
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc +0 -485
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +0 -68
- data/src/core/ext/filters/client_channel/resolving_lb_policy.cc +0 -355
- data/src/core/ext/filters/client_channel/resolving_lb_policy.h +0 -138
- data/src/core/ext/upb-generated/udpa/core/v1/authority.upb.h +0 -53
- data/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c +0 -52
- data/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h +0 -129
- data/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c +0 -42
- data/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h +0 -77
- data/src/core/ext/upb-generated/udpa/core/v1/resource.upb.c +0 -36
- data/src/core/ext/upb-generated/udpa/core/v1/resource.upb.h +0 -85
- data/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c +0 -54
- data/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h +0 -160
- data/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c +0 -36
- data/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h +0 -84
- data/src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c +0 -42
- data/src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h +0 -35
- data/src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c +0 -62
- data/src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h +0 -40
- data/src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c +0 -45
- data/src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h +0 -40
- data/src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c +0 -49
- data/src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h +0 -35
- data/src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c +0 -68
- data/src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h +0 -40
- data/src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c +0 -51
- data/src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h +0 -35
- data/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc +0 -265
- data/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h +0 -104
- data/src/core/lib/gprpp/map.h +0 -53
- data/src/core/lib/iomgr/iomgr_posix.h +0 -26
- data/src/core/lib/security/authorization/authorization_engine.cc +0 -177
- data/src/core/lib/security/authorization/authorization_engine.h +0 -84
- data/src/core/lib/security/authorization/evaluate_args.cc +0 -153
- data/src/core/lib/security/authorization/evaluate_args.h +0 -59
- data/src/core/lib/security/authorization/mock_cel/activation.h +0 -57
- data/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h +0 -44
- data/src/core/lib/security/authorization/mock_cel/cel_expression.h +0 -69
- data/src/core/lib/security/authorization/mock_cel/cel_value.h +0 -97
- data/src/core/lib/security/authorization/mock_cel/evaluator_core.h +0 -67
- data/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h +0 -57
- data/third_party/abseil-cpp/absl/container/flat_hash_set.h +0 -504
- data/third_party/upb/upb/port.c +0 -26
@@ -48,8 +48,8 @@ bool XdsChannelCredsRegistry::IsSupported(const std::string& creds_type) {
|
|
48
48
|
creds_type == "fake";
|
49
49
|
}
|
50
50
|
|
51
|
-
bool XdsChannelCredsRegistry::IsValidConfig(const std::string& creds_type
|
52
|
-
const Json& config) {
|
51
|
+
bool XdsChannelCredsRegistry::IsValidConfig(const std::string& /*creds_type*/,
|
52
|
+
const Json& /*config*/) {
|
53
53
|
// Currently, none of the creds types actually take a config, but we
|
54
54
|
// ignore whatever might be specified in the bootstrap file for
|
55
55
|
// forward compatibility reasons.
|
@@ -58,7 +58,7 @@ bool XdsChannelCredsRegistry::IsValidConfig(const std::string& creds_type,
|
|
58
58
|
|
59
59
|
RefCountedPtr<grpc_channel_credentials>
|
60
60
|
XdsChannelCredsRegistry::MakeChannelCreds(const std::string& creds_type,
|
61
|
-
const Json& config) {
|
61
|
+
const Json& /*config*/) {
|
62
62
|
if (creds_type == "google_default") {
|
63
63
|
return grpc_google_default_credentials_create(nullptr);
|
64
64
|
} else if (creds_type == "insecure") {
|
@@ -93,13 +93,14 @@ std::string BootstrapString(const XdsBootstrap& bootstrap) {
|
|
93
93
|
" locality={\n"
|
94
94
|
" region=\"%s\",\n"
|
95
95
|
" zone=\"%s\",\n"
|
96
|
-
"
|
96
|
+
" sub_zone=\"%s\"\n"
|
97
97
|
" },\n"
|
98
98
|
" metadata=%s,\n"
|
99
99
|
"},\n",
|
100
100
|
bootstrap.node()->id, bootstrap.node()->cluster,
|
101
101
|
bootstrap.node()->locality_region, bootstrap.node()->locality_zone,
|
102
|
-
bootstrap.node()->
|
102
|
+
bootstrap.node()->locality_sub_zone,
|
103
|
+
bootstrap.node()->metadata.Dump()));
|
103
104
|
}
|
104
105
|
parts.push_back(absl::StrFormat(
|
105
106
|
"servers=[\n"
|
@@ -118,6 +119,11 @@ std::string BootstrapString(const XdsBootstrap& bootstrap) {
|
|
118
119
|
absl::StrJoin(bootstrap.server().server_features, ", "), "],\n"));
|
119
120
|
}
|
120
121
|
parts.push_back(" }\n],\n");
|
122
|
+
if (!bootstrap.server_listener_resource_name_template().empty()) {
|
123
|
+
parts.push_back(
|
124
|
+
absl::StrFormat("server_listener_resource_name_template=\"%s\",\n",
|
125
|
+
bootstrap.server_listener_resource_name_template()));
|
126
|
+
}
|
121
127
|
parts.push_back("certificate_providers={\n");
|
122
128
|
for (const auto& entry : bootstrap.certificate_providers()) {
|
123
129
|
parts.push_back(
|
@@ -132,36 +138,14 @@ std::string BootstrapString(const XdsBootstrap& bootstrap) {
|
|
132
138
|
return absl::StrJoin(parts, "");
|
133
139
|
}
|
134
140
|
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
grpc_error** error) {
|
140
|
-
grpc_core::UniquePtr<char> path(gpr_getenv("GRPC_XDS_BOOTSTRAP"));
|
141
|
-
if (path == nullptr) {
|
142
|
-
*error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
|
143
|
-
"Environment variable GRPC_XDS_BOOTSTRAP not defined");
|
144
|
-
return nullptr;
|
145
|
-
}
|
146
|
-
if (GRPC_TRACE_FLAG_ENABLED(*tracer)) {
|
147
|
-
gpr_log(GPR_INFO,
|
148
|
-
"[xds_client %p] Got bootstrap file location from "
|
149
|
-
"GRPC_XDS_BOOTSTRAP environment variable: %s",
|
150
|
-
client, path.get());
|
151
|
-
}
|
152
|
-
grpc_slice contents;
|
153
|
-
*error = grpc_load_file(path.get(), /*add_null_terminator=*/true, &contents);
|
154
|
-
if (*error != GRPC_ERROR_NONE) return nullptr;
|
155
|
-
absl::string_view contents_str_view = StringViewFromSlice(contents);
|
156
|
-
if (GRPC_TRACE_FLAG_ENABLED(*tracer)) {
|
157
|
-
gpr_log(GPR_DEBUG, "[xds_client %p] Bootstrap file contents: %s", client,
|
158
|
-
std::string(contents_str_view).c_str());
|
159
|
-
}
|
160
|
-
Json json = Json::Parse(contents_str_view, error);
|
161
|
-
grpc_slice_unref_internal(contents);
|
141
|
+
std::unique_ptr<XdsBootstrap> ParseJsonAndCreate(
|
142
|
+
XdsClient* client, TraceFlag* tracer, absl::string_view json_string,
|
143
|
+
absl::string_view bootstrap_source, grpc_error** error) {
|
144
|
+
Json json = Json::Parse(json_string, error);
|
162
145
|
if (*error != GRPC_ERROR_NONE) {
|
163
146
|
grpc_error* error_out = GRPC_ERROR_CREATE_REFERENCING_FROM_COPIED_STRING(
|
164
|
-
absl::StrCat("Failed to parse bootstrap
|
147
|
+
absl::StrCat("Failed to parse bootstrap from ", bootstrap_source)
|
148
|
+
.c_str(),
|
165
149
|
error, 1);
|
166
150
|
GRPC_ERROR_UNREF(*error);
|
167
151
|
*error = error_out;
|
@@ -177,6 +161,55 @@ std::unique_ptr<XdsBootstrap> XdsBootstrap::ReadFromFile(XdsClient* client,
|
|
177
161
|
return result;
|
178
162
|
}
|
179
163
|
|
164
|
+
} // namespace
|
165
|
+
|
166
|
+
std::unique_ptr<XdsBootstrap> XdsBootstrap::Create(XdsClient* client,
|
167
|
+
TraceFlag* tracer,
|
168
|
+
const char* fallback_config,
|
169
|
+
grpc_error** error) {
|
170
|
+
// First, try GRPC_XDS_BOOTSTRAP env var.
|
171
|
+
grpc_core::UniquePtr<char> path(gpr_getenv("GRPC_XDS_BOOTSTRAP"));
|
172
|
+
if (path != nullptr) {
|
173
|
+
if (GRPC_TRACE_FLAG_ENABLED(*tracer)) {
|
174
|
+
gpr_log(GPR_INFO,
|
175
|
+
"[xds_client %p] Got bootstrap file location from "
|
176
|
+
"GRPC_XDS_BOOTSTRAP environment variable: %s",
|
177
|
+
client, path.get());
|
178
|
+
}
|
179
|
+
grpc_slice contents;
|
180
|
+
*error =
|
181
|
+
grpc_load_file(path.get(), /*add_null_terminator=*/true, &contents);
|
182
|
+
if (*error != GRPC_ERROR_NONE) return nullptr;
|
183
|
+
absl::string_view contents_str_view = StringViewFromSlice(contents);
|
184
|
+
if (GRPC_TRACE_FLAG_ENABLED(*tracer)) {
|
185
|
+
gpr_log(GPR_DEBUG, "[xds_client %p] Bootstrap file contents: %s", client,
|
186
|
+
std::string(contents_str_view).c_str());
|
187
|
+
}
|
188
|
+
std::string bootstrap_source = absl::StrCat("file ", path.get());
|
189
|
+
auto result = ParseJsonAndCreate(client, tracer, contents_str_view,
|
190
|
+
bootstrap_source, error);
|
191
|
+
grpc_slice_unref_internal(contents);
|
192
|
+
return result;
|
193
|
+
}
|
194
|
+
// Next, try GRPC_XDS_BOOTSTRAP_CONFIG env var.
|
195
|
+
grpc_core::UniquePtr<char> env_config(
|
196
|
+
gpr_getenv("GRPC_XDS_BOOTSTRAP_CONFIG"));
|
197
|
+
if (env_config != nullptr) {
|
198
|
+
return ParseJsonAndCreate(client, tracer, env_config.get(),
|
199
|
+
"GRPC_XDS_BOOTSTRAP_CONFIG env var", error);
|
200
|
+
}
|
201
|
+
// Finally, try fallback config.
|
202
|
+
if (fallback_config != nullptr) {
|
203
|
+
return ParseJsonAndCreate(client, tracer, fallback_config,
|
204
|
+
"fallback config", error);
|
205
|
+
}
|
206
|
+
// No bootstrap config found.
|
207
|
+
*error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
|
208
|
+
"Environment variables GRPC_XDS_BOOTSTRAP or GRPC_XDS_BOOTSTRAP_CONFIG "
|
209
|
+
"not defined");
|
210
|
+
return nullptr;
|
211
|
+
}
|
212
|
+
|
180
213
|
XdsBootstrap::XdsBootstrap(Json json, grpc_error** error) {
|
181
214
|
if (json.type() != Json::Type::OBJECT) {
|
182
215
|
*error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
|
@@ -205,6 +238,16 @@ XdsBootstrap::XdsBootstrap(Json json, grpc_error** error) {
|
|
205
238
|
if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error);
|
206
239
|
}
|
207
240
|
}
|
241
|
+
it = json.mutable_object()->find("server_listener_resource_name_template");
|
242
|
+
if (it != json.mutable_object()->end()) {
|
243
|
+
if (it->second.type() != Json::Type::STRING) {
|
244
|
+
error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
|
245
|
+
"\"server_listener_resource_name_template\" field is not a string"));
|
246
|
+
} else {
|
247
|
+
server_listener_resource_name_template_ =
|
248
|
+
std::move(*it->second.mutable_string_value());
|
249
|
+
}
|
250
|
+
}
|
208
251
|
if (XdsSecurityEnabled()) {
|
209
252
|
it = json.mutable_object()->find("certificate_providers");
|
210
253
|
if (it != json.mutable_object()->end()) {
|
@@ -357,15 +400,7 @@ grpc_error* XdsBootstrap::ParseServerFeaturesArray(Json* json,
|
|
357
400
|
Json& child = json->mutable_array()->at(i);
|
358
401
|
if (child.type() == Json::Type::STRING &&
|
359
402
|
child.string_value() == "xds_v3") {
|
360
|
-
|
361
|
-
// are sure that the v3 code actually works.
|
362
|
-
grpc_core::UniquePtr<char> enable_str(
|
363
|
-
gpr_getenv("GRPC_XDS_EXPERIMENTAL_V3_SUPPORT"));
|
364
|
-
bool enabled = false;
|
365
|
-
if (gpr_parse_bool_value(enable_str.get(), &enabled) && enabled) {
|
366
|
-
server->server_features.insert(
|
367
|
-
std::move(*child.mutable_string_value()));
|
368
|
-
}
|
403
|
+
server->server_features.insert(std::move(*child.mutable_string_value()));
|
369
404
|
}
|
370
405
|
}
|
371
406
|
return GRPC_ERROR_CREATE_FROM_VECTOR(
|
@@ -436,13 +471,13 @@ grpc_error* XdsBootstrap::ParseLocality(Json* json) {
|
|
436
471
|
node_->locality_zone = std::move(*it->second.mutable_string_value());
|
437
472
|
}
|
438
473
|
}
|
439
|
-
it = json->mutable_object()->find("
|
474
|
+
it = json->mutable_object()->find("sub_zone");
|
440
475
|
if (it != json->mutable_object()->end()) {
|
441
476
|
if (it->second.type() != Json::Type::STRING) {
|
442
477
|
error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
|
443
|
-
"\"
|
478
|
+
"\"sub_zone\" field is not a string"));
|
444
479
|
} else {
|
445
|
-
node_->
|
480
|
+
node_->locality_sub_zone = std::move(*it->second.mutable_string_value());
|
446
481
|
}
|
447
482
|
}
|
448
483
|
return GRPC_ERROR_CREATE_FROM_VECTOR("errors parsing \"locality\" object",
|
@@ -29,7 +29,6 @@
|
|
29
29
|
#include <grpc/slice.h>
|
30
30
|
|
31
31
|
#include "src/core/ext/xds/certificate_provider_store.h"
|
32
|
-
#include "src/core/lib/gprpp/map.h"
|
33
32
|
#include "src/core/lib/gprpp/memory.h"
|
34
33
|
#include "src/core/lib/gprpp/ref_counted_ptr.h"
|
35
34
|
#include "src/core/lib/iomgr/error.h"
|
@@ -55,7 +54,7 @@ class XdsBootstrap {
|
|
55
54
|
std::string cluster;
|
56
55
|
std::string locality_region;
|
57
56
|
std::string locality_zone;
|
58
|
-
std::string
|
57
|
+
std::string locality_sub_zone;
|
59
58
|
Json metadata;
|
60
59
|
};
|
61
60
|
|
@@ -68,11 +67,19 @@ class XdsBootstrap {
|
|
68
67
|
bool ShouldUseV3() const;
|
69
68
|
};
|
70
69
|
|
70
|
+
// Creates bootstrap object, obtaining the bootstrap JSON as appropriate
|
71
|
+
// for the environment:
|
72
|
+
// - If the GRPC_XDS_BOOTSTRAP env var is set, reads the file it specifies
|
73
|
+
// to obtain the bootstrap JSON.
|
74
|
+
// - Otherwise, if the GRPC_XDS_BOOTSTRAP_CONFIG env var is set, reads the
|
75
|
+
// content of that env var to obtain the bootstrap JSON.
|
76
|
+
// - Otherwise, the JSON will be read from fallback_config (if non-null).
|
71
77
|
// If *error is not GRPC_ERROR_NONE after returning, then there was an
|
72
|
-
// error reading the file.
|
73
|
-
static std::unique_ptr<XdsBootstrap>
|
74
|
-
|
75
|
-
|
78
|
+
// error (e.g., no config found or error reading the file).
|
79
|
+
static std::unique_ptr<XdsBootstrap> Create(XdsClient* client,
|
80
|
+
TraceFlag* tracer,
|
81
|
+
const char* fallback_config,
|
82
|
+
grpc_error** error);
|
76
83
|
|
77
84
|
// Do not instantiate directly -- use ReadFromFile() above instead.
|
78
85
|
XdsBootstrap(Json json, grpc_error** error);
|
@@ -81,6 +88,9 @@ class XdsBootstrap {
|
|
81
88
|
// add support for fallback for the xds channel.
|
82
89
|
const XdsServer& server() const { return servers_[0]; }
|
83
90
|
const Node* node() const { return node_.get(); }
|
91
|
+
const std::string& server_listener_resource_name_template() const {
|
92
|
+
return server_listener_resource_name_template_;
|
93
|
+
}
|
84
94
|
|
85
95
|
const CertificateProviderStore::PluginDefinitionMap& certificate_providers()
|
86
96
|
const {
|
@@ -101,6 +111,7 @@ class XdsBootstrap {
|
|
101
111
|
|
102
112
|
absl::InlinedVector<XdsServer, 1> servers_;
|
103
113
|
std::unique_ptr<Node> node_;
|
114
|
+
std::string server_listener_resource_name_template_;
|
104
115
|
CertificateProviderStore::PluginDefinitionMap certificate_providers_;
|
105
116
|
};
|
106
117
|
|
@@ -18,10 +18,12 @@
|
|
18
18
|
|
19
19
|
#include <grpc/support/port_platform.h>
|
20
20
|
|
21
|
+
#include "src/core/ext/xds/xds_certificate_provider.h"
|
22
|
+
|
21
23
|
#include "absl/functional/bind_front.h"
|
22
24
|
#include "absl/strings/str_cat.h"
|
23
25
|
|
24
|
-
#include "src/core/
|
26
|
+
#include "src/core/lib/gpr/useful.h"
|
25
27
|
|
26
28
|
namespace grpc_core {
|
27
29
|
|
@@ -35,15 +37,16 @@ class RootCertificatesWatcher
|
|
35
37
|
// presently, the watcher is immediately deleted when
|
36
38
|
// CancelTlsCertificatesWatch() is called, but that can potentially change in
|
37
39
|
// the future.
|
38
|
-
|
39
|
-
RefCountedPtr<grpc_tls_certificate_distributor> parent
|
40
|
-
|
40
|
+
RootCertificatesWatcher(
|
41
|
+
RefCountedPtr<grpc_tls_certificate_distributor> parent,
|
42
|
+
std::string cert_name)
|
43
|
+
: parent_(std::move(parent)), cert_name_(std::move(cert_name)) {}
|
41
44
|
|
42
45
|
void OnCertificatesChanged(absl::optional<absl::string_view> root_certs,
|
43
46
|
absl::optional<PemKeyCertPairList>
|
44
47
|
/* key_cert_pairs */) override {
|
45
48
|
if (root_certs.has_value()) {
|
46
|
-
parent_->SetKeyMaterials(
|
49
|
+
parent_->SetKeyMaterials(cert_name_, std::string(root_certs.value()),
|
47
50
|
absl::nullopt);
|
48
51
|
}
|
49
52
|
}
|
@@ -51,7 +54,7 @@ class RootCertificatesWatcher
|
|
51
54
|
void OnError(grpc_error* root_cert_error,
|
52
55
|
grpc_error* identity_cert_error) override {
|
53
56
|
if (root_cert_error != GRPC_ERROR_NONE) {
|
54
|
-
parent_->SetErrorForCert(
|
57
|
+
parent_->SetErrorForCert(cert_name_, root_cert_error /* pass the ref */,
|
55
58
|
absl::nullopt);
|
56
59
|
}
|
57
60
|
GRPC_ERROR_UNREF(identity_cert_error);
|
@@ -59,6 +62,7 @@ class RootCertificatesWatcher
|
|
59
62
|
|
60
63
|
private:
|
61
64
|
RefCountedPtr<grpc_tls_certificate_distributor> parent_;
|
65
|
+
std::string cert_name_;
|
62
66
|
};
|
63
67
|
|
64
68
|
class IdentityCertificatesWatcher
|
@@ -69,22 +73,23 @@ class IdentityCertificatesWatcher
|
|
69
73
|
// presently, the watcher is immediately deleted when
|
70
74
|
// CancelTlsCertificatesWatch() is called, but that can potentially change in
|
71
75
|
// the future.
|
72
|
-
|
73
|
-
RefCountedPtr<grpc_tls_certificate_distributor> parent
|
74
|
-
|
76
|
+
IdentityCertificatesWatcher(
|
77
|
+
RefCountedPtr<grpc_tls_certificate_distributor> parent,
|
78
|
+
std::string cert_name)
|
79
|
+
: parent_(std::move(parent)), cert_name_(std::move(cert_name)) {}
|
75
80
|
|
76
81
|
void OnCertificatesChanged(
|
77
82
|
absl::optional<absl::string_view> /* root_certs */,
|
78
83
|
absl::optional<PemKeyCertPairList> key_cert_pairs) override {
|
79
84
|
if (key_cert_pairs.has_value()) {
|
80
|
-
parent_->SetKeyMaterials(
|
85
|
+
parent_->SetKeyMaterials(cert_name_, absl::nullopt, key_cert_pairs);
|
81
86
|
}
|
82
87
|
}
|
83
88
|
|
84
89
|
void OnError(grpc_error* root_cert_error,
|
85
90
|
grpc_error* identity_cert_error) override {
|
86
91
|
if (identity_cert_error != GRPC_ERROR_NONE) {
|
87
|
-
parent_->SetErrorForCert(
|
92
|
+
parent_->SetErrorForCert(cert_name_, absl::nullopt,
|
88
93
|
identity_cert_error /* pass the ref */);
|
89
94
|
}
|
90
95
|
GRPC_ERROR_UNREF(root_cert_error);
|
@@ -92,28 +97,39 @@ class IdentityCertificatesWatcher
|
|
92
97
|
|
93
98
|
private:
|
94
99
|
RefCountedPtr<grpc_tls_certificate_distributor> parent_;
|
100
|
+
std::string cert_name_;
|
95
101
|
};
|
96
102
|
|
97
103
|
} // namespace
|
98
104
|
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
105
|
+
//
|
106
|
+
// XdsCertificateProvider::ClusterCertificateState
|
107
|
+
//
|
108
|
+
|
109
|
+
XdsCertificateProvider::ClusterCertificateState::~ClusterCertificateState() {
|
110
|
+
if (root_cert_watcher_ != nullptr) {
|
111
|
+
root_cert_distributor_->CancelTlsCertificatesWatch(root_cert_watcher_);
|
112
|
+
}
|
113
|
+
if (identity_cert_watcher_ != nullptr) {
|
114
|
+
identity_cert_distributor_->CancelTlsCertificatesWatch(
|
115
|
+
identity_cert_watcher_);
|
116
|
+
}
|
111
117
|
}
|
112
118
|
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
119
|
+
bool XdsCertificateProvider::ClusterCertificateState::IsSafeToRemove() const {
|
120
|
+
return !watching_root_certs_ && !watching_identity_certs_ &&
|
121
|
+
root_cert_distributor_ == nullptr &&
|
122
|
+
identity_cert_distributor_ == nullptr;
|
123
|
+
}
|
124
|
+
|
125
|
+
void XdsCertificateProvider::ClusterCertificateState::
|
126
|
+
UpdateRootCertNameAndDistributor(
|
127
|
+
const std::string& cert_name, absl::string_view root_cert_name,
|
128
|
+
RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor) {
|
129
|
+
if (root_cert_name_ == root_cert_name &&
|
130
|
+
root_cert_distributor_ == root_cert_distributor) {
|
131
|
+
return;
|
132
|
+
}
|
117
133
|
root_cert_name_ = std::string(root_cert_name);
|
118
134
|
if (watching_root_certs_) {
|
119
135
|
// The root certificates are being watched. Swap out the watcher.
|
@@ -121,10 +137,10 @@ void XdsCertificateProvider::UpdateRootCertNameAndDistributor(
|
|
121
137
|
root_cert_distributor_->CancelTlsCertificatesWatch(root_cert_watcher_);
|
122
138
|
}
|
123
139
|
if (root_cert_distributor != nullptr) {
|
124
|
-
UpdateRootCertWatcher(root_cert_distributor.get());
|
140
|
+
UpdateRootCertWatcher(cert_name, root_cert_distributor.get());
|
125
141
|
} else {
|
126
142
|
root_cert_watcher_ = nullptr;
|
127
|
-
distributor_->SetErrorForCert(
|
143
|
+
xds_certificate_provider_->distributor_->SetErrorForCert(
|
128
144
|
"",
|
129
145
|
GRPC_ERROR_CREATE_FROM_STATIC_STRING(
|
130
146
|
"No certificate provider available for root certificates"),
|
@@ -135,10 +151,15 @@ void XdsCertificateProvider::UpdateRootCertNameAndDistributor(
|
|
135
151
|
root_cert_distributor_ = std::move(root_cert_distributor);
|
136
152
|
}
|
137
153
|
|
138
|
-
void XdsCertificateProvider::
|
139
|
-
|
140
|
-
|
141
|
-
|
154
|
+
void XdsCertificateProvider::ClusterCertificateState::
|
155
|
+
UpdateIdentityCertNameAndDistributor(
|
156
|
+
const std::string& cert_name, absl::string_view identity_cert_name,
|
157
|
+
RefCountedPtr<grpc_tls_certificate_distributor>
|
158
|
+
identity_cert_distributor) {
|
159
|
+
if (identity_cert_name_ == identity_cert_name &&
|
160
|
+
identity_cert_distributor_ == identity_cert_distributor) {
|
161
|
+
return;
|
162
|
+
}
|
142
163
|
identity_cert_name_ = std::string(identity_cert_name);
|
143
164
|
if (watching_identity_certs_) {
|
144
165
|
// The identity certificates are being watched. Swap out the watcher.
|
@@ -147,10 +168,10 @@ void XdsCertificateProvider::UpdateIdentityCertNameAndDistributor(
|
|
147
168
|
identity_cert_watcher_);
|
148
169
|
}
|
149
170
|
if (identity_cert_distributor != nullptr) {
|
150
|
-
UpdateIdentityCertWatcher(identity_cert_distributor.get());
|
171
|
+
UpdateIdentityCertWatcher(cert_name, identity_cert_distributor.get());
|
151
172
|
} else {
|
152
173
|
identity_cert_watcher_ = nullptr;
|
153
|
-
distributor_->SetErrorForCert(
|
174
|
+
xds_certificate_provider_->distributor_->SetErrorForCert(
|
154
175
|
"", absl::nullopt,
|
155
176
|
GRPC_ERROR_CREATE_FROM_STATIC_STRING(
|
156
177
|
"No certificate provider available for identity certificates"));
|
@@ -160,36 +181,45 @@ void XdsCertificateProvider::UpdateIdentityCertNameAndDistributor(
|
|
160
181
|
identity_cert_distributor_ = std::move(identity_cert_distributor);
|
161
182
|
}
|
162
183
|
|
163
|
-
void XdsCertificateProvider::
|
164
|
-
|
165
|
-
|
184
|
+
void XdsCertificateProvider::ClusterCertificateState::UpdateRootCertWatcher(
|
185
|
+
const std::string& cert_name,
|
186
|
+
grpc_tls_certificate_distributor* root_cert_distributor) {
|
187
|
+
auto watcher = absl::make_unique<RootCertificatesWatcher>(
|
188
|
+
xds_certificate_provider_->distributor_, cert_name);
|
189
|
+
root_cert_watcher_ = watcher.get();
|
190
|
+
root_cert_distributor->WatchTlsCertificates(std::move(watcher),
|
191
|
+
root_cert_name_, absl::nullopt);
|
192
|
+
}
|
193
|
+
|
194
|
+
void XdsCertificateProvider::ClusterCertificateState::UpdateIdentityCertWatcher(
|
195
|
+
const std::string& cert_name,
|
196
|
+
grpc_tls_certificate_distributor* identity_cert_distributor) {
|
197
|
+
auto watcher = absl::make_unique<IdentityCertificatesWatcher>(
|
198
|
+
xds_certificate_provider_->distributor_, cert_name);
|
199
|
+
identity_cert_watcher_ = watcher.get();
|
200
|
+
identity_cert_distributor->WatchTlsCertificates(
|
201
|
+
std::move(watcher), absl::nullopt, identity_cert_name_);
|
202
|
+
}
|
203
|
+
|
204
|
+
void XdsCertificateProvider::ClusterCertificateState::WatchStatusCallback(
|
205
|
+
const std::string& cert_name, bool root_being_watched,
|
206
|
+
bool identity_being_watched) {
|
166
207
|
// We aren't specially handling the case where root_cert_distributor is same
|
167
208
|
// as identity_cert_distributor. Always using two separate watchers
|
168
209
|
// irrespective of the fact results in a straightforward design, and using a
|
169
210
|
// single watcher does not seem to provide any benefit other than cutting down
|
170
211
|
// on the number of callbacks.
|
171
|
-
MutexLock lock(&mu_);
|
172
|
-
if (!cert_name.empty()) {
|
173
|
-
grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(
|
174
|
-
absl::StrCat("Illegal certificate name: \'", cert_name,
|
175
|
-
"\'. Should be empty.")
|
176
|
-
.c_str());
|
177
|
-
distributor_->SetErrorForCert(cert_name, GRPC_ERROR_REF(error),
|
178
|
-
GRPC_ERROR_REF(error));
|
179
|
-
GRPC_ERROR_UNREF(error);
|
180
|
-
return;
|
181
|
-
}
|
182
212
|
if (root_being_watched && !watching_root_certs_) {
|
183
213
|
// We need to start watching root certs.
|
184
214
|
watching_root_certs_ = true;
|
185
215
|
if (root_cert_distributor_ == nullptr) {
|
186
|
-
distributor_->SetErrorForCert(
|
187
|
-
|
216
|
+
xds_certificate_provider_->distributor_->SetErrorForCert(
|
217
|
+
cert_name,
|
188
218
|
GRPC_ERROR_CREATE_FROM_STATIC_STRING(
|
189
219
|
"No certificate provider available for root certificates"),
|
190
220
|
absl::nullopt);
|
191
221
|
} else {
|
192
|
-
UpdateRootCertWatcher(root_cert_distributor_.get());
|
222
|
+
UpdateRootCertWatcher(cert_name, root_cert_distributor_.get());
|
193
223
|
}
|
194
224
|
} else if (!root_being_watched && watching_root_certs_) {
|
195
225
|
// We need to cancel root certs watch.
|
@@ -203,12 +233,12 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name,
|
|
203
233
|
if (identity_being_watched && !watching_identity_certs_) {
|
204
234
|
watching_identity_certs_ = true;
|
205
235
|
if (identity_cert_distributor_ == nullptr) {
|
206
|
-
distributor_->SetErrorForCert(
|
207
|
-
|
236
|
+
xds_certificate_provider_->distributor_->SetErrorForCert(
|
237
|
+
cert_name, absl::nullopt,
|
208
238
|
GRPC_ERROR_CREATE_FROM_STATIC_STRING(
|
209
239
|
"No certificate provider available for identity certificates"));
|
210
240
|
} else {
|
211
|
-
UpdateIdentityCertWatcher(identity_cert_distributor_.get());
|
241
|
+
UpdateIdentityCertWatcher(cert_name, identity_cert_distributor_.get());
|
212
242
|
}
|
213
243
|
} else if (!identity_being_watched && watching_identity_certs_) {
|
214
244
|
watching_identity_certs_ = false;
|
@@ -221,20 +251,155 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name,
|
|
221
251
|
}
|
222
252
|
}
|
223
253
|
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
254
|
+
//
|
255
|
+
// XdsCertificateProvider
|
256
|
+
//
|
257
|
+
|
258
|
+
XdsCertificateProvider::XdsCertificateProvider()
|
259
|
+
: distributor_(MakeRefCounted<grpc_tls_certificate_distributor>()) {
|
260
|
+
distributor_->SetWatchStatusCallback(
|
261
|
+
absl::bind_front(&XdsCertificateProvider::WatchStatusCallback, this));
|
230
262
|
}
|
231
263
|
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
264
|
+
XdsCertificateProvider::~XdsCertificateProvider() {
|
265
|
+
distributor_->SetWatchStatusCallback(nullptr);
|
266
|
+
}
|
267
|
+
|
268
|
+
bool XdsCertificateProvider::ProvidesRootCerts(const std::string& cert_name) {
|
269
|
+
MutexLock lock(&mu_);
|
270
|
+
auto it = certificate_state_map_.find(cert_name);
|
271
|
+
if (it == certificate_state_map_.end()) return false;
|
272
|
+
return it->second->ProvidesRootCerts();
|
273
|
+
}
|
274
|
+
|
275
|
+
void XdsCertificateProvider::UpdateRootCertNameAndDistributor(
|
276
|
+
const std::string& cert_name, absl::string_view root_cert_name,
|
277
|
+
RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor) {
|
278
|
+
MutexLock lock(&mu_);
|
279
|
+
auto it = certificate_state_map_.find(cert_name);
|
280
|
+
if (it == certificate_state_map_.end()) {
|
281
|
+
it = certificate_state_map_
|
282
|
+
.emplace(cert_name,
|
283
|
+
absl::make_unique<ClusterCertificateState>(this))
|
284
|
+
.first;
|
285
|
+
}
|
286
|
+
it->second->UpdateRootCertNameAndDistributor(cert_name, root_cert_name,
|
287
|
+
root_cert_distributor);
|
288
|
+
// Delete unused entries.
|
289
|
+
if (it->second->IsSafeToRemove()) certificate_state_map_.erase(it);
|
290
|
+
}
|
291
|
+
|
292
|
+
bool XdsCertificateProvider::ProvidesIdentityCerts(
|
293
|
+
const std::string& cert_name) {
|
294
|
+
MutexLock lock(&mu_);
|
295
|
+
auto it = certificate_state_map_.find(cert_name);
|
296
|
+
if (it == certificate_state_map_.end()) return false;
|
297
|
+
return it->second->ProvidesIdentityCerts();
|
298
|
+
}
|
299
|
+
|
300
|
+
void XdsCertificateProvider::UpdateIdentityCertNameAndDistributor(
|
301
|
+
const std::string& cert_name, absl::string_view identity_cert_name,
|
302
|
+
RefCountedPtr<grpc_tls_certificate_distributor> identity_cert_distributor) {
|
303
|
+
MutexLock lock(&mu_);
|
304
|
+
auto it = certificate_state_map_.find(cert_name);
|
305
|
+
if (it == certificate_state_map_.end()) {
|
306
|
+
it = certificate_state_map_
|
307
|
+
.emplace(cert_name,
|
308
|
+
absl::make_unique<ClusterCertificateState>(this))
|
309
|
+
.first;
|
310
|
+
}
|
311
|
+
it->second->UpdateIdentityCertNameAndDistributor(
|
312
|
+
cert_name, identity_cert_name, identity_cert_distributor);
|
313
|
+
// Delete unused entries.
|
314
|
+
if (it->second->IsSafeToRemove()) certificate_state_map_.erase(it);
|
315
|
+
}
|
316
|
+
|
317
|
+
bool XdsCertificateProvider::GetRequireClientCertificate(
|
318
|
+
const std::string& cert_name) {
|
319
|
+
MutexLock lock(&mu_);
|
320
|
+
auto it = certificate_state_map_.find(cert_name);
|
321
|
+
if (it == certificate_state_map_.end()) return false;
|
322
|
+
return it->second->require_client_certificate();
|
323
|
+
}
|
324
|
+
|
325
|
+
void XdsCertificateProvider::UpdateRequireClientCertificate(
|
326
|
+
const std::string& cert_name, bool require_client_certificate) {
|
327
|
+
MutexLock lock(&mu_);
|
328
|
+
auto it = certificate_state_map_.find(cert_name);
|
329
|
+
if (it == certificate_state_map_.end()) return;
|
330
|
+
it->second->set_require_client_certificate(require_client_certificate);
|
331
|
+
}
|
332
|
+
|
333
|
+
std::vector<StringMatcher> XdsCertificateProvider::GetSanMatchers(
|
334
|
+
const std::string& cluster) {
|
335
|
+
MutexLock lock(&san_matchers_mu_);
|
336
|
+
auto it = san_matcher_map_.find(cluster);
|
337
|
+
if (it == san_matcher_map_.end()) return {};
|
338
|
+
return it->second;
|
339
|
+
}
|
340
|
+
|
341
|
+
void XdsCertificateProvider::UpdateSubjectAlternativeNameMatchers(
|
342
|
+
const std::string& cluster, std::vector<StringMatcher> matchers) {
|
343
|
+
MutexLock lock(&san_matchers_mu_);
|
344
|
+
if (matchers.empty()) {
|
345
|
+
san_matcher_map_.erase(cluster);
|
346
|
+
} else {
|
347
|
+
san_matcher_map_[cluster] = std::move(matchers);
|
348
|
+
}
|
349
|
+
}
|
350
|
+
|
351
|
+
void XdsCertificateProvider::WatchStatusCallback(std::string cert_name,
|
352
|
+
bool root_being_watched,
|
353
|
+
bool identity_being_watched) {
|
354
|
+
MutexLock lock(&mu_);
|
355
|
+
auto it = certificate_state_map_.find(cert_name);
|
356
|
+
if (it == certificate_state_map_.end()) {
|
357
|
+
it = certificate_state_map_
|
358
|
+
.emplace(cert_name,
|
359
|
+
absl::make_unique<ClusterCertificateState>(this))
|
360
|
+
.first;
|
361
|
+
}
|
362
|
+
it->second->WatchStatusCallback(cert_name, root_being_watched,
|
363
|
+
identity_being_watched);
|
364
|
+
// Delete unused entries.
|
365
|
+
if (it->second->IsSafeToRemove()) certificate_state_map_.erase(it);
|
366
|
+
}
|
367
|
+
|
368
|
+
namespace {
|
369
|
+
|
370
|
+
void* XdsCertificateProviderArgCopy(void* p) {
|
371
|
+
XdsCertificateProvider* xds_certificate_provider =
|
372
|
+
static_cast<XdsCertificateProvider*>(p);
|
373
|
+
return xds_certificate_provider->Ref().release();
|
374
|
+
}
|
375
|
+
|
376
|
+
void XdsCertificateProviderArgDestroy(void* p) {
|
377
|
+
XdsCertificateProvider* xds_certificate_provider =
|
378
|
+
static_cast<XdsCertificateProvider*>(p);
|
379
|
+
xds_certificate_provider->Unref();
|
380
|
+
}
|
381
|
+
|
382
|
+
int XdsCertificateProviderArgCmp(void* p, void* q) { return GPR_ICMP(p, q); }
|
383
|
+
|
384
|
+
const grpc_arg_pointer_vtable kChannelArgVtable = {
|
385
|
+
XdsCertificateProviderArgCopy, XdsCertificateProviderArgDestroy,
|
386
|
+
XdsCertificateProviderArgCmp};
|
387
|
+
|
388
|
+
} // namespace
|
389
|
+
|
390
|
+
grpc_arg XdsCertificateProvider::MakeChannelArg() const {
|
391
|
+
return grpc_channel_arg_pointer_create(
|
392
|
+
const_cast<char*>(GRPC_ARG_XDS_CERTIFICATE_PROVIDER),
|
393
|
+
const_cast<XdsCertificateProvider*>(this), &kChannelArgVtable);
|
394
|
+
}
|
395
|
+
|
396
|
+
RefCountedPtr<XdsCertificateProvider>
|
397
|
+
XdsCertificateProvider::GetFromChannelArgs(const grpc_channel_args* args) {
|
398
|
+
XdsCertificateProvider* xds_certificate_provider =
|
399
|
+
grpc_channel_args_find_pointer<XdsCertificateProvider>(
|
400
|
+
args, GRPC_ARG_XDS_CERTIFICATE_PROVIDER);
|
401
|
+
return xds_certificate_provider != nullptr ? xds_certificate_provider->Ref()
|
402
|
+
: nullptr;
|
238
403
|
}
|
239
404
|
|
240
405
|
} // namespace grpc_core
|