grpc 1.50.0.pre1 → 1.52.0.pre2

data/src/core/ext/filters/http/message_compress/compression_filter.cc

@@ -0,0 +1,315 @@
+// Copyright 2022 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/filters/http/message_compress/compression_filter.h"
+
+#include <inttypes.h>
+
+#include <functional>
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+#include "absl/meta/type_traits.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/types/optional.h"
+
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/log.h>
+
+#include "src/core/ext/filters/message_size/message_size_filter.h"
+#include "src/core/lib/channel/channel_args.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/compression/compression_internal.h"
+#include "src/core/lib/compression/message_compress.h"
+#include "src/core/lib/debug/trace.h"
+#include "src/core/lib/promise/context.h"
+#include "src/core/lib/promise/detail/promise_like.h"
+#include "src/core/lib/promise/latch.h"
+#include "src/core/lib/promise/map_pipe.h"
+#include "src/core/lib/promise/pipe.h"
+#include "src/core/lib/promise/promise.h"
+#include "src/core/lib/promise/seq.h"
+#include "src/core/lib/promise/try_concurrently.h"
+#include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/surface/call.h"
+#include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/lib/transport/transport.h"
+
+namespace grpc_core {
+
+const grpc_channel_filter ClientCompressionFilter::kFilter =
+    MakePromiseBasedFilter<ClientCompressionFilter, FilterEndpoint::kClient,
+                           kFilterExaminesServerInitialMetadata |
+                               kFilterExaminesInboundMessages |
+                               kFilterExaminesOutboundMessages>("compression");
+const grpc_channel_filter ServerCompressionFilter::kFilter =
+    MakePromiseBasedFilter<ServerCompressionFilter, FilterEndpoint::kServer,
+                           kFilterExaminesServerInitialMetadata |
+                               kFilterExaminesInboundMessages |
+                               kFilterExaminesOutboundMessages>("compression");
+
+absl::StatusOr<ClientCompressionFilter> ClientCompressionFilter::Create(
+    const ChannelArgs& args, ChannelFilter::Args) {
+  return ClientCompressionFilter(args);
+}
+
+absl::StatusOr<ServerCompressionFilter> ServerCompressionFilter::Create(
+    const ChannelArgs& args, ChannelFilter::Args) {
+  return ServerCompressionFilter(args);
+}
+
+CompressionFilter::CompressionFilter(const ChannelArgs& args)
+    : max_recv_size_(GetMaxRecvSizeFromChannelArgs(args)),
+      message_size_service_config_parser_index_(
+          MessageSizeParser::ParserIndex()),
+      default_compression_algorithm_(
+          DefaultCompressionAlgorithmFromChannelArgs(args).value_or(
+              GRPC_COMPRESS_NONE)),
+      enabled_compression_algorithms_(
+          CompressionAlgorithmSet::FromChannelArgs(args)),
+      enable_compression_(
+          args.GetBool(GRPC_ARG_ENABLE_PER_MESSAGE_COMPRESSION).value_or(true)),
+      enable_decompression_(
+          args.GetBool(GRPC_ARG_ENABLE_PER_MESSAGE_DECOMPRESSION)
+              .value_or(true)) {
+  // Make sure the default is enabled.
+  if (!enabled_compression_algorithms_.IsSet(default_compression_algorithm_)) {
+    const char* name;
+    if (!grpc_compression_algorithm_name(default_compression_algorithm_,
+                                         &name)) {
+      name = "<unknown>";
+    }
+    gpr_log(GPR_ERROR,
+            "default compression algorithm %s not enabled: switching to none",
+            name);
+    default_compression_algorithm_ = GRPC_COMPRESS_NONE;
+  }
+}
+
+MessageHandle CompressionFilter::CompressMessage(
+    MessageHandle message, grpc_compression_algorithm algorithm) const {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_compression_trace)) {
+    gpr_log(GPR_ERROR, "CompressMessage: len=%" PRIdPTR " alg=%d flags=%d",
+            message->payload()->Length(), algorithm, message->flags());
+  }
+  // Check if we're allowed to compress this message
+  // (apps might want to disable compression for certain messages to avoid
+  // crime/beast like vulns).
+  uint32_t& flags = message->mutable_flags();
+  if (algorithm == GRPC_COMPRESS_NONE || !enable_compression_ ||
+      (flags & (GRPC_WRITE_NO_COMPRESS | GRPC_WRITE_INTERNAL_COMPRESS))) {
+    return message;
+  }
+  // Try to compress the payload.
+  SliceBuffer tmp;
+  SliceBuffer* payload = message->payload();
+  bool did_compress = grpc_msg_compress(algorithm, payload->c_slice_buffer(),
+                                        tmp.c_slice_buffer());
+  // If we achieved compression send it as compressed, otherwise send it as (to
+  // avoid spending cycles on the receiver decompressing).
+  if (did_compress) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_compression_trace)) {
+      const char* algo_name;
+      const size_t before_size = payload->Length();
+      const size_t after_size = tmp.Length();
+      const float savings_ratio = 1.0f - static_cast<float>(after_size) /
+                                             static_cast<float>(before_size);
+      GPR_ASSERT(grpc_compression_algorithm_name(algorithm, &algo_name));
+      gpr_log(GPR_INFO,
+              "Compressed[%s] %" PRIuPTR " bytes vs. %" PRIuPTR
+              " bytes (%.2f%% savings)",
+              algo_name, before_size, after_size, 100 * savings_ratio);
+    }
+    tmp.Swap(payload);
+    flags |= GRPC_WRITE_INTERNAL_COMPRESS;
+  } else {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_compression_trace)) {
+      const char* algo_name;
+      GPR_ASSERT(grpc_compression_algorithm_name(algorithm, &algo_name));
+      gpr_log(GPR_INFO,
+              "Algorithm '%s' enabled but decided not to compress. Input size: "
+              "%" PRIuPTR,
+              algo_name, payload->Length());
+    }
+  }
+  return message;
+}
+
+absl::StatusOr<MessageHandle> CompressionFilter::DecompressMessage(
+    MessageHandle message, grpc_compression_algorithm algorithm,
+    absl::optional<uint32_t> max_recv_message_length) const {
+  if (GRPC_TRACE_FLAG_ENABLED(grpc_compression_trace)) {
+    gpr_log(GPR_ERROR, "DecompressMessage: len=%" PRIdPTR " max=%d alg=%d",
+            message->payload()->Length(), max_recv_message_length.value_or(-1),
+            algorithm);
+  }
+  // Check max message length.
+  if (max_recv_message_length.has_value() &&
+      message->payload()->Length() >
+          static_cast<size_t>(*max_recv_message_length)) {
+    return absl::ResourceExhaustedError(absl::StrFormat(
+        "Received message larger than max (%u vs. %d)",
+        message->payload()->Length(), *max_recv_message_length));
+  }
+  // Check if decompression is enabled (if not, we can just pass the message
+  // up).
+  if (!enable_decompression_ ||
+      (message->flags() & GRPC_WRITE_INTERNAL_COMPRESS) == 0) {
+    return std::move(message);
+  }
+  // Try to decompress the payload.
+  SliceBuffer decompressed_slices;
+  if (grpc_msg_decompress(algorithm, message->payload()->c_slice_buffer(),
+                          decompressed_slices.c_slice_buffer()) == 0) {
+    return absl::InternalError(
+        absl::StrCat("Unexpected error decompressing data for algorithm ",
+                     CompressionAlgorithmAsString(algorithm)));
+  }
+  // Swap the decompressed slices into the message.
+  message->payload()->Swap(&decompressed_slices);
+  message->mutable_flags() &= ~GRPC_WRITE_INTERNAL_COMPRESS;
+  message->mutable_flags() |= GRPC_WRITE_INTERNAL_TEST_ONLY_WAS_COMPRESSED;
+  return std::move(message);
+}
+
+class CompressionFilter::DecompressLoop {
+ public:
+  explicit DecompressLoop(CompressionFilter* filter, CallArgs& call_args)
+      : filter_(filter),
+        mapper_(PipeMapper<MessageHandle>::Intercept(
+            *call_args.incoming_messages)) {}
+
+  // Once we have a compression algorithm we can construct the decompression
+  // loop.
+  // Returns a promise that resolves to MessageHandle.
+  auto TakeAndRun(grpc_compression_algorithm algorithm) {
+    // Configure max receive size.
+    auto max_recv_message_length = filter_->max_recv_size_;
+    const MessageSizeParsedConfig* limits =
+        MessageSizeParsedConfig::GetFromCallContext(
+            GetContext<grpc_call_context_element>(),
+            filter_->message_size_service_config_parser_index_);
+    if (limits != nullptr && limits->max_recv_size().has_value() &&
+        (!max_recv_message_length.has_value() ||
+         *limits->max_recv_size() < *max_recv_message_length)) {
+      max_recv_message_length = *limits->max_recv_size();
+    }
+    // Interject decompression into the message loop.
+    return mapper_.TakeAndRun([algorithm, max_recv_message_length,
+                               filter = filter_](MessageHandle message) {
+      return filter->DecompressMessage(std::move(message), algorithm,
+                                       max_recv_message_length);
+    });
+  }
+
+ private:
+  CompressionFilter* filter_;
+  PipeMapper<MessageHandle> mapper_;
+};
+
+class CompressionFilter::CompressLoop {
+ public:
+  explicit CompressLoop(CompressionFilter* filter, CallArgs& call_args)
+      : filter_(filter),
+        mapper_(PipeMapper<MessageHandle>::Intercept(
+            *call_args.outgoing_messages)) {}
+
+  // Once we're ready to send initial metadata we can construct the compression
+  // loop.
+  // Returns a promise that resolves to MessageHandle.
+  auto TakeAndRun(grpc_metadata_batch& outgoing_metadata) {
+    const auto algorithm =
+        outgoing_metadata.Take(GrpcInternalEncodingRequest())
+            .value_or(filter_->default_compression_algorithm());
+    // Convey supported compression algorithms.
+    outgoing_metadata.Set(GrpcAcceptEncodingMetadata(),
+                          filter_->enabled_compression_algorithms());
+    if (algorithm != GRPC_COMPRESS_NONE) {
+      outgoing_metadata.Set(GrpcEncodingMetadata(), algorithm);
+    }
+    // Interject compression into the message loop.
+    return mapper_.TakeAndRun([filter = filter_, algorithm](MessageHandle m) {
+      return filter->CompressMessage(std::move(m), algorithm);
+    });
+  }
+
+ private:
+  CompressionFilter* filter_;
+  PipeMapper<MessageHandle> mapper_;
+};
+
+ArenaPromise<ServerMetadataHandle> ClientCompressionFilter::MakeCallPromise(
+    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+  auto compress_loop = CompressLoop(this, call_args)
+                           .TakeAndRun(*call_args.client_initial_metadata);
+  DecompressLoop decompress_loop(this, call_args);
+  auto* server_initial_metadata = call_args.server_initial_metadata;
+  // Concurrently:
+  // - call the next filter
+  // - wait for initial metadata from the server and then commence decompression
+  // - compress outgoing messages
+  return TryConcurrently(next_promise_factory(std::move(call_args)))
+      .NecessaryPull(Seq(server_initial_metadata->Wait(),
+                         [decompress_loop = std::move(decompress_loop)](
+                             ServerMetadata** server_initial_metadata) mutable
+                         -> ArenaPromise<absl::Status> {
+                           if (*server_initial_metadata == nullptr) {
+                             return ImmediateOkStatus();
+                           }
+                           return decompress_loop.TakeAndRun(
+                               (*server_initial_metadata)
+                                   ->get(GrpcEncodingMetadata())
+                                   .value_or(GRPC_COMPRESS_NONE));
+                         }))
+      .Push(std::move(compress_loop));
+}
+
+ArenaPromise<ServerMetadataHandle> ServerCompressionFilter::MakeCallPromise(
+    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+  CompressLoop compress_loop(this, call_args);
+  auto decompress_loop = DecompressLoop(this, call_args)
+                             .TakeAndRun(call_args.client_initial_metadata
+                                             ->get(GrpcEncodingMetadata())
+                                             .value_or(GRPC_COMPRESS_NONE));
+  auto* read_latch = GetContext<Arena>()->New<Latch<ServerMetadata*>>();
+  auto* write_latch =
+      std::exchange(call_args.server_initial_metadata, read_latch);
+  // Concurrently:
+  // - call the next filter
+  // - decompress incoming messages
+  // - wait for initial metadata to be sent, and then commence compression of
+  //   outgoing messages
+  return TryConcurrently(next_promise_factory(std::move(call_args)))
+      .Pull(std::move(decompress_loop))
+      .Push(Seq(read_latch->Wait(),
+                [write_latch, compress_loop = std::move(compress_loop)](
+                    ServerMetadata** md) mutable {
+                  // Find the compression algorithm.
+                  auto loop = compress_loop.TakeAndRun(**md);
+                  write_latch->Set(*md);
+                  return loop;
+                }));
+}
+
+}  // namespace grpc_core

