envoyproxy · goaway · May 22, 2021 · May 19, 2021 · May 20, 2021 · May 20, 2021
diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl
@@ -28,9 +28,9 @@ def upstream_envoy_overrides():
             "@envoy//bazel:protobuf.patch",
             "@envoy_mobile//bazel:protobuf.patch",
         ],
-        sha256 = "6dd0f6b20094910fbb7f1f7908688df01af2d4f6c5c21331b9f636048674aebf",
-        strip_prefix = "protobuf-3.14.0",
-        urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protobuf-all-3.14.0.tar.gz"],
+        sha256 = "d7371dc2d46fddac1af8cb27c0394554b068768fc79ecaf5be1a1863e8ff3392",
+        strip_prefix = "protobuf-3.16.0",
+        urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v3.16.0/protobuf-all-3.16.0.tar.gz"],
     )
 
     # Workaround old NDK version breakages https://github.com/lyft/envoy-mobile/issues/934

diff --git a/bazel/protobuf.patch b/bazel/protobuf.patch
@@ -1,8 +1,8 @@
 diff --git a/BUILD b/BUILD
-index 112432160..5d4c9de35 100644
+index 07ee629..09541cf 100644
 --- a/BUILD
 +++ b/BUILD
-@@ -292,36 +292,37 @@ cc_library(
+@@ -260,36 +260,38 @@ cc_library(
  # Map of all well known protos.
  # name => (include path, imports)
  WELL_KNOWN_PROTO_MAP = {
@@ -46,14 +46,15 @@ index 112432160..5d4c9de35 100644
 -    "wrappers": ("src/google/protobuf/wrappers.proto", []),
 +    "wrappers": ("google/protobuf/wrappers.proto", []),
  }
-+RELATIVE_WELL_KNOWN_PROTOS = [proto[1][0] for proto in WELL_KNOWN_PROTO_MAP.items()]
 
 -WELL_KNOWN_PROTOS = [value[0] for value in WELL_KNOWN_PROTO_MAP.values()]
++RELATIVE_WELL_KNOWN_PROTOS = [proto[1][0] for proto in WELL_KNOWN_PROTO_MAP.items()]
++
 +WELL_KNOWN_PROTOS = ["src/" + s for s in RELATIVE_WELL_KNOWN_PROTOS]
 
  filegroup(
      name = "well_known_protos",
-@@ -353,10 +354,17 @@ cc_library(
+@@ -321,10 +323,17 @@ cc_library(
  # )
  ################################################################################
 
@@ -72,16 +73,17 @@ index 112432160..5d4c9de35 100644
      visibility = ["//visibility:public"],
      deps = [dep + "_proto" for dep in proto[1][1]],
  ) for proto in WELL_KNOWN_PROTO_MAP.items()]
-@@ -850,7 +858,7 @@ internal_copied_filegroup(
+@@ -824,7 +833,8 @@ internal_copied_filegroup(
 
  # TODO(dzc): Remove this once py_proto_library can have labels in srcs, in
  # which case we can simply add :protos_python in srcs.
 -COPIED_WELL_KNOWN_PROTOS = ["python/" + s[4:] for s in WELL_KNOWN_PROTOS]
++
 +COPIED_WELL_KNOWN_PROTOS = ["python/" + s for s in RELATIVE_WELL_KNOWN_PROTOS]
 
  py_proto_library(
      name = "protobuf_python",
-@@ -968,7 +976,7 @@ cc_library(
+@@ -942,7 +952,7 @@ cc_library(
 
  proto_lang_toolchain(
      name = "cc_toolchain",

diff --git a/envoy b/envoy
diff --git a/envoy_build_config/extension_registry.cc b/envoy_build_config/extension_registry.cc
@@ -10,6 +10,7 @@
 #include "extensions/filters/http/dynamic_forward_proxy/config.h"
 #include "extensions/filters/http/router/config.h"
 #include "extensions/filters/network/http_connection_manager/config.h"
+#include "extensions/http/original_ip_detection/xff/config.h"
 #include "extensions/stat_sinks/metrics_service/config.h"
 #include "extensions/transport_sockets/raw_buffer/config.h"
 #include "extensions/transport_sockets/tls/cert_validator/default_validator.h"
@@ -25,6 +26,7 @@ namespace Envoy {
 void ExtensionRegistry::registerFactories() {
   Envoy::Extensions::Clusters::DynamicForwardProxy::forceRegisterClusterFactory();
   Envoy::Extensions::Compression::Gzip::Decompressor::forceRegisterGzipDecompressorLibraryFactory();
+  Envoy::Extensions::Http::OriginalIPDetection::Xff::forceRegisterXffIPDetectionFactory();
   Envoy::Extensions::HttpFilters::Assertion::forceRegisterAssertionFilterFactory();
   Envoy::Extensions::HttpFilters::Decompressor::forceRegisterDecompressorFilterFactory();
   Envoy::Extensions::HttpFilters::BufferFilter::forceRegisterBufferFilterFactory();

diff --git a/envoy_build_config/extension_registry.h b/envoy_build_config/extension_registry.h
@@ -9,6 +9,7 @@
 #include "extensions/filters/http/dynamic_forward_proxy/config.h"
 #include "extensions/filters/http/router/config.h"
 #include "extensions/filters/network/http_connection_manager/config.h"
+#include "extensions/http/original_ip_detection/xff/config.h"
 #include "extensions/stat_sinks/metrics_service/config.h"
 #include "extensions/transport_sockets/raw_buffer/config.h"
 #include "extensions/transport_sockets/tls/cert_validator/default_validator.h"

diff --git a/envoy_build_config/extensions_build_config.bzl b/envoy_build_config/extensions_build_config.bzl
@@ -12,6 +12,7 @@ EXTENSIONS = {
     "envoy.filters.http.router":                      "//source/extensions/filters/http/router:config",
     "envoy.filters.http.test_accessor":               "@envoy_mobile//library/common/extensions/filters/http/test_accessor:config",
     "envoy.filters.network.http_connection_manager":  "//source/extensions/filters/network/http_connection_manager:config",
+    "envoy.http.original_ip_detection.xff":           "//source/extensions/http/original_ip_detection/xff:config",
     "envoy.stat_sinks.metrics_service":               "//source/extensions/stat_sinks/metrics_service:config",
     "envoy.transport_sockets.raw_buffer":             "//source/extensions/transport_sockets/raw_buffer:config",
     "envoy.transport_sockets.tls":                    "//source/extensions/transport_sockets/tls:config",

diff --git a/library/common/extensions/filters/http/assertion/config.h b/library/common/extensions/filters/http/assertion/config.h
@@ -21,7 +21,7 @@ class AssertionFilterFactory
   AssertionFilterFactory() : FactoryBase("assertion") {}
 
 private:
-  Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
+  ::Envoy::Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
       const envoymobile::extensions::filters::http::assertion::Assertion& config,
       const std::string& stats_prefix, Server::Configuration::FactoryContext& context) override;
 };

diff --git a/library/common/extensions/filters/http/local_error/config.h b/library/common/extensions/filters/http/local_error/config.h
@@ -19,7 +19,7 @@ class LocalErrorFilterFactory
   LocalErrorFilterFactory() : FactoryBase("local_error") {}
 
 private:
-  Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
+  ::Envoy::Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
       const envoymobile::extensions::filters::http::local_error::LocalError& config,
       const std::string& stats_prefix, Server::Configuration::FactoryContext& context) override;
 };

diff --git a/library/common/extensions/filters/http/platform_bridge/config.h b/library/common/extensions/filters/http/platform_bridge/config.h
@@ -22,7 +22,7 @@ class PlatformBridgeFilterFactory
   PlatformBridgeFilterFactory() : FactoryBase("platform_bridge") {}
 
 private:
-  Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
+  ::Envoy::Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
       const envoymobile::extensions::filters::http::platform_bridge::PlatformBridge& config,
       const std::string& stats_prefix, Server::Configuration::FactoryContext& context) override;
 };

diff --git a/library/common/extensions/filters/http/route_cache_reset/config.h b/library/common/extensions/filters/http/route_cache_reset/config.h
@@ -20,7 +20,7 @@ class RouteCacheResetFilterFactory
   RouteCacheResetFilterFactory() : FactoryBase("route_cache_reset") {}
 
 private:
-  Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
+  ::Envoy::Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
       const envoymobile::extensions::filters::http::route_cache_reset::RouteCacheReset& config,
       const std::string& stats_prefix, Server::Configuration::FactoryContext& context) override;
 };

diff --git a/library/common/extensions/filters/http/test_accessor/config.h b/library/common/extensions/filters/http/test_accessor/config.h
@@ -23,7 +23,7 @@ class TestAccessorFilterFactory
   TestAccessorFilterFactory() : FactoryBase("test_accessor") {}
 
 private:
-  Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
+  ::Envoy::Http::FilterFactoryCb createFilterFactoryFromProtoTyped(
       const envoymobile::extensions::filters::http::test_accessor::TestAccessor& config,
       const std::string& stats_prefix, Server::Configuration::FactoryContext& context) override;
 };

diff --git a/library/common/extensions/filters/http/test_accessor/filter.h b/library/common/extensions/filters/http/test_accessor/filter.h
@@ -28,13 +28,13 @@ class TestAccessorFilterConfig {
 
 using TestAccessorFilterConfigSharedPtr = std::shared_ptr<TestAccessorFilterConfig>;
 
-class TestAccessorFilter final : public Http::PassThroughFilter {
+class TestAccessorFilter final : public ::Envoy::Http::PassThroughFilter {
 public:
   TestAccessorFilter(TestAccessorFilterConfigSharedPtr config) : config_(config) {}
 
   // StreamDecoderFilter
-  Http::FilterHeadersStatus decodeHeaders(Http::RequestHeaderMap& headers,
-                                          bool end_stream) override;
+  ::Envoy::Http::FilterHeadersStatus decodeHeaders(::Envoy::Http::RequestHeaderMap& headers,
+                                                   bool end_stream) override;
 
 private:
   const TestAccessorFilterConfigSharedPtr config_;