Use Http::PassThrough filter

Signed-off-by: Wayne Zhang <[email protected]>
Change-Id: I27f0f7151f54781edb370f05c202d8987e9adf48

src/envoy/http/backend_auth/BUILD

@@ -35,6 +35,7 @@ envoy_cc_library(
         ":config_parser_lib",
         "//api/envoy/http/backend_auth:config_proto_cc_proto",
         "//src/envoy/utils:filter_state_utils_lib",
+        "@envoy//source/extensions/filters/http/common:pass_through_filter_lib",
     ],
 )
 

src/envoy/http/backend_auth/filter.cc

@@ -78,19 +78,6 @@ FilterHeadersStatus Filter::decodeHeaders(HeaderMap& headers, bool) {
   return FilterHeadersStatus::Continue;
 }
 
-FilterDataStatus Filter::decodeData(Buffer::Instance&, bool) {
-  return FilterDataStatus::Continue;
-}
-
-FilterTrailersStatus Filter::decodeTrailers(HeaderMap&) {
-  return FilterTrailersStatus::Continue;
-}
-
-void Filter::setDecoderFilterCallbacks(
-    Http::StreamDecoderFilterCallbacks& callbacks) {
-  decoder_callbacks_ = &callbacks;
-}
-
 }  // namespace BackendAuth
 }  // namespace HttpFilters
 }  // namespace Extensions

src/envoy/http/backend_auth/filter.h

@@ -19,30 +19,23 @@
 #include "common/common/logger.h"
 #include "envoy/http/filter.h"
 #include "envoy/http/header_map.h"
+#include "extensions/filters/http/common/pass_through_filter.h"
 #include "src/envoy/http/backend_auth/filter_config.h"
 
 namespace Envoy {
 namespace Extensions {
 namespace HttpFilters {
 namespace BackendAuth {
 
-class Filter : public Http::StreamDecoderFilter,
+class Filter : public Http::PassThroughDecoderFilter,
                public Logger::Loggable<Logger::Id::filter> {
  public:
   Filter(FilterConfigSharedPtr config) : config_(config) {}
-  ~Filter() override = default;
-
-  // Http::StreamFilterBase
-  void onDestroy() override{};
 
   // Http::StreamDecoderFilter
   Http::FilterHeadersStatus decodeHeaders(Http::HeaderMap&, bool) override;
-  Http::FilterDataStatus decodeData(Buffer::Instance&, bool) override;
-  Http::FilterTrailersStatus decodeTrailers(Http::HeaderMap&) override;
-  void setDecoderFilterCallbacks(Http::StreamDecoderFilterCallbacks&) override;
 
  private:
-  Http::StreamDecoderFilterCallbacks* decoder_callbacks_;
   const FilterConfigSharedPtr config_;
 };
 

src/envoy/http/backend_routing/BUILD

@@ -36,6 +36,7 @@ envoy_cc_library(
         "@envoy//source/common/http:headers_lib",
         "@envoy//source/common/protobuf:utility_lib",
         "@envoy//source/exe:envoy_common_lib",
+        "@envoy//source/extensions/filters/http/common:pass_through_filter_lib",
     ],
 )
 

src/envoy/http/backend_routing/filter.cc

@@ -102,19 +102,6 @@ FilterHeadersStatus Filter::decodeHeaders(HeaderMap& headers, bool) {
   return FilterHeadersStatus::Continue;
 }
 
-FilterDataStatus Filter::decodeData(Buffer::Instance&, bool) {
-  return FilterDataStatus::Continue;
-}
-
-FilterTrailersStatus Filter::decodeTrailers(HeaderMap&) {
-  return FilterTrailersStatus::Continue;
-}
-
-void Filter::setDecoderFilterCallbacks(
-    Http::StreamDecoderFilterCallbacks& callbacks) {
-  decoder_callbacks_ = &callbacks;
-}
-
 }  // namespace BackendRouting
 }  // namespace HttpFilters
 }  // namespace Extensions

src/envoy/http/backend_routing/filter.h

@@ -19,31 +19,23 @@
 #include "common/common/logger.h"
 #include "envoy/http/filter.h"
 #include "envoy/http/header_map.h"