data/src/core/ext/filters/http/message_compress/compression_filter.h

@@ -0,0 +1,132 @@
+//
+//
+// Copyright 2020 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#ifndef GRPC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_COMPRESSION_FILTER_H
+#define GRPC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_COMPRESSION_FILTER_H
+
+#include <grpc/support/port_platform.h>
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include "absl/status/statusor.h"
+#include "absl/types/optional.h"
+
+#include <grpc/impl/compression_types.h>
+
+#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/compression/compression_internal.h"
+#include "src/core/lib/promise/arena_promise.h"
+#include "src/core/lib/transport/transport.h"
+
+namespace grpc_core {
+
+/// Compression filter for messages.
+///
+/// See <grpc/compression.h> for the available compression settings.
+///
+/// Compression settings may come from:
+/// - Channel configuration, as established at channel creation time.
+/// - The metadata accompanying the outgoing data to be compressed. This is
+///   taken as a request only. We may choose not to honor it. The metadata key
+///   is given by \a GRPC_COMPRESSION_REQUEST_ALGORITHM_MD_KEY.
+///
+/// Compression can be disabled for concrete messages (for instance in order to
+/// prevent CRIME/BEAST type attacks) by having the GRPC_WRITE_NO_COMPRESS set
+/// in the MessageHandle flags.
+///
+/// The attempted compression mechanism is added to the resulting initial
+/// metadata under the 'grpc-encoding' key.
+///
+/// If compression is actually performed, the MessageHandle's flag is modified
+/// to incorporate GRPC_WRITE_INTERNAL_COMPRESS. Otherwise, and regardless of
+/// the aforementioned 'grpc-encoding' metadata value, data will pass through
+/// uncompressed.
+
+class CompressionFilter : public ChannelFilter {
+ protected:
+  explicit CompressionFilter(const ChannelArgs& args);
+
+  class CompressLoop;
+  class DecompressLoop;
+
+  grpc_compression_algorithm default_compression_algorithm() const {
+    return default_compression_algorithm_;
+  }
+
+  CompressionAlgorithmSet enabled_compression_algorithms() const {
+    return enabled_compression_algorithms_;
+  }
+
+ private:
+  // Compress one message synchronously.
+  MessageHandle CompressMessage(MessageHandle message,
+                                grpc_compression_algorithm algorithm) const;
+  // Decompress one message synchronously.
+  absl::StatusOr<MessageHandle> DecompressMessage(
+      MessageHandle message, grpc_compression_algorithm algorithm,
+      absl::optional<uint32_t> max_recv_message_length) const;
+
+  // Max receive message length, if set.
+  absl::optional<uint32_t> max_recv_size_;
+  size_t message_size_service_config_parser_index_;
+  // The default, channel-level, compression algorithm.
+  grpc_compression_algorithm default_compression_algorithm_;
+  // Enabled compression algorithms.
+  CompressionAlgorithmSet enabled_compression_algorithms_;
+  // Is compression enabled?
+  bool enable_compression_;
+  // Is decompression enabled?
+  bool enable_decompression_;
+};
+
+class ClientCompressionFilter final : public CompressionFilter {
+ public:
+  static const grpc_channel_filter kFilter;
+
+  static absl::StatusOr<ClientCompressionFilter> Create(
+      const ChannelArgs& args, ChannelFilter::Args filter_args);
+
+  // Construct a promise for one call.
+  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
+      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+
+ private:
+  using CompressionFilter::CompressionFilter;
+};
+
+class ServerCompressionFilter final : public CompressionFilter {
+ public:
+  static const grpc_channel_filter kFilter;
+
+  static absl::StatusOr<ServerCompressionFilter> Create(
+      const ChannelArgs& args, ChannelFilter::Args filter_args);
+
+  // Construct a promise for one call.
+  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
+      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+
+ private:
+  using CompressionFilter::CompressionFilter;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_COMPRESSION_FILTER_H

data/src/core/ext/filters/http/server/http_server_filter.cc

@@ -1,42 +1,44 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 
 #include <functional>
+#include <memory>
 #include <utility>
 
 #include "absl/base/attributes.h"
+#include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/promise/call_push_pull.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/latch.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/promise/seq.h"
+#include "src/core/lib/promise/try_concurrently.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
@@ -74,11 +76,11 @@ ArenaPromise<ServerMetadataHandle> HttpServerFilter::MakeCallPromise(
       case HttpMethodMetadata::kInvalid:
       case HttpMethodMetadata::kGet:
         return Immediate(
-            ServerMetadataHandle(absl::UnknownError("Bad method header")));
+            ServerMetadataFromStatus(absl::UnknownError("Bad method header")));
     }
   } else {
     return Immediate(
-        ServerMetadataHandle(absl::UnknownError("Missing :method header")));
+        ServerMetadataFromStatus(absl::UnknownError("Missing :method header")));
   }
 
   auto te = md->Take(TeMetadata());
