diff --git a/.clang-format b/.clang-format index 953705e847c..608eea14056 100644 --- a/.clang-format +++ b/.clang-format @@ -30,7 +30,7 @@ IncludeCategories: # not-grpc headers follow # first, non system headers that are included like <> - these are all # local carveouts, and get sorted below c++ but before non grpc "" files - - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|benchmark/|google/)' + - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)' Priority: 30 # first C system headers - they have a . in the filename - Regex: '^<.*\.' diff --git a/BUILD b/BUILD index d0af0e4566d..3d105ffd689 100644 --- a/BUILD +++ b/BUILD @@ -1826,11 +1826,11 @@ grpc_cc_library( hdrs = [ "src/core/lib/security/credentials/channel_creds_registry.h", ], + external_deps = ["absl/strings"], language = "c++", tags = ["grpc-autodeps"], deps = [ "gpr_platform", - "grpc_codegen", "json", "ref_counted_ptr", ], @@ -2141,6 +2141,7 @@ grpc_cc_library( "gpr_base", "gpr_platform", "grpc_sockaddr", + "iomgr_port", "resolved_address", "uri_parser", ], @@ -2913,6 +2914,9 @@ grpc_cc_library( ], external_deps = [ "absl/container:inlined_vector", + "absl/memory", + "absl/status", + "absl/status:statusor", "absl/strings", "absl/strings:str_format", ], @@ -2922,6 +2926,7 @@ grpc_cc_library( deps = [ "channel_args", "gpr_platform", + "grpc_codegen", "resolved_address", "sockaddr_utils", "useful", @@ -2940,7 +2945,7 @@ grpc_cc_library( "src/core/lib/resolver/resolver_registry.h", ], external_deps = [ - "absl/memory", + "absl/status", "absl/status:statusor", "absl/strings", "absl/strings:str_format", @@ -2949,10 +2954,12 @@ grpc_cc_library( tags = ["grpc-autodeps"], visibility = ["@grpc:client_channel"], deps = [ + "channel_args", "gpr_base", "gpr_platform", "grpc_codegen", "grpc_service_config", + "grpc_trace", "iomgr_fwd", "orphanable", "ref_counted_ptr", @@ -3883,14 +3890,20 @@ grpc_cc_library( srcs = [ "src/core/lib/security/credentials/channel_creds_registry_init.cc", ], + external_deps = [ + "absl/memory", + "absl/strings", + ], language = "c++", deps = [ + "channel_creds_registry", "config", "gpr_platform", "grpc_fake_credentials", "grpc_google_default_credentials", "grpc_security_base", "json", + "ref_counted_ptr", ], ) @@ -4865,21 +4878,39 @@ grpc_cc_library( "src/core/lib/http/parser.h", ], external_deps = [ + "absl/base:core_headers", + "absl/container:inlined_vector", "absl/functional:bind_front", + "absl/status", + "absl/status:statusor", "absl/strings", "absl/strings:str_format", + "absl/types:optional", ], language = "c++", + tags = ["grpc-autodeps"], visibility = ["@grpc:httpcli"], deps = [ + "channel_args_preconditioning", "config", + "debug_location", "gpr_base", "grpc_base", + "grpc_codegen", "grpc_security_base", + "grpc_trace", + "handshaker", + "handshaker_registry", + "iomgr_fwd", + "orphanable", "ref_counted_ptr", + "resolved_address", + "resource_quota", + "slice_refcount", "sockaddr_utils", "tcp_connect_handshaker", - "useful", + "time", + "uri_parser", ], ) @@ -4897,17 +4928,34 @@ grpc_cc_library( "src/core/lib/security/authorization/grpc_server_authz_filter.h", ], external_deps = [ + "absl/status", + "absl/status:statusor", "absl/strings", + "absl/types:optional", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ + "arena_promise", + "channel_args", + "channel_fwd", + "dual_ref_counted", + "error", "gpr_base", + "gpr_platform", "grpc_base", + "grpc_codegen", "grpc_credentials_util", + "grpc_security_base", "grpc_trace", + "poll", "promise", - "slice_refcount", - "sockaddr_utils", + "ref_counted", + "ref_counted_ptr", + "resolved_address", + "slice", + "uri_parser", + "useful", ], ) @@ -4947,18 +4995,29 @@ grpc_cc_library( "src/core/lib/security/security_connector/fake/fake_security_connector.h", ], external_deps = [ + "absl/status", + "absl/status:statusor", "absl/strings", - "absl/strings:str_format", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ + "arena_promise", + "debug_location", "gpr_base", "grpc_base", + "grpc_codegen", "grpc_security_base", "handshaker", + "iomgr_fwd", + "poll", "promise", "ref_counted_ptr", + "slice", + "tsi_base", "tsi_fake_credentials", + "unique_type_name", + "useful", ], ) @@ -4972,13 +5031,27 @@ grpc_cc_library( "src/core/lib/security/credentials/insecure/insecure_credentials.h", "src/core/lib/security/security_connector/insecure/insecure_security_connector.h", ], + external_deps = [ + "absl/status", + "absl/strings", + ], language = "c++", + tags = ["grpc-autodeps"], deps = [ - "gpr", + "arena_promise", + "debug_location", + "gpr_base", + "grpc_base", + "grpc_codegen", "grpc_security_base", + "handshaker", + "iomgr_fwd", + "poll", "promise", "ref_counted_ptr", + "tsi_base", "tsi_local_credentials", + "unique_type_name", ], ) @@ -5009,21 +5082,33 @@ grpc_cc_library( "src/core/lib/security/security_connector/local/local_security_connector.h", ], external_deps = [ - "absl/strings:str_format", + "absl/status", + "absl/status:statusor", "absl/strings", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ + "arena_promise", + "debug_location", "gpr_base", "grpc_base", "grpc_client_channel", + "grpc_codegen", "grpc_security_base", "grpc_sockaddr", + "handshaker", + "iomgr_fwd", + "poll", "promise", "ref_counted_ptr", + "resolved_address", "sockaddr_utils", + "tsi_base", "tsi_local_credentials", + "unique_type_name", "uri_parser", + "useful", ], ) @@ -5038,21 +5123,30 @@ grpc_cc_library( "src/core/lib/security/security_connector/alts/alts_security_connector.h", ], external_deps = [ - "libssl", - "upb_lib", - "upb_lib_descriptor", + "absl/status", + "absl/strings", ], language = "c++", + tags = ["grpc-autodeps"], visibility = ["@grpc:public"], deps = [ "alts_util", + "arena_promise", + "debug_location", "gpr_base", "grpc_base", + "grpc_codegen", "grpc_security_base", + "handshaker", + "iomgr_fwd", + "poll", "promise", "ref_counted_ptr", + "slice_refcount", "tsi_alts_credentials", "tsi_base", + "unique_type_name", + "useful", ], ) @@ -5067,21 +5161,29 @@ grpc_cc_library( "src/core/lib/security/security_connector/ssl/ssl_security_connector.h", ], external_deps = [ + "absl/status", "absl/strings", "absl/strings:str_format", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ + "arena_promise", + "debug_location", "gpr_base", "grpc_base", - "grpc_credentials_util", + "grpc_codegen", "grpc_security_base", - "grpc_transport_chttp2_alpn", + "grpc_trace", "handshaker", + "iomgr_fwd", + "poll", "promise", "ref_counted_ptr", "tsi_base", "tsi_ssl_credentials", + "unique_type_name", + "useful", ], ) @@ -5096,8 +5198,8 @@ grpc_cc_library( "src/core/lib/security/credentials/google_default/google_default_credentials.h", ], external_deps = [ + "absl/status:statusor", "absl/strings", - "absl/strings:str_format", ], language = "c++", deps = [ @@ -5112,10 +5214,15 @@ grpc_cc_library( "grpc_oauth2_credentials", "grpc_security_base", "grpc_ssl_credentials", + "grpc_trace", "httpcli", - "httpcli_ssl_credentials", + "json", "ref_counted_ptr", + "slice_refcount", + "time", + "unique_type_name", "uri_parser", + "useful", ], ) @@ -5138,19 +5245,41 @@ grpc_cc_library( "src/core/lib/security/security_connector/tls/tls_security_connector.h", ], external_deps = [ + "absl/base:core_headers", + "absl/container:inlined_vector", "absl/functional:bind_front", + "absl/memory", + "absl/status", + "absl/status:statusor", "absl/strings", + "absl/types:optional", + "libcrypto", "libssl", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ + "arena_promise", + "debug_location", "gpr_base", + "gpr_codegen", "grpc_base", + "grpc_codegen", "grpc_credentials_util", + "grpc_public_hdrs", "grpc_security_base", + "grpc_trace", + "handshaker", + "iomgr_fwd", + "poll", "promise", + "ref_counted", + "ref_counted_ptr", + "slice_refcount", "tsi_base", "tsi_ssl_credentials", + "unique_type_name", + "useful", ], ) @@ -5163,16 +5292,25 @@ grpc_cc_library( "src/core/lib/security/credentials/iam/iam_credentials.h", ], external_deps = [ + "absl/status:statusor", "absl/strings", "absl/strings:str_format", + "absl/types:optional", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ + "arena_promise", "gpr_base", "grpc_base", "grpc_security_base", + "grpc_trace", + "poll", "promise", "ref_counted_ptr", + "slice", + "unique_type_name", + "useful", ], ) @@ -5189,25 +5327,40 @@ grpc_cc_library( "src/core/lib/security/credentials/jwt/jwt_verifier.h", ], external_deps = [ + "absl/status", + "absl/status:statusor", "absl/strings", + "absl/strings:str_format", + "absl/time", + "absl/types:optional", "libcrypto", "libssl", ], language = "c++", + tags = ["grpc-autodeps"], visibility = ["@grpc:public"], deps = [ + "arena_promise", "gpr_base", + "gpr_codegen", "grpc_base", "grpc_credentials_util", "grpc_security_base", + "grpc_trace", "httpcli", "httpcli_ssl_credentials", "json", + "orphanable", + "poll", "promise", - "ref_counted", "ref_counted_ptr", + "slice", + "slice_refcount", + "time", "tsi_ssl_types", + "unique_type_name", "uri_parser", + "useful", ], ) @@ -5221,23 +5374,38 @@ grpc_cc_library( ], external_deps = [ "absl/container:inlined_vector", + "absl/status", + "absl/status:statusor", "absl/strings", "absl/strings:str_format", - "absl/status", + "absl/types:optional", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ + "activity", + "arena_promise", + "context", "gpr_base", + "gpr_codegen", "grpc_base", - "grpc_codegen", "grpc_credentials_util", "grpc_security_base", + "grpc_trace", "httpcli", "httpcli_ssl_credentials", "json", + "orphanable", + "poll", "promise", + "ref_counted", "ref_counted_ptr", + "slice", + "slice_refcount", + "time", + "unique_type_name", "uri_parser", + "useful", ], ) @@ -5258,13 +5426,16 @@ grpc_cc_library( "src/core/lib/security/credentials/external/url_external_account_credentials.h", ], external_deps = [ + "absl/memory", + "absl/status", + "absl/status:statusor", "absl/strings", "absl/strings:str_format", "absl/time", "libcrypto", - "libssl", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ "gpr_base", "grpc_base", @@ -5273,7 +5444,12 @@ grpc_cc_library( "grpc_security_base", "httpcli", "httpcli_ssl_credentials", + "json", + "orphanable", + "ref_counted_ptr", "slice_refcount", + "time", + "uri_parser", ], ) @@ -5286,17 +5462,26 @@ grpc_cc_library( "src/core/lib/http/httpcli_ssl_credentials.h", ], external_deps = [ + "absl/status", "absl/strings", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ - "config", + "arena_promise", + "debug_location", "gpr_base", "grpc_base", + "grpc_codegen", "grpc_security_base", + "handshaker", + "iomgr_fwd", + "poll", "promise", "ref_counted_ptr", + "tsi_base", "tsi_ssl_credentials", + "unique_type_name", ], ) @@ -5347,10 +5532,10 @@ grpc_cc_library( hdrs = [ "src/core/tsi/ssl_types.h", ], - external_deps = [ - "libssl", - ], + external_deps = ["libssl"], language = "c++", + tags = ["grpc-autodeps"], + deps = ["gpr_platform"], ) grpc_cc_library( @@ -5381,31 +5566,56 @@ grpc_cc_library( "src/core/lib/security/transport/tsi_error.h", ], external_deps = [ + "absl/base:core_headers", + "absl/container:inlined_vector", + "absl/memory", + "absl/status", + "absl/status:statusor", "absl/strings", - "absl/strings:str_format", - "absl/time", + "absl/types:optional", ], language = "c++", public_hdrs = GRPC_PUBLIC_HDRS, + tags = ["grpc-autodeps"], visibility = ["@grpc:public"], deps = [ + "activity", "arena", "arena_promise", + "basic_seq", + "channel_args", + "channel_fwd", + "closure", "config", + "context", + "debug_location", + "error", + "event_engine_memory_allocator", + "exec_ctx", "gpr_base", + "gpr_codegen", + "gpr_platform", "grpc_base", + "grpc_codegen", + "grpc_public_hdrs", "grpc_trace", "handshaker", - "json", + "handshaker_factory", + "handshaker_registry", + "iomgr_fwd", "memory_quota", + "poll", "promise", "ref_counted", "ref_counted_ptr", "resource_quota", "resource_quota_trace", + "slice", + "slice_refcount", "try_seq", "tsi_base", "unique_type_name", + "useful", ], ) @@ -5428,11 +5638,13 @@ grpc_cc_library( "absl/strings", ], language = "c++", + tags = ["grpc-autodeps"], visibility = ["@grpc:public"], deps = [ "gpr_base", "grpc_base", "grpc_security_base", + "json", "useful", ], ) @@ -5537,19 +5749,24 @@ grpc_cc_library( "src/core/tsi/ssl_transport_security.h", ], external_deps = [ - "absl/memory", + "absl/base:core_headers", + "absl/container:inlined_vector", + "absl/status", "absl/strings", - "libssl", "libcrypto", + "libssl", ], language = "c++", + tags = ["grpc-autodeps"], visibility = ["@grpc:public"], deps = [ "gpr_base", "grpc_base", + "grpc_codegen", "grpc_credentials_util", "grpc_security_base", "grpc_transport_chttp2_alpn", + "ref_counted", "ref_counted_ptr", "tsi_base", "tsi_ssl_session_cache", @@ -5568,9 +5785,18 @@ grpc_cc_library( "src/core/lib/security/authorization/mock_cel/evaluator_core.h", "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h", ], + external_deps = [ + "absl/memory", + "absl/status", + "absl/status:statusor", + "absl/strings", + "absl/types:span", + ], language = "c++", + tags = ["grpc-autodeps"], deps = [ - "grpc_base", + "google_type_expr_upb", + "gpr_platform", ], ) @@ -5584,16 +5810,17 @@ grpc_cc_library( "src/core/lib/matchers/matchers.h", ], external_deps = [ - "re2", "absl/memory", + "absl/status", + "absl/status:statusor", "absl/strings", "absl/strings:str_format", + "absl/types:optional", + "re2", ], language = "c++", - deps = [ - "gpr_base", - "grpc_base", - ], + tags = ["grpc-autodeps"], + deps = ["gpr_base"], ) # This target pulls in a dependency on RE2 and should not be linked into grpc by default for binary-size reasons. @@ -5610,15 +5837,19 @@ grpc_cc_library( "src/core/lib/security/authorization/rbac_policy.h", ], external_deps = [ + "absl/memory", "absl/strings", "absl/strings:str_format", + "absl/types:optional", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ "gpr_base", "grpc_authorization_base", "grpc_base", "grpc_matchers", + "resolved_address", "sockaddr_utils", ], ) @@ -5635,16 +5866,29 @@ grpc_cc_library( "src/core/lib/security/authorization/rbac_translator.h", ], external_deps = [ + "absl/base:core_headers", + "absl/memory", + "absl/status", + "absl/status:statusor", "absl/strings", "absl/strings:str_format", ], language = "c++", public_hdrs = GRPC_PUBLIC_HDRS, + tags = ["grpc-autodeps"], deps = [ "gpr_base", + "gpr_codegen", + "grpc_authorization_base", "grpc_base", + "grpc_codegen", "grpc_matchers", + "grpc_public_hdrs", "grpc_rbac_engine", + "grpc_trace", + "json", + "ref_counted_ptr", + "slice_refcount", "useful", ], ) @@ -5683,15 +5927,19 @@ grpc_cc_library( external_deps = [ "absl/container:flat_hash_set", "absl/memory", + "absl/strings", + "absl/types:optional", + "absl/types:span", + "upb_lib", ], language = "c++", + tags = ["grpc-autodeps"], deps = [ "envoy_config_rbac_upb", + "google_type_expr_upb", "gpr_base", - "grpc_base", + "grpc_authorization_base", "grpc_mock_cel", - "grpc_rbac_engine", - "sockaddr_utils", ], ) @@ -5701,9 +5949,8 @@ grpc_cc_library( "src/core/ext/transport/chttp2/transport/hpack_constants.h", ], language = "c++", - deps = [ - "gpr_platform", - ], + tags = ["grpc-autodeps"], + deps = ["gpr_platform"], ) grpc_cc_library( @@ -5714,12 +5961,11 @@ grpc_cc_library( hdrs = [ "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h", ], - external_deps = [ - "absl/container:inlined_vector", - ], + external_deps = ["absl/container:inlined_vector"], language = "c++", + tags = ["grpc-autodeps"], deps = [ - "gpr", + "gpr_base", "hpack_constants", ], ) @@ -6784,6 +7030,11 @@ grpc_upb_proto_reflection_library( deps = ["@com_google_googleapis//google/rpc:status_proto"], ) +grpc_upb_proto_library( + name = "google_type_expr_upb", + deps = ["@com_google_googleapis//google/type:expr_proto"], +) + grpc_upb_proto_library( name = "grpc_lb_upb", deps = ["//src/proto/grpc/lb/v1:load_balancer_proto_descriptor"], diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cf14400c59..b07e2e75e3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8510,6 +8510,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(cel_authorization_engine_test + src/core/ext/upb-generated/google/type/expr.upb.c src/core/lib/security/authorization/cel_authorization_engine.cc test/core/security/cel_authorization_engine_test.cc third_party/googletest/googletest/src/gtest-all.cc diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 17e20e25abd..303d3b30f26 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -4953,6 +4953,7 @@ targets: build: test language: c++ headers: + - src/core/ext/upb-generated/google/type/expr.upb.h - src/core/lib/security/authorization/cel_authorization_engine.h - src/core/lib/security/authorization/mock_cel/activation.h - src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h @@ -4961,6 +4962,7 @@ targets: - src/core/lib/security/authorization/mock_cel/evaluator_core.h - src/core/lib/security/authorization/mock_cel/flat_expr_builder.h src: + - src/core/ext/upb-generated/google/type/expr.upb.c - src/core/lib/security/authorization/cel_authorization_engine.cc - test/core/security/cel_authorization_engine_test.cc deps: diff --git a/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc b/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc index e4473b042b7..8aa6f426023 100644 --- a/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +++ b/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc @@ -14,8 +14,6 @@ // limitations under the License. // -// IWYU pragma: no_include - #include #include diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index 9768ff57ed9..5d1f6926cb2 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -18,6 +18,8 @@ #include +#include "src/core/lib/iomgr/sockaddr.h" + // IWYU pragma: no_include // IWYU pragma: no_include // IWYU pragma: no_include diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 182edbc57a3..457e978a961 100644 --- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -21,7 +21,6 @@ #include "src/core/ext/filters/load_reporting/server_load_reporting_filter.h" #include -#include #include #include diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc index 7f73905e184..3f685dd303d 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc @@ -16,8 +16,6 @@ * */ -// IWYU pragma: no_include - #include #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h" diff --git a/src/core/ext/upb-generated/google/type/expr.upb.c b/src/core/ext/upb-generated/google/type/expr.upb.c new file mode 100644 index 00000000000..81cd98ad02b --- /dev/null +++ b/src/core/ext/upb-generated/google/type/expr.upb.c @@ -0,0 +1,42 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * google/type/expr.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include +#include "upb/msg_internal.h" +#include "google/type/expr.upb.h" + +#include "upb/port_def.inc" + +static const upb_MiniTable_Field google_type_Expr__fields[4] = { + {1, UPB_SIZE(0, 0), UPB_SIZE(0, 0), kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {2, UPB_SIZE(8, 16), UPB_SIZE(0, 0), kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {3, UPB_SIZE(16, 32), UPB_SIZE(0, 0), kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, + {4, UPB_SIZE(24, 48), UPB_SIZE(0, 0), kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)}, +}; + +const upb_MiniTable google_type_Expr_msginit = { + NULL, + &google_type_Expr__fields[0], + UPB_SIZE(32, 72), 4, kUpb_ExtMode_NonExtendable, 4, 255, 0, +}; + +static const upb_MiniTable *messages_layout[1] = { + &google_type_Expr_msginit, +}; + +const upb_MiniTable_File google_type_expr_proto_upb_file_layout = { + messages_layout, + NULL, + NULL, + 1, + 0, + 0, +}; + +#include "upb/port_undef.inc" + diff --git a/src/core/ext/upb-generated/google/type/expr.upb.h b/src/core/ext/upb-generated/google/type/expr.upb.h new file mode 100644 index 00000000000..173d0666467 --- /dev/null +++ b/src/core/ext/upb-generated/google/type/expr.upb.h @@ -0,0 +1,106 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * google/type/expr.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef GOOGLE_TYPE_EXPR_PROTO_UPB_H_ +#define GOOGLE_TYPE_EXPR_PROTO_UPB_H_ + +#include "upb/msg_internal.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct google_type_Expr; +typedef struct google_type_Expr google_type_Expr; +extern const upb_MiniTable google_type_Expr_msginit; + + + +/* google.type.Expr */ + +UPB_INLINE google_type_Expr* google_type_Expr_new(upb_Arena* arena) { + return (google_type_Expr*)_upb_Message_New(&google_type_Expr_msginit, arena); +} +UPB_INLINE google_type_Expr* google_type_Expr_parse(const char* buf, size_t size, upb_Arena* arena) { + google_type_Expr* ret = google_type_Expr_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, ret, &google_type_Expr_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE google_type_Expr* google_type_Expr_parse_ex(const char* buf, size_t size, + const upb_ExtensionRegistry* extreg, + int options, upb_Arena* arena) { + google_type_Expr* ret = google_type_Expr_new(arena); + if (!ret) return NULL; + if (upb_Decode(buf, size, ret, &google_type_Expr_msginit, extreg, options, arena) != + kUpb_DecodeStatus_Ok) { + return NULL; + } + return ret; +} +UPB_INLINE char* google_type_Expr_serialize(const google_type_Expr* msg, upb_Arena* arena, size_t* len) { + return upb_Encode(msg, &google_type_Expr_msginit, 0, arena, len); +} +UPB_INLINE char* google_type_Expr_serialize_ex(const google_type_Expr* msg, int options, + upb_Arena* arena, size_t* len) { + return upb_Encode(msg, &google_type_Expr_msginit, options, arena, len); +} +UPB_INLINE void google_type_Expr_clear_expression(const google_type_Expr* msg) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0); +} +UPB_INLINE upb_StringView google_type_Expr_expression(const google_type_Expr* msg) { + return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_StringView); +} +UPB_INLINE void google_type_Expr_clear_title(const google_type_Expr* msg) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0); +} +UPB_INLINE upb_StringView google_type_Expr_title(const google_type_Expr* msg) { + return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_StringView); +} +UPB_INLINE void google_type_Expr_clear_description(const google_type_Expr* msg) { + *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0); +} +UPB_INLINE upb_StringView google_type_Expr_description(const google_type_Expr* msg) { + return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_StringView); +} +UPB_INLINE void google_type_Expr_clear_location(const google_type_Expr* msg) { + *UPB_PTR_AT(msg, UPB_SIZE(24, 48), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0); +} +UPB_INLINE upb_StringView google_type_Expr_location(const google_type_Expr* msg) { + return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), upb_StringView); +} + +UPB_INLINE void google_type_Expr_set_expression(google_type_Expr *msg, upb_StringView value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_StringView) = value; +} +UPB_INLINE void google_type_Expr_set_title(google_type_Expr *msg, upb_StringView value) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_StringView) = value; +} +UPB_INLINE void google_type_Expr_set_description(google_type_Expr *msg, upb_StringView value) { + *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_StringView) = value; +} +UPB_INLINE void google_type_Expr_set_location(google_type_Expr *msg, upb_StringView value) { + *UPB_PTR_AT(msg, UPB_SIZE(24, 48), upb_StringView) = value; +} + +extern const upb_MiniTable_File google_type_expr_proto_upb_file_layout; + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* GOOGLE_TYPE_EXPR_PROTO_UPB_H_ */ diff --git a/src/core/ext/xds/xds_api.cc b/src/core/ext/xds/xds_api.cc index de6619ef614..6714167eb41 100644 --- a/src/core/ext/xds/xds_api.cc +++ b/src/core/ext/xds/xds_api.cc @@ -57,7 +57,6 @@ #include "src/core/lib/json/json.h" // IWYU pragma: no_include "upb/msg_internal.h" -// IWYU pragma: no_include namespace grpc_core { diff --git a/src/core/ext/xds/xds_resource_type.h b/src/core/ext/xds/xds_resource_type.h index 0440ff57112..bd21714fe58 100644 --- a/src/core/ext/xds/xds_resource_type.h +++ b/src/core/ext/xds/xds_resource_type.h @@ -14,6 +14,8 @@ // limitations under the License. // +#ifndef GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H +#define GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H #include #include @@ -25,9 +27,6 @@ #include "src/core/ext/xds/upb_utils.h" -#ifndef GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H -#define GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H - namespace grpc_core { // Interface for an xDS resource type. diff --git a/src/core/ext/xds/xds_resource_type_impl.h b/src/core/ext/xds/xds_resource_type_impl.h index db47ab624c9..644c445ed21 100644 --- a/src/core/ext/xds/xds_resource_type_impl.h +++ b/src/core/ext/xds/xds_resource_type_impl.h @@ -14,6 +14,8 @@ // limitations under the License. // +#ifndef GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H +#define GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H #include #include @@ -24,9 +26,6 @@ #include "src/core/ext/xds/xds_resource_type.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#ifndef GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H -#define GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H - namespace grpc_core { // Base class for XdsResourceType implementations. diff --git a/src/core/ext/xds/xds_server_config_fetcher.cc b/src/core/ext/xds/xds_server_config_fetcher.cc index 24a56734842..9c8f0d7d264 100644 --- a/src/core/ext/xds/xds_server_config_fetcher.cc +++ b/src/core/ext/xds/xds_server_config_fetcher.cc @@ -92,8 +92,6 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/uri/uri_parser.h" -// IWYU pragma: no_include - namespace grpc_core { namespace { diff --git a/src/core/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc index eabc86c4613..e0642a3226c 100644 --- a/src/core/lib/address_utils/parse_address.cc +++ b/src/core/lib/address_utils/parse_address.cc @@ -21,26 +21,23 @@ #include "src/core/lib/address_utils/parse_address.h" #include +#include #include #ifdef GRPC_HAVE_UNIX_SOCKET #include #endif -#ifdef GRPC_POSIX_SOCKET -#include -#include -#endif +#include #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" -#include #include -#include #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/grpc_if_nametoindex.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" diff --git a/src/core/lib/address_utils/parse_address.h b/src/core/lib/address_utils/parse_address.h index 4b18ed6d065..85b24ace3ea 100644 --- a/src/core/lib/address_utils/parse_address.h +++ b/src/core/lib/address_utils/parse_address.h @@ -21,11 +21,12 @@ #include -#include +#include #include "absl/strings/string_view.h" -#include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/uri/uri_parser.h" /** Populate \a resolved_addr from \a uri, whose path is expected to contain a diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc index 52bed4642d0..cd2848ad03c 100644 --- a/src/core/lib/address_utils/sockaddr_utils.cc +++ b/src/core/lib/address_utils/sockaddr_utils.cc @@ -25,17 +25,16 @@ #include #include +#include #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include "absl/strings/str_replace.h" -#include #include -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/uri/uri_parser.h" diff --git a/src/core/lib/address_utils/sockaddr_utils.h b/src/core/lib/address_utils/sockaddr_utils.h index 11ed5524ecd..600614298db 100644 --- a/src/core/lib/address_utils/sockaddr_utils.h +++ b/src/core/lib/address_utils/sockaddr_utils.h @@ -21,6 +21,8 @@ #include +#include + #include #include "absl/status/statusor.h" diff --git a/src/core/lib/backoff/backoff.cc b/src/core/lib/backoff/backoff.cc index c3b7e8565ab..8238e5cfae4 100644 --- a/src/core/lib/backoff/backoff.cc +++ b/src/core/lib/backoff/backoff.cc @@ -22,7 +22,7 @@ #include -#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/iomgr/exec_ctx.h" namespace grpc_core { diff --git a/src/core/lib/backoff/backoff.h b/src/core/lib/backoff/backoff.h index f94c2df22e7..9c03d8b4192 100644 --- a/src/core/lib/backoff/backoff.h +++ b/src/core/lib/backoff/backoff.h @@ -23,7 +23,7 @@ #include "absl/random/random.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/gprpp/time.h" namespace grpc_core { diff --git a/src/core/lib/compression/compression.cc b/src/core/lib/compression/compression.cc index ce39d7e8343..d9cfff4dc94 100644 --- a/src/core/lib/compression/compression.cc +++ b/src/core/lib/compression/compression.cc @@ -18,12 +18,17 @@ #include -#include +#include #include +#include "absl/types/optional.h" + #include +#include +#include #include "src/core/lib/compression/compression_internal.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/api_trace.h" diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc index e1a7a290109..c90817c4a7e 100644 --- a/src/core/lib/compression/compression_internal.cc +++ b/src/core/lib/compression/compression_internal.cc @@ -23,17 +23,14 @@ #include #include -#include - #include "absl/container/inlined_vector.h" -#include "absl/strings/str_join.h" +#include "absl/strings/ascii.h" #include "absl/strings/str_split.h" -#include +#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/useful.h" -#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/surface/api_trace.h" namespace grpc_core { diff --git a/src/core/lib/compression/compression_internal.h b/src/core/lib/compression/compression_internal.h index 4673266a27a..3973952aaad 100644 --- a/src/core/lib/compression/compression_internal.h +++ b/src/core/lib/compression/compression_internal.h @@ -21,14 +21,15 @@ #include +#include + #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include +#include #include -#include #include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/slice/slice.h" diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index b88f5103c7f..7bb4dd6bff6 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -22,12 +22,14 @@ #include +#include #include +#include #include #include -#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" #define OUTPUT_BLOCK_SIZE 1024 diff --git a/src/core/lib/compression/message_compress.h b/src/core/lib/compression/message_compress.h index b84120c19e4..b453eaeb89a 100644 --- a/src/core/lib/compression/message_compress.h +++ b/src/core/lib/compression/message_compress.h @@ -21,9 +21,8 @@ #include -#include - -#include "src/core/lib/compression/compression_internal.h" +#include +#include /* compress 'input' to 'output' using 'algorithm'. On success, appends compressed slices to output and returns 1. diff --git a/src/core/lib/debug/stats.cc b/src/core/lib/debug/stats.cc index a0292e3b01e..4a1ce98e585 100644 --- a/src/core/lib/debug/stats.cc +++ b/src/core/lib/debug/stats.cc @@ -23,16 +23,14 @@ #include #include +#include #include #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include -#include - -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/useful.h" +#include grpc_stats_data* grpc_stats_per_cpu_storage = nullptr; static size_t g_num_cores; diff --git a/src/core/lib/debug/stats.h b/src/core/lib/debug/stats.h index cafaa644934..a1be1c6770a 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/lib/debug/stats.h @@ -21,6 +21,8 @@ #include +#include + #include #include diff --git a/src/core/lib/debug/stats_data.cc b/src/core/lib/debug/stats_data.cc index 73963c4cd01..4d3755ebb1d 100644 --- a/src/core/lib/debug/stats_data.cc +++ b/src/core/lib/debug/stats_data.cc @@ -22,9 +22,10 @@ #include "src/core/lib/debug/stats_data.h" +#include + #include "src/core/lib/debug/stats.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" const char* grpc_stats_counter_name[GRPC_STATS_COUNTER_COUNT] = { "client_calls_created", diff --git a/src/core/lib/debug/stats_data.h b/src/core/lib/debug/stats_data.h index 46084198fb2..4f9b50e2922 100644 --- a/src/core/lib/debug/stats_data.h +++ b/src/core/lib/debug/stats_data.h @@ -23,10 +23,6 @@ #include -#include - -#include "src/core/lib/iomgr/exec_ctx.h" - typedef enum { GRPC_STATS_COUNTER_CLIENT_CALLS_CREATED, GRPC_STATS_COUNTER_SERVER_CALLS_CREATED, diff --git a/src/core/lib/debug/trace.h b/src/core/lib/debug/trace.h index 91d15b3f010..333f366fb86 100644 --- a/src/core/lib/debug/trace.h +++ b/src/core/lib/debug/trace.h @@ -19,13 +19,20 @@ #ifndef GRPC_CORE_LIB_DEBUG_TRACE_H #define GRPC_CORE_LIB_DEBUG_TRACE_H -#include +#if defined(__has_feature) +#if __has_feature(thread_sanitizer) +#define GRPC_THREADSAFE_TRACER +#endif +#endif -#include +#include -#include +#ifdef GRPC_THREADSAFE_TRACER +#include +#endif #include "src/core/lib/gprpp/global_config.h" +#include "src/core/lib/gprpp/memory.h" GPR_GLOBAL_CONFIG_DECLARE_STRING(grpc_trace); @@ -36,12 +43,6 @@ void grpc_tracer_init(const char* env_var_name); void grpc_tracer_init(); void grpc_tracer_shutdown(void); -#if defined(__has_feature) -#if __has_feature(thread_sanitizer) -#define GRPC_THREADSAFE_TRACER -#endif -#endif - namespace grpc_core { class TraceFlag; @@ -80,7 +81,7 @@ class TraceFlag { #if defined(GRPC_USE_TRACERS) || !defined(NDEBUG) bool enabled() { #ifdef GRPC_THREADSAFE_TRACER - return gpr_atm_no_barrier_load(&value_) != 0; + return value_.load(std::memory_order_relaxed); #else return value_; #endif // GRPC_THREADSAFE_TRACER @@ -95,7 +96,7 @@ class TraceFlag { void set_enabled(bool enabled) { #ifdef GRPC_THREADSAFE_TRACER - gpr_atm_no_barrier_store(&value_, enabled); + value_.store(enabled, std::memory_order_relaxed); #else value_ = enabled; #endif @@ -104,7 +105,7 @@ class TraceFlag { TraceFlag* next_tracer_; const char* const name_; #ifdef GRPC_THREADSAFE_TRACER - gpr_atm value_; + std::atomic value_; #else bool value_; #endif diff --git a/src/core/lib/http/format_request.cc b/src/core/lib/http/format_request.cc index cd2c2e9db47..641b883e36b 100644 --- a/src/core/lib/http/format_request.cc +++ b/src/core/lib/http/format_request.cc @@ -20,20 +20,21 @@ #include "src/core/lib/http/format_request.h" -#include #include #include +#include +#include #include +#include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" +#include "absl/strings/string_view.h" #include -#include -#include -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/http/httpcli.h" static void fill_common_header(const grpc_http_request* request, const char* host, const char* path, diff --git a/src/core/lib/http/format_request.h b/src/core/lib/http/format_request.h index e493fb4859b..5dccb1e0675 100644 --- a/src/core/lib/http/format_request.h +++ b/src/core/lib/http/format_request.h @@ -23,7 +23,7 @@ #include -#include "src/core/lib/http/httpcli.h" +#include "src/core/lib/http/parser.h" grpc_slice grpc_httpcli_format_get_request(const grpc_http_request* request, const char* host, const char* path); diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index a237def65bb..c9f22719e37 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -21,32 +21,38 @@ #include "src/core/lib/http/httpcli.h" #include -#include #include +#include +#include "absl/container/inlined_vector.h" #include "absl/functional/bind_front.h" +#include "absl/status/status.h" #include "absl/strings/str_format.h" -#include "absl/strings/string_view.h" #include +#include +#include #include #include -#include #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" +#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/http/format_request.h" #include "src/core/lib/http/parser.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/iomgr_internal.h" +#include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/resource_quota/api.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/lib/transport/handshaker_registry.h" #include "src/core/lib/transport/tcp_connect_handshaker.h" namespace grpc_core { diff --git a/src/core/lib/http/httpcli.h b/src/core/lib/http/httpcli.h index 01f74037e76..da6258fe6da 100644 --- a/src/core/lib/http/httpcli.h +++ b/src/core/lib/http/httpcli.h @@ -23,17 +23,33 @@ #include -#include +#include +#include +#include "absl/base/thread_annotations.h" +#include "absl/status/statusor.h" +#include "absl/types/optional.h" + +#include +#include +#include + +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/gprpp/time.h" #include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/polling_entity.h" -#include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/resource_quota/resource_quota.h" -#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/handshaker.h" #include "src/core/lib/uri/uri_parser.h" diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc index 44701d805cc..09f5986fd2c 100644 --- a/src/core/lib/http/httpcli_security_connector.cc +++ b/src/core/lib/http/httpcli_security_connector.cc @@ -20,24 +20,36 @@ #include +#include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include +#include +#include #include #include #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/iomgr/pollset.h" +#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/security/transport/security_handshaker.h" -#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/tsi/transport_security_interface.h" namespace grpc_core { diff --git a/src/core/lib/http/httpcli_ssl_credentials.h b/src/core/lib/http/httpcli_ssl_credentials.h index ef33662a28d..56d57616b1a 100644 --- a/src/core/lib/http/httpcli_ssl_credentials.h +++ b/src/core/lib/http/httpcli_ssl_credentials.h @@ -19,7 +19,9 @@ #include -#include "src/core/lib/security/credentials/credentials.h" +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" namespace grpc_core { diff --git a/src/core/lib/http/parser.cc b/src/core/lib/http/parser.cc index f95a697011d..6a50f68aa93 100644 --- a/src/core/lib/http/parser.cc +++ b/src/core/lib/http/parser.cc @@ -20,14 +20,13 @@ #include "src/core/lib/http/parser.h" -#include #include +#include + #include #include -#include "src/core/lib/gpr/useful.h" - grpc_core::TraceFlag grpc_http1_trace(false, "http1"); static char* buf2str(void* buffer, size_t length) { diff --git a/src/core/lib/http/parser.h b/src/core/lib/http/parser.h index 63f9c9fd121..d3522e42441 100644 --- a/src/core/lib/http/parser.h +++ b/src/core/lib/http/parser.h @@ -21,6 +21,9 @@ #include +#include +#include + #include #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/iomgr/work_serializer.h b/src/core/lib/iomgr/work_serializer.h index 217018cf362..34749242733 100644 --- a/src/core/lib/iomgr/work_serializer.h +++ b/src/core/lib/iomgr/work_serializer.h @@ -16,6 +16,8 @@ * */ +#ifndef GRPC_CORE_LIB_IOMGR_WORK_SERIALIZER_H +#define GRPC_CORE_LIB_IOMGR_WORK_SERIALIZER_H #include #include @@ -30,9 +32,6 @@ #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/iomgr/exec_ctx.h" -#ifndef GRPC_CORE_LIB_IOMGR_WORK_SERIALIZER_H -#define GRPC_CORE_LIB_IOMGR_WORK_SERIALIZER_H - namespace grpc_core { // WorkSerializer is a mechanism to schedule callbacks in a synchronized manner. diff --git a/src/core/lib/matchers/matchers.cc b/src/core/lib/matchers/matchers.cc index 12f509b1e1e..de74e0e9182 100644 --- a/src/core/lib/matchers/matchers.cc +++ b/src/core/lib/matchers/matchers.cc @@ -16,11 +16,14 @@ #include "src/core/lib/matchers/matchers.h" +#include + #include "absl/memory/memory.h" -#include "absl/strings/str_cat.h" +#include "absl/status/status.h" +#include "absl/strings/ascii.h" +#include "absl/strings/match.h" +#include "absl/strings/numbers.h" #include "absl/strings/str_format.h" -#include "absl/strings/str_join.h" -#include "absl/strings/str_split.h" namespace grpc_core { diff --git a/src/core/lib/matchers/matchers.h b/src/core/lib/matchers/matchers.h index 9889d688d06..efb6e692c1d 100644 --- a/src/core/lib/matchers/matchers.h +++ b/src/core/lib/matchers/matchers.h @@ -17,6 +17,8 @@ #include +#include + #include #include diff --git a/src/core/lib/resolver/resolver.cc b/src/core/lib/resolver/resolver.cc index e43e97b4a2f..5970d76e7a8 100644 --- a/src/core/lib/resolver/resolver.cc +++ b/src/core/lib/resolver/resolver.cc @@ -20,6 +20,10 @@ #include "src/core/lib/resolver/resolver.h" +#include + +#include "src/core/lib/channel/channel_args.h" + grpc_core::DebugOnlyTraceFlag grpc_trace_resolver_refcount(false, "resolver_refcount"); diff --git a/src/core/lib/resolver/resolver.h b/src/core/lib/resolver/resolver.h index f3e35eb68c6..7bb85b078e8 100644 --- a/src/core/lib/resolver/resolver.h +++ b/src/core/lib/resolver/resolver.h @@ -19,10 +19,13 @@ #include +#include + #include "absl/status/statusor.h" #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/resolver/server_address.h" diff --git a/src/core/lib/resolver/resolver_factory.h b/src/core/lib/resolver/resolver_factory.h index 877a438a092..488bf344506 100644 --- a/src/core/lib/resolver/resolver_factory.h +++ b/src/core/lib/resolver/resolver_factory.h @@ -19,11 +19,14 @@ #include +#include +#include + +#include "absl/strings/string_view.h" #include "absl/strings/strip.h" -#include +#include -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/resolver/resolver.h" diff --git a/src/core/lib/resolver/resolver_registry.cc b/src/core/lib/resolver/resolver_registry.cc index 8333bfd29e8..600fd915b86 100644 --- a/src/core/lib/resolver/resolver_registry.cc +++ b/src/core/lib/resolver/resolver_registry.cc @@ -18,19 +18,12 @@ #include "src/core/lib/resolver/resolver_registry.h" -#include - -#include - -#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include #include -#include - -#include "src/core/lib/resolver/resolver_registry.h" namespace grpc_core { diff --git a/src/core/lib/resolver/resolver_registry.h b/src/core/lib/resolver/resolver_registry.h index ab96aae7126..90d7579136b 100644 --- a/src/core/lib/resolver/resolver_registry.h +++ b/src/core/lib/resolver/resolver_registry.h @@ -19,9 +19,20 @@ #include -#include "src/core/lib/gprpp/memory.h" +#include +#include +#include +#include + +#include "absl/strings/string_view.h" + +#include + #include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/resolver/resolver.h" #include "src/core/lib/resolver/resolver_factory.h" +#include "src/core/lib/uri/uri_parser.h" namespace grpc_core { diff --git a/src/core/lib/resolver/server_address.cc b/src/core/lib/resolver/server_address.cc index 5ef62a4a3d8..6be0a8f4e25 100644 --- a/src/core/lib/resolver/server_address.cc +++ b/src/core/lib/resolver/server_address.cc @@ -20,16 +20,24 @@ #include "src/core/lib/resolver/server_address.h" +#include + +#include #include #include +#include #include +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "src/core/lib/address_utils/sockaddr_utils.h" +// IWYU pragma: no_include + namespace grpc_core { // diff --git a/src/core/lib/resolver/server_address.h b/src/core/lib/resolver/server_address.h index 8515dc08001..92e26cde21a 100644 --- a/src/core/lib/resolver/server_address.h +++ b/src/core/lib/resolver/server_address.h @@ -21,10 +21,17 @@ #include +#include +#include + #include #include +#include #include "absl/container/inlined_vector.h" +#include "absl/memory/memory.h" + +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" diff --git a/src/core/lib/security/authorization/authorization_policy_provider.h b/src/core/lib/security/authorization/authorization_policy_provider.h index 780a80d85ac..c5befcc3f46 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider.h +++ b/src/core/lib/security/authorization/authorization_policy_provider.h @@ -17,7 +17,14 @@ #include +#include "absl/strings/string_view.h" + +#include +#include + +#include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/dual_ref_counted.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/authorization/authorization_engine.h" struct grpc_authorization_policy_provider diff --git a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc index f8a4426ea41..cb36f9787d3 100644 --- a/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc +++ b/src/core/lib/security/authorization/authorization_policy_provider_vtable.cc @@ -15,7 +15,11 @@ #include #include +#include +#include +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" namespace { diff --git a/src/core/lib/security/authorization/cel_authorization_engine.cc b/src/core/lib/security/authorization/cel_authorization_engine.cc index 177c46f16be..6a9b9763ed4 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.cc +++ b/src/core/lib/security/authorization/cel_authorization_engine.cc @@ -16,9 +16,18 @@ #include "src/core/lib/security/authorization/cel_authorization_engine.h" +#include + +#include +#include + #include "absl/memory/memory.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "absl/types/span.h" +#include "upb/upb.h" -#include "src/core/lib/address_utils/sockaddr_utils.h" +#include namespace grpc_core { diff --git a/src/core/lib/security/authorization/cel_authorization_engine.h b/src/core/lib/security/authorization/cel_authorization_engine.h index 3c20478ff04..5f7ed45203d 100644 --- a/src/core/lib/security/authorization/cel_authorization_engine.h +++ b/src/core/lib/security/authorization/cel_authorization_engine.h @@ -28,10 +28,9 @@ #include "google/api/expr/v1alpha1/syntax.upb.h" #include "upb/upb.hpp" -#include - #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/mock_cel/activation.h" +#include "src/core/lib/security/authorization/mock_cel/cel_value.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc index b6a18fc6302..c1efb202f7b 100644 --- a/src/core/lib/security/authorization/evaluate_args.cc +++ b/src/core/lib/security/authorization/evaluate_args.cc @@ -16,13 +16,19 @@ #include "src/core/lib/security/authorization/evaluate_args.h" +#include "absl/status/statusor.h" +#include "absl/strings/match.h" #include "absl/strings/numbers.h" +#include +#include + #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" -#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/uri/uri_parser.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/evaluate_args.h b/src/core/lib/security/authorization/evaluate_args.h index 09e32bc74be..41a0a7f8e6b 100644 --- a/src/core/lib/security/authorization/evaluate_args.h +++ b/src/core/lib/security/authorization/evaluate_args.h @@ -17,13 +17,16 @@ #include -#include +#include +#include +#include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include + #include "src/core/lib/iomgr/endpoint.h" -#include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/lib/security/context/security_context.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/transport/metadata_batch.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.cc b/src/core/lib/security/authorization/grpc_authorization_engine.cc index 5278a3bc647..c13c8ed701e 100644 --- a/src/core/lib/security/authorization/grpc_authorization_engine.cc +++ b/src/core/lib/security/authorization/grpc_authorization_engine.cc @@ -16,6 +16,12 @@ #include "src/core/lib/security/authorization/grpc_authorization_engine.h" +#include +#include +#include + +#include "absl/memory/memory.h" + namespace grpc_core { GrpcAuthorizationEngine::GrpcAuthorizationEngine(Rbac policy) diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.h b/src/core/lib/security/authorization/grpc_authorization_engine.h index f50a69170ce..937cdd21aba 100644 --- a/src/core/lib/security/authorization/grpc_authorization_engine.h +++ b/src/core/lib/security/authorization/grpc_authorization_engine.h @@ -17,7 +17,14 @@ #include +#include + +#include +#include +#include + #include "src/core/lib/security/authorization/authorization_engine.h" +#include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/matchers.h" #include "src/core/lib/security/authorization/rbac_policy.h" diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc index 877ab957339..8ede541cce4 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc @@ -16,12 +16,26 @@ #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" +#include + +#include + +#include "absl/memory/memory.h" + #include +#include +#include +#include +#include #include +#include +#include "src/core/lib/debug/trace.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/authorization/grpc_authorization_engine.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h index 1d59252c787..3c5fa0fa6e6 100644 --- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h +++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h @@ -18,11 +18,20 @@ #include #include +#include +#include "absl/base/thread_annotations.h" +#include "absl/status/status.h" #include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/rbac_translator.h" diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.cc b/src/core/lib/security/authorization/grpc_server_authz_filter.cc index 96469436e85..3166bf91f22 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.cc +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.cc @@ -16,10 +16,22 @@ #include "src/core/lib/security/authorization/grpc_server_authz_filter.h" +#include +#include +#include + +#include "absl/status/status.h" #include "absl/strings/str_join.h" +#include "absl/strings/string_view.h" + +#include +#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" +#include "src/core/lib/debug/trace.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" +#include "src/core/lib/security/authorization/authorization_engine.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h index d3c3768e32b..1efaa554540 100644 --- a/src/core/lib/security/authorization/grpc_server_authz_filter.h +++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h @@ -17,9 +17,20 @@ #include -#include "src/core/lib/channel/channel_stack.h" +#include "absl/status/statusor.h" + +#include + +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/promise_based_filter.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/authorization/authorization_policy_provider.h" +#include "src/core/lib/security/authorization/evaluate_args.h" +#include "src/core/lib/security/context/security_context.h" +#include "src/core/lib/transport/transport.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/matchers.cc b/src/core/lib/security/authorization/matchers.cc index 6b3e0092463..df07b8ee2d6 100644 --- a/src/core/lib/security/authorization/matchers.cc +++ b/src/core/lib/security/authorization/matchers.cc @@ -16,10 +16,18 @@ #include "src/core/lib/security/authorization/matchers.h" +#include +#include + +#include "absl/memory/memory.h" +#include "absl/strings/string_view.h" + #include +#include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/iomgr/error.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/matchers.h b/src/core/lib/security/authorization/matchers.h index a64d6b20b15..87c9786a1af 100644 --- a/src/core/lib/security/authorization/matchers.h +++ b/src/core/lib/security/authorization/matchers.h @@ -17,8 +17,15 @@ #include +#include + #include +#include +#include + +#include "absl/types/optional.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/rbac_policy.h" diff --git a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h index 74f2288ceb8..b43689b6bb4 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h +++ b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h @@ -21,6 +21,7 @@ #include "absl/memory/memory.h" +#include "src/core/lib/security/authorization/mock_cel/cel_expression.h" #include "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/mock_cel/cel_expression.h b/src/core/lib/security/authorization/mock_cel/cel_expression.h index 82ece385e72..941f50d74ef 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_expression.h +++ b/src/core/lib/security/authorization/mock_cel/cel_expression.h @@ -20,6 +20,7 @@ #include #include +#include "absl/status/status.h" #include "absl/status/statusor.h" #include "google/api/expr/v1alpha1/syntax.upb.h" diff --git a/src/core/lib/security/authorization/mock_cel/cel_value.h b/src/core/lib/security/authorization/mock_cel/cel_value.h index 22d23243160..34006de62b0 100644 --- a/src/core/lib/security/authorization/mock_cel/cel_value.h +++ b/src/core/lib/security/authorization/mock_cel/cel_value.h @@ -32,7 +32,11 @@ #include +#include + #include +#include +#include #include "absl/memory/memory.h" #include "absl/strings/string_view.h" diff --git a/src/core/lib/security/authorization/mock_cel/evaluator_core.h b/src/core/lib/security/authorization/mock_cel/evaluator_core.h index 1cf99159b73..20059bc2b50 100644 --- a/src/core/lib/security/authorization/mock_cel/evaluator_core.h +++ b/src/core/lib/security/authorization/mock_cel/evaluator_core.h @@ -17,9 +17,8 @@ #include -#include #include -#include +#include #include "absl/status/statusor.h" #include "google/api/expr/v1alpha1/syntax.upb.h" diff --git a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h index 255f0031624..6a148ffec76 100644 --- a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h +++ b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h @@ -18,7 +18,16 @@ #include #include +#include +#include +#include +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "google/api/expr/v1alpha1/syntax.upb.h" + +#include "src/core/lib/security/authorization/mock_cel/cel_expression.h" #include "src/core/lib/security/authorization/mock_cel/evaluator_core.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/rbac_policy.cc b/src/core/lib/security/authorization/rbac_policy.cc index f43eefc1dc0..a152aebdef8 100644 --- a/src/core/lib/security/authorization/rbac_policy.cc +++ b/src/core/lib/security/authorization/rbac_policy.cc @@ -16,6 +16,11 @@ #include "src/core/lib/security/authorization/rbac_policy.h" +#include +#include +#include + +#include "absl/memory/memory.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" diff --git a/src/core/lib/security/authorization/rbac_policy.h b/src/core/lib/security/authorization/rbac_policy.h index df26ba56cdd..52af3569296 100644 --- a/src/core/lib/security/authorization/rbac_policy.h +++ b/src/core/lib/security/authorization/rbac_policy.h @@ -17,7 +17,14 @@ #include +#include + +#include #include +#include +#include + +#include "absl/types/optional.h" #include "src/core/lib/matchers/matchers.h" diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc index 05034d72db9..8016b445a6a 100644 --- a/src/core/lib/security/authorization/rbac_translator.cc +++ b/src/core/lib/security/authorization/rbac_translator.cc @@ -16,11 +16,26 @@ #include "src/core/lib/security/authorization/rbac_translator.h" +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/strip.h" #include "src/core/lib/gpr/useful.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/json/json.h" #include "src/core/lib/matchers/matchers.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/rbac_translator.h b/src/core/lib/security/authorization/rbac_translator.h index 4adab7dc0e3..28803becf26 100644 --- a/src/core/lib/security/authorization/rbac_translator.h +++ b/src/core/lib/security/authorization/rbac_translator.h @@ -18,8 +18,8 @@ #include #include "absl/status/statusor.h" +#include "absl/strings/string_view.h" -#include "src/core/lib/json/json.h" #include "src/core/lib/security/authorization/rbac_policy.h" namespace grpc_core { diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 903bcb0ed8b..4f62a7df54c 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -22,16 +22,19 @@ #include +#include + #include #include #include #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/lib/channel/context.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/call.h" diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h index f1d2fc2ab03..965f651975a 100644 --- a/src/core/lib/security/context/security_context.h +++ b/src/core/lib/security/context/security_context.h @@ -21,11 +21,23 @@ #include +#include + +#include + +#include "absl/strings/string_view.h" + +#include +#include +#include + +#include "src/core/lib/debug/trace.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/resource_quota/arena.h" -#include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/credentials/credentials.h" // IWYU pragma: keep extern grpc_core::DebugOnlyTraceFlag grpc_trace_auth_context_refcount; diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc index 3b0a8f8d076..070ab4ffb84 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.cc +++ b/src/core/lib/security/credentials/alts/alts_credentials.cc @@ -20,14 +20,16 @@ #include "src/core/lib/security/credentials/alts/alts_credentials.h" -#include +#include + +#include "absl/strings/string_view.h" #include #include -#include #include #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" +#include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" #define GRPC_ALTS_HANDSHAKER_SERVICE_URL "metadata.google.internal.:8080" diff --git a/src/core/lib/security/credentials/alts/alts_credentials.h b/src/core/lib/security/credentials/alts/alts_credentials.h index 86b2dd8ac05..d36ef45c407 100644 --- a/src/core/lib/security/credentials/alts/alts_credentials.h +++ b/src/core/lib/security/credentials/alts/alts_credentials.h @@ -21,10 +21,15 @@ #include +#include #include +#include -#include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/security_connector.h" /* Main struct for grpc ALTS channel credential. */ class grpc_alts_credentials final : public grpc_channel_credentials { diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc index 118d18d1191..c348c0380fa 100644 --- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc +++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc @@ -18,9 +18,7 @@ #include -#include -#include - +#include #include #include #include diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc index 72c654211f1..7d7c43a29bd 100644 --- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc +++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc @@ -18,11 +18,8 @@ #include -#include -#include - +#include #include -#include #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" #include "src/core/tsi/alts/handshaker/transport_security_common_api.h" diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc index 1842375c1c4..d00b0feb0b2 100644 --- a/src/core/lib/security/credentials/call_creds_util.cc +++ b/src/core/lib/security/credentials/call_creds_util.cc @@ -18,11 +18,19 @@ #include "src/core/lib/security/credentials/call_creds_util.h" +#include + #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" +#include #include +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/security/context/security_context.h" +#include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/lib/transport/metadata_batch.h" + namespace grpc_core { namespace { diff --git a/src/core/lib/security/credentials/call_creds_util.h b/src/core/lib/security/credentials/call_creds_util.h index 30b70dad97c..75b6e83c5f6 100644 --- a/src/core/lib/security/credentials/call_creds_util.h +++ b/src/core/lib/security/credentials/call_creds_util.h @@ -24,6 +24,7 @@ #include #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/transport/transport.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/channel_creds_registry.h b/src/core/lib/security/credentials/channel_creds_registry.h index bd96f67e1c9..17254967810 100644 --- a/src/core/lib/security/credentials/channel_creds_registry.h +++ b/src/core/lib/security/credentials/channel_creds_registry.h @@ -19,7 +19,12 @@ #include -#include +#include +#include +#include +#include + +#include "absl/strings/string_view.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/json/json.h" diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc index 09ec4191bc4..0ef12f6a59b 100644 --- a/src/core/lib/security/credentials/channel_creds_registry_init.cc +++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc @@ -18,8 +18,18 @@ #include +#include + +#include "absl/memory/memory.h" +#include "absl/strings/string_view.h" + +#include +#include + #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/json/json.h" +#include "src/core/lib/security/credentials/channel_creds_registry.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc index 4981e41f893..ccee7779ca5 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -20,19 +20,20 @@ #include "src/core/lib/security/credentials/composite/composite_credentials.h" +#include #include -#include #include #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" +#include "absl/strings/string_view.h" -#include #include -#include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/iomgr/polling_entity.h" +#include "src/core/lib/promise/detail/basic_seq.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/try_seq.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h index 3977e91fddd..8fac9c59a27 100644 --- a/src/core/lib/security/credentials/composite/composite_credentials.h +++ b/src/core/lib/security/credentials/composite/composite_credentials.h @@ -18,15 +18,27 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H - #include #include +#include #include "absl/container/inlined_vector.h" +#include "absl/status/statusor.h" + +#include +#include +#include +#include +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/lib/transport/transport.h" /* -- Composite channel credentials. -- */ diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 0c225794de5..986d8adf0ee 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -20,19 +20,15 @@ #include "src/core/lib/security/credentials/credentials.h" -#include +#include #include -#include #include -#include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/iomgr/executor.h" -#include "src/core/lib/json/json.h" +#include "src/core/lib/debug/trace.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/api_trace.h" /* -- Common. -- */ diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h index ae55a1e72d0..ec04278a963 100644 --- a/src/core/lib/security/credentials/credentials.h +++ b/src/core/lib/security/credentials/credentials.h @@ -21,26 +21,28 @@ #include -#include - #include +#include +#include + +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" #include #include -#include +#include +#include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/promise/arena_promise.h" -#include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/lib/slice/slice.h" #include "src/core/lib/transport/transport.h" -struct grpc_http_response; - /* --- Constants. --- */ typedef enum { diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index 80fa753bdb5..aff56c99add 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc @@ -17,14 +17,32 @@ #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h" +#include + +#include +#include + +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include "absl/strings/str_join.h" #include "absl/strings/str_replace.h" +#include "absl/strings/string_view.h" +#include +#include +#include +#include #include #include "src/core/lib/gpr/env.h" +#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/http/httpcli_ssl_credentials.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/json/json.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/uri/uri_parser.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h index ef29b0f3ae4..86177501897 100644 --- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h @@ -19,6 +19,16 @@ #include +#include +#include +#include +#include + +#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/http/httpcli.h" +#include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/aws_request_signer.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" diff --git a/src/core/lib/security/credentials/external/aws_request_signer.cc b/src/core/lib/security/credentials/external/aws_request_signer.cc index bc4920f3ffb..c4e5fc85426 100644 --- a/src/core/lib/security/credentials/external/aws_request_signer.cc +++ b/src/core/lib/security/credentials/external/aws_request_signer.cc @@ -17,14 +17,23 @@ #include "src/core/lib/security/credentials/external/aws_request_signer.h" +#include +#include +#include + +#include +#include #include #include +#include "absl/status/statusor.h" #include "absl/strings/ascii.h" #include "absl/strings/escaping.h" +#include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" #include "absl/time/clock.h" #include "absl/time/time.h" diff --git a/src/core/lib/security/credentials/external/external_account_credentials.cc b/src/core/lib/security/credentials/external/external_account_credentials.cc index e0fac627ebc..f3fdec6588d 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/external_account_credentials.cc @@ -18,6 +18,15 @@ #include "src/core/lib/security/credentials/external/external_account_credentials.h" +#include + +#include +#include +#include +#include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/match.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" @@ -26,15 +35,21 @@ #include "absl/time/clock.h" #include "absl/time/time.h" +#include +#include +#include +#include #include #include "src/core/lib/http/httpcli_ssl_credentials.h" #include "src/core/lib/http/parser.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h" #include "src/core/lib/security/credentials/external/file_external_account_credentials.h" #include "src/core/lib/security/credentials/external/url_external_account_credentials.h" #include "src/core/lib/security/util/json_util.h" #include "src/core/lib/slice/b64.h" +#include "src/core/lib/uri/uri_parser.h" #define EXTERNAL_ACCOUNT_CREDENTIALS_GRANT_TYPE \ "urn:ietf:params:oauth:grant-type:token-exchange" diff --git a/src/core/lib/security/credentials/external/external_account_credentials.h b/src/core/lib/security/credentials/external/external_account_credentials.h index c31294d97f3..41ab6cd4f3b 100644 --- a/src/core/lib/security/credentials/external/external_account_credentials.h +++ b/src/core/lib/security/credentials/external/external_account_credentials.h @@ -19,9 +19,20 @@ #include +#include #include #include +#include "absl/strings/string_view.h" + +#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/time.h" +#include "src/core/lib/http/httpcli.h" +#include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/json/json.h" #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc index e729ea572c8..40eba0a84e8 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc @@ -17,10 +17,17 @@ #include "src/core/lib/security/credentials/external/file_external_account_credentials.h" -#include +#include +#include + +#include "absl/strings/string_view.h" + +#include #include "src/core/lib/iomgr/load_file.h" +#include "src/core/lib/json/json.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h index 23a6b6d6f98..591b754882b 100644 --- a/src/core/lib/security/credentials/external/file_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h @@ -19,6 +19,12 @@ #include +#include +#include +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.cc b/src/core/lib/security/credentials/external/url_external_account_credentials.cc index 6bba9084633..986820f02ca 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.cc +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.cc @@ -17,13 +17,29 @@ #include "src/core/lib/security/credentials/external/url_external_account_credentials.h" +#include + +#include +#include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" +#include +#include +#include +#include #include #include "src/core/lib/http/httpcli_ssl_credentials.h" +#include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/json/json.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/transport/error_utils.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h index ac07fca386a..6b625fb52e5 100644 --- a/src/core/lib/security/credentials/external/url_external_account_credentials.h +++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h @@ -19,7 +19,17 @@ #include +#include +#include +#include +#include + +#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/http/httpcli.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" +#include "src/core/lib/uri/uri_parser.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index ebb5a1289ae..d25694c2157 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -20,17 +20,19 @@ #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include +#include -#include -#include -#include +#include + +#include "absl/strings/string_view.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/iomgr/executor.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/security_connector/fake/fake_security_connector.h" +#include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/lib/transport/metadata_batch.h" /* -- Fake transport security credentials. -- */ diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h index 032194376b6..37aa9d96426 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.h +++ b/src/core/lib/security/credentials/fake/fake_credentials.h @@ -21,9 +21,21 @@ #include -#include +#include +#include "absl/status/statusor.h" + +#include +#include +#include +#include + +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/transport/transport.h" #define GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS \ "grpc.fake_security.expected_targets" diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.cc b/src/core/lib/security/credentials/google_default/credentials_generic.cc index 1b56824db0f..0817fdbf330 100644 --- a/src/core/lib/security/credentials/google_default/credentials_generic.cc +++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc @@ -26,6 +26,7 @@ #include #include "src/core/lib/gpr/env.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/google_default/google_default_credentials.h" std::string grpc_get_well_known_google_credentials_file_path_impl(void) { diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 07d5af311ab..0e1b789baf9 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -22,9 +22,18 @@ #include +#include +#include +#include + +#include "absl/status/statusor.h" #include "absl/strings/match.h" +#include "absl/strings/string_view.h" #include "absl/strings/strip.h" +#include // IWYU pragma: keep +#include +#include #include #include #include @@ -32,22 +41,29 @@ #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" #include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/env.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/gprpp/time.h" #include "src/core/lib/http/httpcli.h" #include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/iomgr/polling_entity.h" -#include "src/core/lib/security/credentials/alts/alts_credentials.h" +#include "src/core/lib/iomgr/pollset.h" +#include "src/core/lib/json/json.h" #include "src/core/lib/security/credentials/alts/check_gcp_environment.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/external/external_account_credentials.h" +#include "src/core/lib/security/credentials/jwt/json_token.h" #include "src/core/lib/security/credentials/jwt/jwt_credentials.h" #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/uri/uri_parser.h" diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h index 0a4016a33c8..4c08df16558 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.h +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h @@ -18,11 +18,20 @@ #ifndef GRPC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H #define GRPC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H - #include +#include + +#include +#include +#include + +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/security_connector.h" #define GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY "gcloud" #define GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE \ diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc index 95ee77f6e27..d255cd3d258 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -20,16 +20,22 @@ #include "src/core/lib/security/credentials/iam/iam_credentials.h" +#include + +#include + #include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" -#include #include -#include -#include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/surface/api_trace.h" +#include "src/core/lib/transport/metadata_batch.h" grpc_core::ArenaPromise> grpc_google_iam_credentials::GetRequestMetadata( diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h index 4d42df3ba24..f0c83af549e 100644 --- a/src/core/lib/security/credentials/iam/iam_credentials.h +++ b/src/core/lib/security/credentials/iam/iam_credentials.h @@ -23,7 +23,17 @@ #include +#include "absl/status/statusor.h" +#include "absl/types/optional.h" + +#include + +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/transport/transport.h" class grpc_google_iam_credentials : public grpc_call_credentials { public: diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.cc b/src/core/lib/security/credentials/insecure/insecure_credentials.cc index 90916898f37..e6f7b62fcc4 100644 --- a/src/core/lib/security/credentials/insecure/insecure_credentials.cc +++ b/src/core/lib/security/credentials/insecure/insecure_credentials.cc @@ -20,6 +20,10 @@ #include "src/core/lib/security/credentials/insecure/insecure_credentials.h" +#include + +#include "absl/strings/string_view.h" + #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.h b/src/core/lib/security/credentials/insecure/insecure_credentials.h index be947cd95ad..2ee57800de2 100644 --- a/src/core/lib/security/credentials/insecure/insecure_credentials.h +++ b/src/core/lib/security/credentials/insecure/insecure_credentials.h @@ -21,9 +21,14 @@ #include +#include #include +#include +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/security_connector.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/jwt/json_token.cc b/src/core/lib/security/credentials/jwt/json_token.cc index b57ca7b2094..e6f5e4aa412 100644 --- a/src/core/lib/security/credentials/jwt/json_token.cc +++ b/src/core/lib/security/credentials/jwt/json_token.cc @@ -20,19 +20,22 @@ #include "src/core/lib/security/credentials/jwt/json_token.h" +#include #include +#include +#include + #include #include #include +#include #include #include #include -#include #include -#include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/util/json_util.h" #include "src/core/lib/slice/b64.h" diff --git a/src/core/lib/security/credentials/jwt/json_token.h b/src/core/lib/security/credentials/jwt/json_token.h index 163cc3d76a4..cfc7138e5f0 100644 --- a/src/core/lib/security/credentials/jwt/json_token.h +++ b/src/core/lib/security/credentials/jwt/json_token.h @@ -21,9 +21,9 @@ #include -#include +#include -#include +#include #include "src/core/lib/json/json.h" diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc index 2e6c6cbf209..b4ff3f23440 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -21,10 +21,13 @@ #include "src/core/lib/security/credentials/jwt/jwt_credentials.h" #include -#include +#include +#include #include +#include +#include "absl/status/status.h" #include "absl/strings/str_cat.h" #include @@ -32,13 +35,16 @@ #include #include -#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/json/json.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/credentials/call_creds_util.h" -#include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/api_trace.h" -#include "src/core/lib/transport/error_utils.h" +#include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/uri/uri_parser.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h index d873ba0e72a..226a95a6577 100644 --- a/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -21,15 +21,29 @@ #include +#include + #include +#include "absl/status/statusor.h" #include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" #include "absl/time/time.h" +#include "absl/types/optional.h" +#include +#include +#include #include +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/jwt/json_token.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/transport/transport.h" class grpc_service_account_jwt_access_credentials : public grpc_call_credentials { diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 75e68766026..6e91c7a83dd 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -21,24 +21,49 @@ #include "src/core/lib/security/credentials/jwt/jwt_verifier.h" #include +#include #include +#include +#include +#include +#include +#include + +#include #include +#include +#include #include #include +#include + +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include +#include #include #include #include -#include +#include #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/manual_constructor.h" +#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/http/httpcli.h" #include "src/core/lib/http/httpcli_ssl_credentials.h" +#include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/polling_entity.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/b64.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" +#include "src/core/lib/uri/uri_parser.h" #include "src/core/tsi/ssl_types.h" using grpc_core::Json; diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h index 85883db9b4d..4f695ae2cb8 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.h +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h @@ -21,9 +21,11 @@ #include -#include -#include +#include +#include + +#include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/json/json.h" diff --git a/src/core/lib/security/credentials/local/local_credentials.cc b/src/core/lib/security/credentials/local/local_credentials.cc index 2d4d4c6e3d1..7596ade6b01 100644 --- a/src/core/lib/security/credentials/local/local_credentials.cc +++ b/src/core/lib/security/credentials/local/local_credentials.cc @@ -20,11 +20,12 @@ #include "src/core/lib/security/credentials/local/local_credentials.h" +#include + +#include "absl/strings/string_view.h" + #include -#include -#include -#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/security/security_connector/local/local_security_connector.h" grpc_core::RefCountedPtr diff --git a/src/core/lib/security/credentials/local/local_credentials.h b/src/core/lib/security/credentials/local/local_credentials.h index 187d23a69a9..5afb0527249 100644 --- a/src/core/lib/security/credentials/local/local_credentials.h +++ b/src/core/lib/security/credentials/local/local_credentials.h @@ -21,9 +21,16 @@ #include +#include #include +#include +#include +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/security_connector.h" /* Main class for grpc local channel credential. */ class grpc_local_credentials final : public grpc_channel_credentials { diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index aa182773409..9f94a233dee 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -20,34 +20,48 @@ #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h" +#include #include +#include #include +#include +#include +#include #include "absl/container/inlined_vector.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" +#include "absl/strings/string_view.h" +#include #include -#include +#include #include #include #include #include +#include -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/debug/trace.h" +#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/http/httpcli_ssl_credentials.h" #include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" +#include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/json/json.h" +#include "src/core/lib/promise/context.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/util/json_util.h" -#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/lib/uri/uri_parser.h" diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index 4b4c8e6e52b..5ecfd80d89b 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -21,14 +21,34 @@ #include +#include #include +#include + +#include "absl/status/statusor.h" +#include "absl/types/optional.h" #include +#include +#include +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/time.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/http/httpcli.h" +#include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/json/json.h" +#include "src/core/lib/promise/activity.h" +#include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/transport/transport.h" #include "src/core/lib/uri/uri_parser.h" // Constants. diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc index 99206ae1b71..467bbfc83fc 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -20,24 +20,25 @@ #include "src/core/lib/security/credentials/plugin/plugin_credentials.h" -#include - #include +#include +#include "absl/status/status.h" #include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" -#include +#include #include #include -#include -#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/promise/promise.h" -#include "src/core/lib/security/credentials/plugin/plugin_credentials.h" +#include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/validate_metadata.h" +#include "src/core/lib/transport/metadata_batch.h" grpc_core::TraceFlag grpc_plugin_credentials_trace(false, "plugin_credentials"); diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h index 6d5d5c44921..74f140b319b 100644 --- a/src/core/lib/security/credentials/plugin/plugin_credentials.h +++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h @@ -21,8 +21,32 @@ #include +#include + +#include +#include +#include + +#include "absl/container/inlined_vector.h" +#include "absl/status/statusor.h" + +#include +#include +#include +#include + +#include "src/core/lib/debug/trace.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/lib/promise/activity.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/security/credentials/call_creds_util.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/slice/slice_refcount.h" +#include "src/core/lib/transport/transport.h" extern grpc_core::TraceFlag grpc_plugin_credentials_trace; diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index c35e55f50a8..bc697c8f9ac 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -22,11 +22,16 @@ #include +#include + +#include "absl/strings/string_view.h" + #include #include #include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/debug/trace.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/tsi/ssl_transport_security.h" diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h index 64d88ef8aec..b3df60f255c 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -20,8 +20,21 @@ #include +#include + +#include +#include +#include +#include +#include + +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h" +#include "src/core/tsi/ssl_transport_security.h" class grpc_ssl_credentials : public grpc_channel_credentials { public: diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc index 19db4556b35..6896337d44c 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc @@ -18,12 +18,10 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" -#include -#include +#include "absl/container/inlined_vector.h" -#include +#include #include -#include void grpc_tls_certificate_distributor::SetKeyMaterials( const std::string& cert_name, absl::optional pem_root_certs, diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h index b0bc58ca1dc..27c82836977 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h @@ -19,14 +19,20 @@ #include +#include +#include +#include +#include +#include #include -#include "absl/container/inlined_vector.h" +#include "absl/base/thread_annotations.h" +#include "absl/strings/string_view.h" #include "absl/types/optional.h" -#include - #include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/ssl_utils.h" struct grpc_tls_identity_pairs { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc index c49cbfa50b8..5d619a609cb 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc @@ -18,14 +18,32 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" -#include +#include +#include -#include +#include + +#include +#include +#include +#include +#include + +#include "absl/container/inlined_vector.h" +#include "absl/status/status.h" + +#include +#include #include -#include +#include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/stat.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/surface/api_trace.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h index 598473c87af..d1fc0eb5f20 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h @@ -19,20 +19,25 @@ #include -#include +#include +#include -#include "absl/container/inlined_vector.h" +#include "absl/base/thread_annotations.h" #include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" #include +#include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/iomgr/pollset_set.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/security_connector/ssl_utils.h" diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc index 556a7bac82f..c73729ce852 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc @@ -18,14 +18,21 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" +#include + +#include +#include + +#include "absl/strings/string_view.h" + #include #include #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/stat.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" -#include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/api_trace.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h index ecf406b7fd8..85d0d52b634 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h +++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h @@ -19,21 +19,20 @@ #include -#include +#include +#include +#include "absl/base/thread_annotations.h" #include "absl/status/status.h" #include +#include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted.h" -#include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/iomgr/pollset_set.h" -#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" -#include "src/core/lib/security/security_connector/ssl_utils.h" // An abstraction of the verifier that all verifier subclasses should extend. struct grpc_tls_certificate_verifier diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc index 6adafa407a1..3f3be975d89 100644 --- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc @@ -20,14 +20,13 @@ #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" -#include -#include - -#include #include -#include +#include "src/core/lib/debug/trace.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/api_trace.h" +#include "src/core/tsi/ssl_transport_security.h" /** -- Wrapper APIs declared in grpc_security.h -- **/ diff --git a/src/core/lib/security/credentials/tls/tls_credentials.cc b/src/core/lib/security/credentials/tls/tls_credentials.cc index ab2742001cb..fe7223b87ce 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.cc +++ b/src/core/lib/security/credentials/tls/tls_credentials.cc @@ -21,15 +21,20 @@ #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include +#include + +#include "absl/strings/string_view.h" #include -#include +#include #include -#include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/useful.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" +#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" +#include "src/core/tsi/ssl_transport_security.h" namespace { diff --git a/src/core/lib/security/credentials/tls/tls_credentials.h b/src/core/lib/security/credentials/tls/tls_credentials.h index 4356ca750bf..0915044b18b 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.h +++ b/src/core/lib/security/credentials/tls/tls_credentials.h @@ -21,10 +21,14 @@ #include +#include #include +#include +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" +#include "src/core/lib/security/security_connector/security_connector.h" class TlsCredentials final : public grpc_channel_credentials { public: diff --git a/src/core/lib/security/credentials/tls/tls_utils.cc b/src/core/lib/security/credentials/tls/tls_utils.cc index 2dcc19741cb..97642c61cd2 100644 --- a/src/core/lib/security/credentials/tls/tls_utils.cc +++ b/src/core/lib/security/credentials/tls/tls_utils.cc @@ -24,6 +24,8 @@ #include "absl/strings/match.h" #include "absl/strings/str_cat.h" +#include + namespace grpc_core { // Based on diff --git a/src/core/lib/security/credentials/tls/tls_utils.h b/src/core/lib/security/credentials/tls/tls_utils.h index 31a7f32e082..ad11b95b1c0 100644 --- a/src/core/lib/security/credentials/tls/tls_utils.h +++ b/src/core/lib/security/credentials/tls/tls_utils.h @@ -26,7 +26,7 @@ #include "absl/strings/string_view.h" -#include "src/core/lib/security/context/security_context.h" +#include namespace grpc_core { diff --git a/src/core/lib/security/credentials/xds/xds_credentials.cc b/src/core/lib/security/credentials/xds/xds_credentials.cc index 680177ffcde..c71756b49bf 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.cc +++ b/src/core/lib/security/credentials/xds/xds_credentials.cc @@ -20,12 +20,19 @@ #include "src/core/lib/security/credentials/xds/xds_credentials.h" +#include "absl/strings/string_view.h" + +#include +#include + #include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/ext/xds/xds_certificate_provider.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" #include "src/core/lib/security/credentials/tls/tls_utils.h" -#include "src/core/lib/uri/uri_parser.h" namespace grpc_core { diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h index 573c98f4bcf..cc6a2d1f2ce 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.h +++ b/src/core/lib/security/credentials/xds/xds_credentials.h @@ -21,12 +21,26 @@ #include +#include + +#include +#include +#include +#include + +#include "absl/status/status.h" + +#include #include +#include #include "src/core/ext/xds/xds_certificate_provider.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/matchers/matchers.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" +#include "src/core/lib/security/security_connector/security_connector.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc index 9590698165a..c85aab1c292 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -20,19 +20,39 @@ #include "src/core/lib/security/security_connector/alts/alts_security_connector.h" -#include #include +#include +#include + +#include "absl/status/status.h" +#include "absl/strings/string_view.h" + #include +#include +#include +#include #include #include #include +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" +#include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/alts/alts_credentials.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/transport/security_handshaker.h" -#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" +#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.h b/src/core/lib/security/security_connector/alts/alts_security_connector.h index 9fafca2d34a..a95797611aa 100644 --- a/src/core/lib/security/security_connector/alts/alts_security_connector.h +++ b/src/core/lib/security/security_connector/alts/alts_security_connector.h @@ -18,12 +18,15 @@ #ifndef GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_ALTS_ALTS_SECURITY_CONNECTOR_H #define GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_ALTS_ALTS_SECURITY_CONNECTOR_H - #include -#include "src/core/lib/security/context/security_context.h" -#include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h" +#include +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/tsi/alts/handshaker/transport_security_common_api.h" +#include "src/core/tsi/transport_security_interface.h" #define GRPC_ALTS_TRANSPORT_SECURITY_TYPE "alts" diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc index b751ff75b05..8efc8c5a7dd 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -20,10 +20,16 @@ #include "src/core/lib/security/security_connector/fake/fake_security_connector.h" -#include +#include +#include +#include + +#include "absl/status/status.h" #include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include #include #include #include @@ -31,8 +37,17 @@ #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" @@ -40,6 +55,7 @@ #include "src/core/lib/security/transport/security_handshaker.h" #include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/fake_transport_security.h" +#include "src/core/tsi/transport_security_interface.h" namespace { class grpc_fake_channel_security_connector final diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.h b/src/core/lib/security/security_connector/fake/fake_security_connector.h index a2c6ec8a3bb..da7290654f4 100644 --- a/src/core/lib/security/security_connector/fake/fake_security_connector.h +++ b/src/core/lib/security/security_connector/fake/fake_security_connector.h @@ -18,14 +18,14 @@ #ifndef GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_FAKE_FAKE_SECURITY_CONNECTOR_H #define GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_FAKE_FAKE_SECURITY_CONNECTOR_H - #include +#include #include +#include #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/transport/handshaker.h" /* Creates a fake connector that emulates real channel security. */ grpc_core::RefCountedPtr diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc index 4fc0df7728f..ce72f2560c9 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc @@ -20,8 +20,17 @@ #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h" +#include + +#include +#include + +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" +#include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/transport/security_handshaker.h" #include "src/core/tsi/local_transport_security.h" diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h index 2b716bcb0fc..1749c4fa975 100644 --- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h +++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h @@ -18,12 +18,27 @@ #ifndef GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H #define GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H - #include -#include "src/core/lib/security/context/security_context.h" +#include + +#include "absl/status/status.h" +#include "absl/strings/string_view.h" + +#include +#include +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/lib/transport/handshaker.h" +#include "src/core/tsi/transport_security_interface.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/load_system_roots_fallback.cc b/src/core/lib/security/security_connector/load_system_roots_fallback.cc index 5d128ea96f7..adef3cd14a2 100644 --- a/src/core/lib/security/security_connector/load_system_roots_fallback.cc +++ b/src/core/lib/security/security_connector/load_system_roots_fallback.cc @@ -18,13 +18,14 @@ #include +#if !defined(GPR_LINUX) && !defined(GPR_ANDROID) && !defined(GPR_FREEBSD) && \ + !defined(GPR_APPLE) + +#include #include #include "src/core/lib/security/security_connector/load_system_roots.h" -#if !defined(GPR_LINUX) && !defined(GPR_ANDROID) && !defined(GPR_FREEBSD) && \ - !defined(GPR_APPLE) - namespace grpc_core { grpc_slice LoadSystemRootCerts() { return grpc_empty_slice(); } diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc index 125a62ee785..b9b0aa85864 100644 --- a/src/core/lib/security/security_connector/load_system_roots_supported.cc +++ b/src/core/lib/security/security_connector/load_system_roots_supported.cc @@ -18,33 +18,29 @@ #include -#include "src/core/lib/security/security_connector/load_system_roots_supported.h" - -#include - #if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \ defined(GPR_APPLE) #include #include -#include +#include #include #include #include -#include #include #include "absl/container/inlined_vector.h" #include #include -#include -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/global_config.h" +#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/security_connector/load_system_roots.h" +#include "src/core/lib/security/security_connector/load_system_roots_supported.h" GPR_GLOBAL_CONFIG_DEFINE_STRING(grpc_system_ssl_roots_dir, "", "Custom directory to SSL Roots"); diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc index f97299d03c0..be322d7406c 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -20,10 +20,17 @@ #include "src/core/lib/security/security_connector/local/local_security_connector.h" -#include #include +#include +#include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" + #include +#include #include #include #include @@ -32,17 +39,29 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/iomgr/pollset.h" -#include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" +#include "src/core/lib/security/context/security_context.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/local/local_credentials.h" #include "src/core/lib/security/transport/security_handshaker.h" +#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/uri/uri_parser.h" #include "src/core/tsi/local_transport_security.h" +#include "src/core/tsi/transport_security.h" +#include "src/core/tsi/transport_security_interface.h" #define GRPC_UDS_URI_PATTERN "unix:" #define GRPC_ABSTRACT_UDS_URI_PATTERN "unix-abstract:" diff --git a/src/core/lib/security/security_connector/local/local_security_connector.h b/src/core/lib/security/security_connector/local/local_security_connector.h index 6eee0ca9a6c..6e29951d9c2 100644 --- a/src/core/lib/security/security_connector/local/local_security_connector.h +++ b/src/core/lib/security/security_connector/local/local_security_connector.h @@ -18,10 +18,14 @@ #ifndef GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOCAL_LOCAL_SECURITY_CONNECTOR_H #define GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOCAL_LOCAL_SECURITY_CONNECTOR_H - #include -#include "src/core/lib/security/context/security_context.h" +#include +#include +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/security/security_connector/security_connector.h" /** * This method creates a local channel security connector. diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index cf161e6c746..d175c4cf634 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -20,18 +20,16 @@ #include "src/core/lib/security/security_connector/security_connector.h" -#include -#include +#include + +#include + #include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/security/context/security_context.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/security/transport/security_handshaker.h" -#include "src/core/lib/transport/handshaker.h" grpc_core::DebugOnlyTraceFlag grpc_trace_security_connector_refcount( false, "security_connector_refcount"); diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h index be0d6a501be..437c4b2078a 100644 --- a/src/core/lib/security/security_connector/security_connector.h +++ b/src/core/lib/security/security_connector/security_connector.h @@ -21,14 +21,22 @@ #include -#include +#include +#include "absl/status/status.h" +#include "absl/strings/string_view.h" + +#include #include +#include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" -#include "src/core/lib/iomgr/pollset.h" -#include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index 2a3b58926ba..dad905697e5 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -20,30 +20,42 @@ #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h" -#include +#include +#include +#include +#include + +#include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" +#include #include #include -#include "src/core/ext/transport/chttp2/alpn/alpn.h" -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" -#include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/security/transport/security_handshaker.h" #include "src/core/lib/transport/handshaker.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" +#include "src/core/tsi/transport_security_interface.h" namespace { grpc_error_handle ssl_check_peer( diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h index 57342d94621..e62ce399764 100644 --- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h +++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h @@ -18,15 +18,17 @@ #ifndef GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H #define GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H - #include +#include + +#include #include +#include #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" -#include "src/core/tsi/transport_security_interface.h" struct grpc_ssl_config { tsi_ssl_pem_key_cert_pair* pem_key_cert_pair; diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc index 07983c3b29b..c05d78c1563 100644 --- a/src/core/lib/security/security_connector/ssl_utils.cc +++ b/src/core/lib/security/security_connector/ssl_utils.cc @@ -20,24 +20,34 @@ #include "src/core/lib/security/security_connector/ssl_utils.h" +#include +#include + +#include #include +#include "absl/strings/match.h" #include "absl/strings/str_cat.h" +#include "absl/strings/str_split.h" -#include +#include #include #include +#include #include "src/core/ext/transport/chttp2/alpn/alpn.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/global_config.h" #include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/load_system_roots.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "src/core/tsi/ssl_transport_security.h" +#include "src/core/tsi/transport_security.h" /* -- Constants. -- */ diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h index cc0825dd58a..abe37a8ce5b 100644 --- a/src/core/lib/security/security_connector/ssl_utils.h +++ b/src/core/lib/security/security_connector/ssl_utils.h @@ -21,21 +21,24 @@ #include -#include +#include -#include "absl/strings/str_split.h" +#include +#include + +#include "absl/container/inlined_vector.h" +#include "absl/status/status.h" #include "absl/strings/string_view.h" #include -#include +#include +#include -#include "src/core/lib/gprpp/global_config.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/security_connector/security_connector.h" -#include "src/core/lib/security/security_connector/ssl_utils_config.h" +#include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" #include "src/core/tsi/ssl_transport_security.h" -#include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_interface.h" /* --- Util --- */ diff --git a/src/core/lib/security/security_connector/ssl_utils_config.h b/src/core/lib/security/security_connector/ssl_utils_config.h index efaf497ab1e..d0979924cef 100644 --- a/src/core/lib/security/security_connector/ssl_utils_config.h +++ b/src/core/lib/security/security_connector/ssl_utils_config.h @@ -18,10 +18,10 @@ #ifndef GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_CONFIG_H #define GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_CONFIG_H - #include #include "src/core/lib/gprpp/global_config.h" +#include "src/core/lib/gprpp/memory.h" GPR_GLOBAL_CONFIG_DECLARE_STRING(grpc_default_ssl_roots_file_path); GPR_GLOBAL_CONFIG_DECLARE_BOOL(grpc_not_use_system_ssl_roots); diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc index 196ad331e1f..95ad684738b 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.cc +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.cc @@ -20,10 +20,16 @@ #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" -#include #include +#include +#include +#include +#include + +#include "absl/container/inlined_vector.h" #include "absl/functional/bind_front.h" +#include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -33,15 +39,18 @@ #include #include +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" -#include "src/core/lib/security/credentials/tls/tls_credentials.h" +#include "src/core/lib/security/context/security_context.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" +#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/lib/security/transport/security_handshaker.h" -#include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/transport/transport.h" #include "src/core/tsi/ssl_transport_security.h" -#include "src/core/tsi/transport_security.h" namespace grpc_core { diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.h b/src/core/lib/security/security_connector/tls/tls_security_connector.h index b42da8f8e88..83f39630ecc 100644 --- a/src/core/lib/security/security_connector/tls/tls_security_connector.h +++ b/src/core/lib/security/security_connector/tls/tls_security_connector.h @@ -21,12 +21,32 @@ #include +#include +#include + +#include "absl/base/thread_annotations.h" #include "absl/status/status.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" + +#include +#include +#include +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/security/context/security_context.h" -#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" -#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" +#include "src/core/lib/security/security_connector/security_connector.h" +#include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/lib/transport/handshaker.h" +#include "src/core/tsi/ssl/key_logging/ssl_key_logging.h" +#include "src/core/tsi/ssl_transport_security.h" +#include "src/core/tsi/transport_security_interface.h" using TlsSessionKeyLogger = tsi::TlsSessionKeyLoggerCache::TlsSessionKeyLogger; diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h index 69a1b9ec9f4..3d7d87c485e 100644 --- a/src/core/lib/security/transport/auth_filters.h +++ b/src/core/lib/security/transport/auth_filters.h @@ -21,10 +21,17 @@ #include +#include "absl/status/statusor.h" + #include +#include +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/promise_based_filter.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/promise/arena_promise.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/transport.h" diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc index f217d3b639a..e0d4a3f7815 100644 --- a/src/core/lib/security/transport/client_auth_filter.cc +++ b/src/core/lib/security/transport/client_auth_filter.cc @@ -20,28 +20,37 @@ #include -#include +#include +#include +#include -#include "absl/strings/str_cat.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include +#include #include -#include #include +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/channel/context.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/iomgr/error.h" -#include "src/core/lib/profiling/timers.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/promise/context.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" #include "src/core/lib/promise/try_seq.h" +#include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/transport/auth_filters.h" -#include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/slice/slice_string_helpers.h" -#include "src/core/lib/surface/call.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #define MAX_CREDENTIALS_METADATA_COUNT 4 diff --git a/src/core/lib/security/transport/secure_endpoint.cc b/src/core/lib/security/transport/secure_endpoint.cc index dd158eeef03..ec8ffce8900 100644 --- a/src/core/lib/security/transport/secure_endpoint.cc +++ b/src/core/lib/security/transport/secure_endpoint.cc @@ -20,26 +20,44 @@ #include "src/core/lib/security/transport/secure_endpoint.h" +#include #include -#include +#include +#include +#include "absl/base/thread_annotations.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" + +#include +#include #include #include #include +#include #include #include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gpr/string.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/resource_quota/memory_quota.h" +#include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/resource_quota/trace.h" #include "src/core/lib/security/transport/tsi_error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/transport_security_grpc.h" #include "src/core/tsi/transport_security_interface.h" diff --git a/src/core/lib/security/transport/secure_endpoint.h b/src/core/lib/security/transport/secure_endpoint.h index 163d718b4fb..e6320d9225e 100644 --- a/src/core/lib/security/transport/secure_endpoint.h +++ b/src/core/lib/security/transport/secure_endpoint.h @@ -21,13 +21,14 @@ #include +#include + +#include #include +#include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/endpoint.h" -struct tsi_frame_protector; -struct tsi_zero_copy_grpc_protector; - extern grpc_core::TraceFlag grpc_trace_secure_endpoint; /* Takes ownership of protector, zero_copy_protector, and to_wrap, and refs diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 80889b92af6..f040abd3606 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -20,11 +20,22 @@ #include "src/core/lib/security/transport/security_handshaker.h" -#include +#include +#include #include #include +#include +#include +#include "absl/base/attributes.h" +#include "absl/container/inlined_vector.h" +#include "absl/memory/memory.h" +#include "absl/types/optional.h" + +#include +#include +#include #include #include #include @@ -32,12 +43,23 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channelz.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/transport/secure_endpoint.h" #include "src/core/lib/security/transport/tsi_error.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/transport/handshaker.h" +#include "src/core/lib/transport/handshaker_factory.h" +#include "src/core/lib/transport/handshaker_registry.h" #include "src/core/tsi/transport_security_grpc.h" #define GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE 256 diff --git a/src/core/lib/security/transport/security_handshaker.h b/src/core/lib/security/transport/security_handshaker.h index 77df18ccee4..8b06ebf1972 100644 --- a/src/core/lib/security/transport/security_handshaker.h +++ b/src/core/lib/security/transport/security_handshaker.h @@ -21,9 +21,13 @@ #include +#include + #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/transport/handshaker.h" +#include "src/core/tsi/transport_security_interface.h" namespace grpc_core { diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 42e887fd4de..8f535781fe4 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -20,13 +20,35 @@ #include +#include +#include + +#include +#include +#include +#include +#include #include +#include #include +#include "src/core/lib/channel/channel_fwd.h" +#include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/channel/context.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/call_combiner.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/security/transport/auth_filters.h" +#include "src/core/lib/security/transport/auth_filters.h" // IWYU pragma: keep +#include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" +#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/lib/transport/transport.h" static void recv_initial_metadata_ready(void* arg, grpc_error_handle error); static void recv_trailing_metadata_ready(void* user_data, diff --git a/src/core/lib/security/util/json_util.cc b/src/core/lib/security/util/json_util.cc index 25223eefef3..a1f10e21d48 100644 --- a/src/core/lib/security/util/json_util.cc +++ b/src/core/lib/security/util/json_util.cc @@ -20,11 +20,12 @@ #include "src/core/lib/security/util/json_util.h" -#include +#include +#include +#include #include "absl/strings/str_cat.h" -#include #include #include "src/core/lib/iomgr/error.h" diff --git a/src/core/lib/security/util/json_util.h b/src/core/lib/security/util/json_util.h index d3c6ec31277..24ab6c507a5 100644 --- a/src/core/lib/security/util/json_util.h +++ b/src/core/lib/security/util/json_util.h @@ -21,8 +21,6 @@ #include -#include - #include "src/core/lib/iomgr/error.h" #include "src/core/lib/json/json.h" diff --git a/src/core/lib/service_config/service_config_parser.cc b/src/core/lib/service_config/service_config_parser.cc index 967c709f72f..0a6c3350e67 100644 --- a/src/core/lib/service_config/service_config_parser.cc +++ b/src/core/lib/service_config/service_config_parser.cc @@ -26,8 +26,6 @@ #include -// IWYU pragma: no_include - namespace grpc_core { ServiceConfigParser ServiceConfigParser::Builder::Build() { diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index b9b7c84202a..8578930248e 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -16,8 +16,6 @@ * */ -// IWYU pragma: no_include - #include #include #include diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index 2505dfd42c1..da90872c749 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -26,6 +26,7 @@ #include #include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/util/test_config.h" namespace grpc { diff --git a/test/core/bad_ssl/generate_tests.bzl b/test/core/bad_ssl/generate_tests.bzl index 64c8697a63c..9c36bf40ff8 100755 --- a/test/core/bad_ssl/generate_tests.bzl +++ b/test/core/bad_ssl/generate_tests.bzl @@ -58,6 +58,7 @@ def grpc_bad_ssl_tests(): deps = [ "//test/core/util:grpc_test_util", "//:gpr", + "//:grpc", "//test/core/end2end:cq_verifier", ], tags = ["no_windows"], diff --git a/test/core/compression/args_utils.cc b/test/core/compression/args_utils.cc index ce36dc84683..ca875c5abaa 100644 --- a/test/core/compression/args_utils.cc +++ b/test/core/compression/args_utils.cc @@ -16,6 +16,7 @@ #include +#include #include #include "src/core/lib/compression/compression_internal.h" diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc index a340b793823..6901fe1aab9 100644 --- a/test/core/compression/message_compress_test.cc +++ b/test/core/compression/message_compress_test.cc @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/test/core/http/format_request_test.cc b/test/core/http/format_request_test.cc index 1bb2d8694e9..41479aac63c 100644 --- a/test/core/http/format_request_test.cc +++ b/test/core/http/format_request_test.cc @@ -23,6 +23,7 @@ #include #include +#include "src/core/lib/http/httpcli.h" #include "test/core/util/test_config.h" static void test_format_get_request(void) { diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index 394e835fd36..922a97afc75 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -26,6 +26,7 @@ #include "absl/strings/str_format.h" #include +#include #include #include #include @@ -35,6 +36,7 @@ #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/security/credentials/credentials.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/util/fake_udp_and_tcp_server.h" #include "test/core/util/port.h" diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 004f4699704..942f8fe5579 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -36,6 +36,7 @@ #include "src/core/lib/http/httpcli.h" #include "src/core/lib/http/httpcli_ssl_credentials.h" #include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/security/credentials/credentials.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/util/fake_udp_and_tcp_server.h" #include "test/core/util/port.h" diff --git a/test/core/security/alts_security_connector_test.cc b/test/core/security/alts_security_connector_test.cc index becd4e6315d..3960c49579d 100644 --- a/test/core/security/alts_security_connector_test.cc +++ b/test/core/security/alts_security_connector_test.cc @@ -26,6 +26,7 @@ #include #include +#include "src/core/lib/security/context/security_context.h" #include "src/core/lib/transport/transport.h" #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h" #include "src/core/tsi/transport_security.h" diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc index eb8bb7105dd..fdd6ac1a2f9 100644 --- a/test/core/security/grpc_tls_credentials_options_test.cc +++ b/test/core/security/grpc_tls_credentials_options_test.cc @@ -28,6 +28,7 @@ #include "src/core/lib/gpr/tmpfile.h" #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" +#include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "src/core/lib/security/security_connector/tls/tls_security_connector.h" #include "test/core/util/test_config.h" #include "test/core/util/tls_utils.h" diff --git a/test/core/security/insecure_security_connector_test.cc b/test/core/security/insecure_security_connector_test.cc index cb961af6990..f7bc76a7a1a 100644 --- a/test/core/security/insecure_security_connector_test.cc +++ b/test/core/security/insecure_security_connector_test.cc @@ -23,6 +23,7 @@ #include +#include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/ssl_utils.h" #include "src/core/tsi/transport_security.h" #include "test/core/util/test_config.h" diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc index 19903702da8..d496d45cce4 100644 --- a/test/core/security/oauth2_utils.cc +++ b/test/core/security/oauth2_utils.cc @@ -32,6 +32,7 @@ #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h" #include "src/core/lib/promise/map.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/credentials.h" static auto* g_memory_allocator = new grpc_core::MemoryAllocator( diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc index 66ec5bbd3fc..b81ab3e6366 100644 --- a/test/core/security/security_connector_test.cc +++ b/test/core/security/security_connector_test.cc @@ -31,6 +31,7 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/security_connector/ssl_utils.h" +#include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc index 10f371ab2c9..ffafe207209 100644 --- a/test/core/security/tls_security_connector_test.cc +++ b/test/core/security/tls_security_connector_test.cc @@ -30,8 +30,11 @@ #include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/iomgr/load_file.h" +#include "src/core/lib/security/context/security_context.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" +#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" +#include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "src/core/tsi/transport_security.h" #include "test/core/util/test_config.h" #include "test/core/util/tls_utils.h" diff --git a/test/core/util/evaluate_args_test_util.h b/test/core/util/evaluate_args_test_util.h index 60a0842ca9b..b6a8f737765 100644 --- a/test/core/util/evaluate_args_test_util.h +++ b/test/core/util/evaluate_args_test_util.h @@ -19,10 +19,9 @@ #include -#include - #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/security/authorization/evaluate_args.h" +#include "src/core/lib/security/context/security_context.h" #include "test/core/util/mock_authorization_endpoint.h" namespace grpc_core { diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 3a861e3bc53..54319c6ceba 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -27,6 +27,7 @@ #include "absl/strings/str_format.h" #include +#include #include #include #include @@ -34,6 +35,7 @@ #include #include "src/core/lib/http/httpcli.h" +#include "src/core/lib/security/credentials/credentials.h" #include "test/core/util/port_server_client.h" typedef struct freereq { diff --git a/test/cpp/client/BUILD b/test/cpp/client/BUILD index 3abcec5194f..d5b57bfe5d8 100644 --- a/test/cpp/client/BUILD +++ b/test/cpp/client/BUILD @@ -53,6 +53,7 @@ grpc_cc_test( "no_windows", ], deps = [ + "//:exec_ctx", "//:gpr", "//:grpc", "//:grpc++", diff --git a/test/cpp/client/client_channel_stress_test.cc b/test/cpp/client/client_channel_stress_test.cc index b0d2d28dfdf..d08da9d6665 100644 --- a/test/cpp/client/client_channel_stress_test.cc +++ b/test/cpp/client/client_channel_stress_test.cc @@ -43,6 +43,7 @@ #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/resolver/server_address.h" #include "src/core/lib/service_config/service_config_impl.h" diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc index 8a539611f9d..02d4a2d68c6 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc @@ -41,6 +41,7 @@ #include "src/core/ext/xds/xds_client.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/tmpfile.h" +#include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/surface/server.h" #include "src/cpp/client/secure_credentials.h" #include "src/proto/grpc/testing/xds/v3/router.grpc.pb.h" diff --git a/tools/distrib/check_include_guards.py b/tools/distrib/check_include_guards.py index 058cba1b653..723e6ca84d5 100755 --- a/tools/distrib/check_include_guards.py +++ b/tools/distrib/check_include_guards.py @@ -46,6 +46,9 @@ class GuardValidator(object): self.endif_c_core_re = re.compile( r'#endif /\* (?: *\\\n *)?([A-Z][A-Z_1-9]*) (?:\\\n *)?\*/$') self.endif_re = re.compile(r'#endif // ([A-Z][A-Z_1-9]*)') + self.comments_then_includes_re = re.compile( + r'^((//.*?$|/\*.*?\*/|[ \r\n\t])*)(([ \r\n\t]|#include .*)*)(#ifndef [^\n]*\n#define [^\n]*\n)', + re.DOTALL | re.MULTILINE) self.failed = False def _is_c_core_header(self, fpath): @@ -156,6 +159,18 @@ class GuardValidator(object): if fix: save(fpath, fcontents) + match = self.comments_then_includes_re.search(fcontents) + assert (match) + bad_includes = match.group(3) + if bad_includes: + print( + "includes after initial comments but before include guards in", + fpath) + if fix: + fcontents = fcontents[:match.start(3)] + match.group( + 5) + match.group(3) + fcontents[match.end(5):] + save(fpath, fcontents) + return not self.failed # Did the check succeed? (ie, not failed) diff --git a/tools/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py index 7df86858e5f..69bf3f45e05 100755 --- a/tools/distrib/fix_build_deps.py +++ b/tools/distrib/fix_build_deps.py @@ -127,6 +127,8 @@ EXTERNAL_DEPS = { 'opencensus-trace-propagation', 'opencensus/tags/context_util.h': 'opencensus-tags-context_util', + 'openssl/base.h': + 'libssl', 'openssl/bio.h': 'libssl', 'openssl/bn.h': @@ -135,6 +137,8 @@ EXTERNAL_DEPS = { 'libcrypto', 'openssl/crypto.h': 'libcrypto', + 'openssl/digest.h': + 'libssl', 'openssl/engine.h': 'libcrypto', 'openssl/err.h': @@ -178,6 +182,8 @@ EXTERNAL_DEPS = { } INTERNAL_DEPS = { + 'google/api/expr/v1alpha1/syntax.upb.h': + 'google_type_expr_upb', 'google/rpc/status.upb.h': 'google_rpc_status_upb', 'google/protobuf/any.upb.h': @@ -224,8 +230,6 @@ INTERNAL_DEPS = { 'xds_type_upb', } -SKIP_DEPS = {'google/api/expr/v1alpha1/syntax.upb.h'} - class FakeSelects: @@ -460,9 +464,6 @@ for library in sorted(consumes.keys()): # assume a system include continue - if hdr in SKIP_DEPS: - continue - print("# ERROR: can't categorize header: %s" % hdr) error = True diff --git a/tools/distrib/iwyu_mappings.imp b/tools/distrib/iwyu_mappings.imp new file mode 100644 index 00000000000..7f96a080674 --- /dev/null +++ b/tools/distrib/iwyu_mappings.imp @@ -0,0 +1,7 @@ +[ + { include: ["", "private", "", "public"] }, + { include: ["", "public", "\"src/core/lib/iomgr/sockaddr.h\"", "public"]}, + { include: ["", "public", "\"src/core/lib/iomgr/sockaddr.h\"", "public"]}, + { include: ["", "private", "", "public"] }, + { include: ["", "private", "", "public"] }, +] diff --git a/tools/dockerfile/grpc_iwyu/iwyu.sh b/tools/dockerfile/grpc_iwyu/iwyu.sh index 20f2a77e2f1..6e34cc3b342 100755 --- a/tools/dockerfile/grpc_iwyu/iwyu.sh +++ b/tools/dockerfile/grpc_iwyu/iwyu.sh @@ -44,23 +44,13 @@ cat compile_commands.json \ export ENABLED_MODULES=' src/core/ext - src/core/lib/avl - src/core/lib/channel - src/core/lib/config - src/core/lib/event_engine - src/core/lib/gprpp - src/core/lib/json - src/core/lib/slice - src/core/lib/resource_quota - src/core/lib/promise - src/core/lib/service_config - src/core/lib/surface - src/core/lib/transport - src/core/lib/uri + src/core/lib src/cpp ' export DISABLED_MODULES=' + src/core/lib/gpr + src/core/lib/iomgr src/core/ext/transport/binder ' @@ -68,11 +58,12 @@ export INCLUSION_REGEX=`echo $ENABLED_MODULES | sed 's/ /|/g' | sed 's,\\(.*\\), export EXCLUSION_REGEX=`echo $DISABLED_MODULES | sed 's/ /|/g' | sed 's,\\(.*\\),^(\\1)/,g'` # figure out which files to include -cat compile_commands.json | jq -r '.[].file' \ - | grep -E $INCLUSION_REGEX \ - | grep -v -E "/upb-generated/|/upbdefs-generated/" \ - | grep -v -E $EXCLUSION_REGEX \ - | sort \ +cat compile_commands.json | jq -r '.[].file' \ + | grep -E $INCLUSION_REGEX \ + | grep -v -E "/upb-generated/|/upbdefs-generated/" \ + | grep -v -E $EXCLUSION_REGEX \ + | grep -v src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h \ + | sort \ > iwyu_files0.txt cat iwyu_files0.txt \ @@ -81,10 +72,12 @@ cat iwyu_files0.txt \ || true echo '#!/bin/sh -${IWYU_ROOT}/iwyu/iwyu_tool.py -p compile_commands_for_iwyu.json $1 \ - -- -Xiwyu --no_fwd_decls -Xiwyu --update_comments \ - | grep -v -E "port_platform.h" \ - | grep -v -E "^(- )?namespace " \ +${IWYU_ROOT}/iwyu/iwyu_tool.py -p compile_commands_for_iwyu.json $1 \ + -- -Xiwyu --no_fwd_decls \ + -Xiwyu --update_comments \ + -Xiwyu --mapping_file=${IWYU_ROOT}/tools/distrib/iwyu_mappings.imp \ + | grep -v -E "port_platform.h" \ + | grep -v -E "^(- )?namespace " \ > iwyu/iwyu.`echo $1 | sha1sum`.out ' > iwyu/run_iwyu_on.sh chmod +x iwyu/run_iwyu_on.sh @@ -98,5 +91,5 @@ cat iwyu/iwyu.*.out > iwyu.out ${IWYU_ROOT}/iwyu/fix_includes.py \ --nocomments \ --nosafe_headers \ - --ignore_re='^include/.*' \ - < iwyu.out \ + --ignore_re='^(include/.*|src/core/lib/security/credentials/tls/grpc_tls_credentials_options\.h)' \ + < iwyu.out