+#include "extensions/filters/http/common/pass_through_filter.h"
 #include "src/envoy/http/backend_routing/filter_config.h"
 
 namespace Envoy {
 namespace Extensions {
 namespace HttpFilters {
 namespace BackendRouting {
 
-class Filter : public Http::StreamDecoderFilter,
+class Filter : public Http::PassThroughDecoderFilter,
                public Logger::Loggable<Logger::Id::filter> {
  public:
   Filter(FilterConfigSharedPtr config);
-  ~Filter() override = default;
-  ;
-
-  // Http::StreamFilterBase
-  void onDestroy() override{};
 
   // Http::StreamDecoderFilter
   Http::FilterHeadersStatus decodeHeaders(Http::HeaderMap&, bool) override;
-  Http::FilterDataStatus decodeData(Buffer::Instance&, bool) override;
-  Http::FilterTrailersStatus decodeTrailers(Http::HeaderMap&) override;
-  void setDecoderFilterCallbacks(Http::StreamDecoderFilterCallbacks&) override;
 
  private:
-  Http::StreamDecoderFilterCallbacks* decoder_callbacks_;
   const FilterConfigSharedPtr config_;
   absl::flat_hash_map<
       std::string,

src/envoy/http/path_matcher/BUILD

@@ -38,6 +38,7 @@ envoy_cc_library(
         "//src/envoy/utils:http_header_utils_lib",
         "@envoy//source/common/protobuf:utility_lib",
         "@envoy//source/exe:envoy_common_lib",
+        "@envoy//source/extensions/filters/http/common:pass_through_filter_lib",
     ],
 )
 

src/envoy/http/path_matcher/filter.cc

@@ -43,8 +43,6 @@ typedef ConstSingleton<RcDetailsValues> RcDetails;
 
 }  // namespace
 
-void Filter::onDestroy() {}
-
 Http::FilterHeadersStatus Filter::decodeHeaders(Http::HeaderMap& headers,
                                                 bool) {
   std::string method(Utils::getRequestHTTPMethodWithOverride(
@@ -77,19 +75,6 @@ Http::FilterHeadersStatus Filter::decodeHeaders(Http::HeaderMap& headers,
   return Http::FilterHeadersStatus::Continue;
 }
 
-Http::FilterDataStatus Filter::decodeData(Buffer::Instance&, bool) {
-  return Http::FilterDataStatus::Continue;
-}
-
-Http::FilterTrailersStatus Filter::decodeTrailers(Http::HeaderMap&) {
-  return Http::FilterTrailersStatus::Continue;
-}
-
-void Filter::setDecoderFilterCallbacks(
-    Http::StreamDecoderFilterCallbacks& callbacks) {
-  decoder_callbacks_ = &callbacks;
-}
-
 void Filter::rejectRequest(Http::Code code, absl::string_view error_msg) {
   config_->stats().denied_.inc();
 

src/envoy/http/path_matcher/filter.h

@@ -17,6 +17,7 @@
 #include "common/common/logger.h"
 #include "envoy/http/filter.h"
 #include "envoy/http/header_map.h"
+#include "extensions/filters/http/common/pass_through_filter.h"
 #include "src/envoy/http/path_matcher/filter_config.h"
 
 #include <string>
@@ -26,23 +27,16 @@ namespace Extensions {
 namespace HttpFilters {
 namespace PathMatcher {
 
-class Filter : public Http::StreamDecoderFilter,
+class Filter : public Http::PassThroughDecoderFilter,
                public Logger::Loggable<Logger::Id::filter> {
  public:
   Filter(FilterConfigSharedPtr config) : config_(config) {}
-  ~Filter() override = default;
-
-  void onDestroy() override;
 
   Http::FilterHeadersStatus decodeHeaders(Http::HeaderMap&, bool) override;
-  Http::FilterDataStatus decodeData(Buffer::Instance&, bool) override;
-  Http::FilterTrailersStatus decodeTrailers(Http::HeaderMap&) override;
-  void setDecoderFilterCallbacks(Http::StreamDecoderFilterCallbacks&) override;
 
  private:
   void rejectRequest(Http::Code code, absl::string_view error_msg);
 
-  Http::StreamDecoderFilterCallbacks* decoder_callbacks_;
   const FilterConfigSharedPtr config_;
 };
 

src/envoy/http/service_control/BUILD

@@ -154,6 +154,7 @@ envoy_cc_library(
         "@envoy//source/common/grpc:status_lib",
         "@envoy//source/common/http:headers_lib",
         "@envoy//source/exe:envoy_common_lib",
+        "@envoy//source/extensions/filters/http/common:pass_through_filter_lib",
     ],
 )
 

src/envoy/http/service_control/filter.cc

@@ -117,16 +117,6 @@ Http::FilterTrailersStatus ServiceControlFilter::decodeTrailers(
   return Http::FilterTrailersStatus::Continue;
 }
 
-void ServiceControlFilter::setDecoderFilterCallbacks(
-    Http::StreamDecoderFilterCallbacks& callbacks) {
-  decoder_callbacks_ = &callbacks;
-}
-
-Http::FilterHeadersStatus ServiceControlFilter::encode100ContinueHeaders(
-    Http::HeaderMap&) {
-  return Http::FilterHeadersStatus::Continue;
-}
-
 Http::FilterHeadersStatus ServiceControlFilter::encodeHeaders(
     Http::HeaderMap& headers, bool) {
   ENVOY_LOG(debug, "Called ServiceControl Filter : {} before", __func__);
@@ -148,21 +138,6 @@ Http::FilterDataStatus ServiceControlFilter::encodeData(Buffer::Instance& data,
   return Http::FilterDataStatus::Continue;
 }
 
-Http::FilterTrailersStatus ServiceControlFilter::encodeTrailers(
-    Http::HeaderMap&) {
-  return Http::FilterTrailersStatus::Continue;
-}
-
-Http::FilterMetadataStatus ServiceControlFilter::encodeMetadata(
-    Http::MetadataMap&) {
-  return Http::FilterMetadataStatus::Continue;
-}
-
-void ServiceControlFilter::setEncoderFilterCallbacks(
-    Http::StreamEncoderFilterCallbacks& callbacks) {
-  encoder_callbacks_ = &callbacks;
-}
-
 void ServiceControlFilter::log(const Http::HeaderMap* request_headers,
                                const Http::HeaderMap* response_headers,
                                const Http::HeaderMap* response_trailers,

src/envoy/http/service_control/filter.h

@@ -18,6 +18,7 @@
 #include "envoy/access_log/access_log.h"
 #include "envoy/http/filter.h"
 #include "envoy/http/header_map.h"
+#include "extensions/filters/http/common/pass_through_filter.h"
 #include "src/envoy/http/service_control/filter_stats.h"
 #include "src/envoy/http/service_control/handler.h"
 
@@ -29,7 +30,7 @@ namespace HttpFilters {
 namespace ServiceControl {
 
 // The Envoy filter for ESP V2 service control client.
-class ServiceControlFilter : public Http::StreamFilter,
+class ServiceControlFilter : public Http::PassThroughFilter,
                              public AccessLog::Instance,
                              public ServiceControlHandler::CheckDoneCallback,
                              public Logger::Loggable<Logger::Id::filter> {
@@ -46,20 +47,12 @@ class ServiceControlFilter : public Http::StreamFilter,
   Http::FilterDataStatus decodeData(Buffer::Instance& data,
                                     bool end_stream) override;
   Http::FilterTrailersStatus decodeTrailers(Http::HeaderMap&) override;
-  void setDecoderFilterCallbacks(
-      Http::StreamDecoderFilterCallbacks& callbacks) override;
 
   // Http::StreamEncoderFilter
-  Http::FilterHeadersStatus encode100ContinueHeaders(
-      Http::HeaderMap& headers) override;
   Http::FilterHeadersStatus encodeHeaders(Http::HeaderMap& headers,
                                           bool) override;
   Http::FilterDataStatus encodeData(Buffer::Instance& data,
                                     bool end_stream) override;
-  Http::FilterTrailersStatus encodeTrailers(Http::HeaderMap&) override;
-  Http::FilterMetadataStatus encodeMetadata(Http::MetadataMap&) override;
-  void setEncoderFilterCallbacks(
-      Http::StreamEncoderFilterCallbacks& callbacks) override;
 
   // Called when the request is completed.
   void log(const Http::HeaderMap* request_headers,
@@ -73,9 +66,6 @@ class ServiceControlFilter : public Http::StreamFilter,
  private:
   void rejectRequest(Http::Code code, absl::string_view error_msg);
 
-  // The callback funcion.
-  Http::StreamDecoderFilterCallbacks* decoder_callbacks_;
-  Http::StreamEncoderFilterCallbacks* encoder_callbacks_;
   ServiceControlFilterStats& stats_;
   const ServiceControlHandlerFactory& factory_;