@@ -86,21 +88,21 @@ ArenaPromise<ServerMetadataHandle> HttpServerFilter::MakeCallPromise(
     // Do nothing, ok.
   } else if (!te.has_value()) {
     return Immediate(
-        ServerMetadataHandle(absl::UnknownError("Missing :te header")));
+        ServerMetadataFromStatus(absl::UnknownError("Missing :te header")));
   } else {
     return Immediate(
-        ServerMetadataHandle(absl::UnknownError("Bad :te header")));
+        ServerMetadataFromStatus(absl::UnknownError("Bad :te header")));
   }
 
   auto scheme = md->Take(HttpSchemeMetadata());
   if (scheme.has_value()) {
     if (*scheme == HttpSchemeMetadata::kInvalid) {
       return Immediate(
-          ServerMetadataHandle(absl::UnknownError("Bad :scheme header")));
+          ServerMetadataFromStatus(absl::UnknownError("Bad :scheme header")));
     }
   } else {
     return Immediate(
-        ServerMetadataHandle(absl::UnknownError("Missing :scheme header")));
+        ServerMetadataFromStatus(absl::UnknownError("Missing :scheme header")));
   }
 
   md->Remove(ContentTypeMetadata());
@@ -108,7 +110,7 @@ ArenaPromise<ServerMetadataHandle> HttpServerFilter::MakeCallPromise(
   Slice* path_slice = md->get_pointer(HttpPathMetadata());
   if (path_slice == nullptr) {
     return Immediate(
-        ServerMetadataHandle(absl::UnknownError("Missing :path header")));
+        ServerMetadataFromStatus(absl::UnknownError("Missing :path header")));
   }
 
   if (md->get_pointer(HttpAuthorityMetadata()) == nullptr) {
@@ -119,8 +121,8 @@ ArenaPromise<ServerMetadataHandle> HttpServerFilter::MakeCallPromise(
   }
 
   if (md->get_pointer(HttpAuthorityMetadata()) == nullptr) {
-    return Immediate(
-        ServerMetadataHandle(absl::UnknownError("Missing :authority header")));
+    return Immediate(ServerMetadataFromStatus(
+        absl::UnknownError("Missing :authority header")));
   }
 
   if (!surface_user_agent_) {
@@ -131,21 +133,20 @@ ArenaPromise<ServerMetadataHandle> HttpServerFilter::MakeCallPromise(
   auto* write_latch =
       std::exchange(call_args.server_initial_metadata, read_latch);
 
-  return CallPushPull(Seq(next_promise_factory(std::move(call_args)),
-                          [](ServerMetadataHandle md) -> ServerMetadataHandle {
-                            FilterOutgoingMetadata(md.get());
-                            return md;
-                          }),
-                      Seq(read_latch->Wait(),
-                          [write_latch](ServerMetadata** md) {
-                            FilterOutgoingMetadata(*md);
-                            (*md)->Set(HttpStatusMetadata(), 200);
-                            (*md)->Set(ContentTypeMetadata(),
-                                       ContentTypeMetadata::kApplicationGrpc);
-                            write_latch->Set(*md);
-                            return absl::OkStatus();
-                          }),
-                      []() { return absl::OkStatus(); });
+  return TryConcurrently(
+             Seq(next_promise_factory(std::move(call_args)),
+                 [](ServerMetadataHandle md) -> ServerMetadataHandle {
+                   FilterOutgoingMetadata(md.get());
+                   return md;
+                 }))
+      .Push(Seq(read_latch->Wait(), [write_latch](ServerMetadata** md) {
+        FilterOutgoingMetadata(*md);
+        (*md)->Set(HttpStatusMetadata(), 200);
+        (*md)->Set(ContentTypeMetadata(),
+                   ContentTypeMetadata::kApplicationGrpc);
+        write_latch->Set(*md);
+        return absl::OkStatus();
+      }));
 }
 
 absl::StatusOr<HttpServerFilter> HttpServerFilter::Create(

data/src/core/ext/filters/http/server/http_server_filter.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_EXT_FILTERS_HTTP_SERVER_HTTP_SERVER_FILTER_H
 #define GRPC_CORE_EXT_FILTERS_HTTP_SERVER_HTTP_SERVER_FILTER_H
@@ -60,4 +60,4 @@ class HttpServerFilter : public ChannelFilter {
   "grpc.http.do_not_use_unless_you_have_permission_from_grpc_team_allow_"                       \
   "broken_put_requests"
 
-#endif /* GRPC_CORE_EXT_FILTERS_HTTP_SERVER_HTTP_SERVER_FILTER_H */
+#endif  // GRPC_CORE_EXT_FILTERS_HTTP_SERVER_HTTP_SERVER_FILTER_H