envoyproxy · mattklein123 · Feb 9, 2018 · Nov 21, 2017 · Nov 21, 2017 · Nov 22, 2017
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -71,7 +71,7 @@ REPOSITORY_LOCATIONS = dict(
         urls = ["https://github.com/google/protobuf/archive/v3.5.0.tar.gz"],
     ),
     envoy_api = dict(
-        commit = "4e533f22baced334c4aba68fb60c5fc439f0fe9c",
+        commit = "11adebcc8538bfe9facf6cef2168bb2885eb2c13",
         remote = "https://github.com/envoyproxy/data-plane-api",
     ),
     grpc_httpjson_transcoding = dict(

diff --git a/include/envoy/http/header_map.h b/include/envoy/http/header_map.h
@@ -231,6 +231,7 @@ class HeaderEntry {
  * O(1) access to these headers without even a hash lookup.
  */
 #define ALL_INLINE_HEADERS(HEADER_FUNC)                                                            \
+  HEADER_FUNC(AcceptEncoding)                                                                      \
   HEADER_FUNC(AccessControlRequestHeaders)                                                         \
   HEADER_FUNC(AccessControlRequestMethod)                                                          \
   HEADER_FUNC(AccessControlAllowOrigin)                                                            \
@@ -243,6 +244,7 @@ class HeaderEntry {
   HEADER_FUNC(CacheControl)                                                                        \
   HEADER_FUNC(ClientTraceId)                                                                       \
   HEADER_FUNC(Connection)                                                                          \
+  HEADER_FUNC(ContentEncoding)                                                                     \
   HEADER_FUNC(ContentLength)                                                                       \
   HEADER_FUNC(ContentType)                                                                         \
   HEADER_FUNC(Date)                                                                                \
@@ -266,6 +268,7 @@ class HeaderEntry {
   HEADER_FUNC(EnvoyUpstreamRequestTimeoutAltResponse)                                              \
   HEADER_FUNC(EnvoyUpstreamRequestTimeoutMs)                                                       \
   HEADER_FUNC(EnvoyUpstreamServiceTime)                                                            \
+  HEADER_FUNC(Etag)                                                                                \
   HEADER_FUNC(Expect)                                                                              \
   HEADER_FUNC(ForwardedClientCert)                                                                 \
   HEADER_FUNC(ForwardedFor)                                                                        \
@@ -275,6 +278,7 @@ class HeaderEntry {
   HEADER_FUNC(GrpcStatus)                                                                          \
   HEADER_FUNC(Host)                                                                                \
   HEADER_FUNC(KeepAlive)                                                                           \
+  HEADER_FUNC(LastModified)                                                                        \
   HEADER_FUNC(Method)                                                                              \
   HEADER_FUNC(Origin)                                                                              \
   HEADER_FUNC(OtSpanContext)                                                                       \
@@ -289,6 +293,7 @@ class HeaderEntry {
   HEADER_FUNC(TransferEncoding)                                                                    \
   HEADER_FUNC(Upgrade)                                                                             \
   HEADER_FUNC(UserAgent)                                                                           \
+  HEADER_FUNC(Vary)                                                                                \
   HEADER_FUNC(XB3TraceId)                                                                          \
   HEADER_FUNC(XB3SpanId)                                                                           \
   HEADER_FUNC(XB3ParentSpanId)                                                                     \

diff --git a/source/common/common/BUILD b/source/common/common/BUILD
@@ -128,6 +128,7 @@ envoy_cc_library(
         ":assert_lib",
         "//include/envoy/common:interval_set_interface",
         "//include/envoy/common:time_interface",
+        "//source/common/common:hash_lib",
     ],
 )
 

diff --git a/source/common/common/hash.h b/source/common/common/hash.h
@@ -2,6 +2,7 @@
 
 #include <string>
 
+#include "absl/strings/ascii.h"
 #include "absl/strings/string_view.h"
 #include "xxhash.h"
 
@@ -14,6 +15,22 @@ class HashUtil {
    * See https://github.com/Cyan4973/xxHash for details.
    */
   static uint64_t xxHash64(absl::string_view input) { return XXH64(input.data(), input.size(), 0); }
+
+  /**
+   * TODO(gsagula): extend xxHash to handle case-insensitive.
+   *
+   * Return 64-bit hash representation of string ingnoring case.
+   * See djb2 (http://www.cse.yorku.ca/~oz/hash.html) for more details.
+   * @param input supplies the string view.
+   * @return 64-bit hash representation of the supplied string view.
+   */
+  static uint64_t djb2CaseInsensitiveHash(absl::string_view input) {
+    uint64_t hash = 5381;
+    for (unsigned char c : input) {
+      hash += ((hash << 5) + hash) + absl::ascii_tolower(c);
+    };
+    return hash;
+  }
 };
 
 } // namespace Envoy
diff --git a/source/common/common/utility.cc b/source/common/common/utility.cc
@@ -6,14 +6,15 @@
 #include <cstdint>
 #include <iterator>
 #include <string>
-#include <vector>
 
 #include "envoy/common/exception.h"
 
 #include "common/common/assert.h"
 #include "common/common/fmt.h"
+#include "common/common/hash.h"
 
 #include "absl/strings/ascii.h"
+#include "absl/strings/internal/memutil.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
 #include "spdlog/spdlog.h"
@@ -102,25 +103,54 @@ absl::string_view StringUtil::trim(absl::string_view source) { return ltrim(rtri
 
 bool StringUtil::findToken(absl::string_view source, absl::string_view delimiters,
                            absl::string_view key_token, bool trim_whitespace) {
-  const std::vector<absl::string_view> tokens = splitToken(source, delimiters, trim_whitespace);
+  const auto tokens = splitToken(source, delimiters, trim_whitespace);
   if (trim_whitespace) {
-    for (auto token : tokens) {
+    for (const auto token : tokens) {
       if (key_token == trim(token)) {
         return true;
       }
     }
     return false;
   }
+
   return std::find(tokens.begin(), tokens.end(), key_token) != tokens.end();
 }
 
-absl::string_view StringUtil::cropRight(absl::string_view source, absl::string_view delimiter,
-                                        bool trim_whitespace) {
+bool StringUtil::caseFindToken(absl::string_view source, absl::string_view delimiters,
+                               absl::string_view key_token, bool trim_whitespace) {
+  const auto tokens = splitToken(source, delimiters, trim_whitespace);
+  std::function<bool(absl::string_view)> predicate;
+
+  if (trim_whitespace) {
+    predicate = [&](absl::string_view token) { return caseCompare(key_token, trim(token)); };
+  } else {
+    predicate = [&](absl::string_view token) { return caseCompare(key_token, token); };
+  }
+
+  return std::find_if(tokens.begin(), tokens.end(), predicate) != tokens.end();
+}
+
+bool StringUtil::caseCompare(absl::string_view lhs, absl::string_view rhs) {
+  if (rhs.size() != lhs.size()) {
+    return false;
+  }
+  return absl::strings_internal::memcasecmp(rhs.data(), lhs.data(), rhs.size()) == 0;
+}
+
+absl::string_view StringUtil::cropRight(absl::string_view source, absl::string_view delimiter) {
   const absl::string_view::size_type pos = source.find(delimiter);
   if (pos != absl::string_view::npos) {
     source.remove_suffix(source.size() - pos);
   }
-  return trim_whitespace ? rtrim(source) : source;
+  return source;
+}
+
+absl::string_view StringUtil::cropLeft(absl::string_view source, absl::string_view delimiter) {
+  const absl::string_view::size_type pos = source.find(delimiter);
+  if (pos != absl::string_view::npos) {
+    source.remove_prefix(pos + delimiter.size());
+  }
+  return source;
 }
 
 std::vector<absl::string_view> StringUtil::splitToken(absl::string_view source,
@@ -239,6 +269,15 @@ std::string StringUtil::toUpper(absl::string_view s) {
   return upper_s;
 }
 
+bool StringUtil::CaseInsensitiveCompare::operator()(absl::string_view lhs,
+                                                    absl::string_view rhs) const {
+  return StringUtil::caseCompare(lhs, rhs);
+}
+
+uint64_t StringUtil::CaseInsensitiveHash::operator()(absl::string_view key) const {
+  return HashUtil::djb2CaseInsensitiveHash(key);
+}
+
 std::string StringUtil::removeCharacters(const absl::string_view& str,
                                          const IntervalSet<size_t>& remove_characters) {
   std::string ret;

diff --git a/source/common/common/utility.h b/source/common/common/utility.h
@@ -8,6 +8,7 @@
 #include <set>
 #include <sstream>
 #include <string>
+#include <unordered_set>
 #include <vector>
 
 #include "envoy/common/interval_set.h"
@@ -170,7 +171,7 @@ class StringUtil {
    * string views; default = true.
    * @return true if found and false otherwise.
    *
-   * E.g,
+   * E.g.,
    *
    * findToken("A=5; b", "=;", "5")   . true
    * findToken("A=5; b", "=;", "A=5") . false
@@ -181,17 +182,60 @@ class StringUtil {
   static bool findToken(absl::string_view source, absl::string_view delimiters,
                         absl::string_view token, bool trim_whitespace = true);
 
+  /**
+   * Look up for a token in a delimiter-separated string view ignoring case
+   * sensitivity.
+   * @param source supplies the delimiter-separated string view.
+   * @param multi-delimiter supplies chars used to split the delimiter-separated string view.
+   * @param token supplies the lookup string view.
+   * @param trim_whitespace remove leading and trailing whitespaces from each of the split
+   * string views; default = true.
+   * @return true if found a string that is semantically the same and false otherwise.
+   *
+   * E.g.,
+   *
+   * findToken("hello; world", ";", "HELLO")   . true
+   */
+  static bool caseFindToken(absl::string_view source, absl::string_view delimiters,
+                            absl::string_view key_token, bool trim_whitespace = true);
+
+  /**
+   * Compare one string view with another string view ignoring case sensitivity.
+   * @param lhs supplies the first string view.
+   * @param rhs supplies the second string view.
+   * @return true if strings are semantically the same and false otherwise.
+   *
+   * E.g.,
+   *
+   * findToken("hello; world", ";", "HELLO")   . true
+   */
+  static bool caseCompare(absl::string_view lhs, absl::string_view rhs);
+
   /**
    * Crop characters from a string view starting at the first character of the matched
    * delimiter string view until the end of the source string view.
    * @param source supplies the string view to be processed.
    * @param delimiter supplies the string view that delimits the starting point for deletion.
-   * @param trim_whitespace remove leading and trailing whitespaces from each of the split
-   * string views; default = true.
    * @return sub-string of the string view if any.
+   *
+   * E.g.,
+   *
+   * cropRight("foo ; ; ; ; ; ; ", ";") == "foo "
    */
-  static absl::string_view cropRight(absl::string_view source, absl::string_view delimiters,
-                                     bool trim_whitespace = true);
+  static absl::string_view cropRight(absl::string_view source, absl::string_view delimiters);
+
+  /**
+   * Crop characters from a string view starting at the first character of the matched
+   * delimiter string view until the begining of the source string view.
+   * @param source supplies the string view to be processed.
+   * @param delimiter supplies the string view that delimits the starting point for deletion.
+   * @return sub-string of the string view if any.
+   *
+   * E.g.,
+   *
+   * cropLeft("foo ; ; ; ; ; ", ";") == " ; ; ; ; "
+   */
+  static absl::string_view cropLeft(absl::string_view source, absl::string_view delimiters);
 
   /**
    * Split a delimiter-separated string view.
@@ -259,6 +303,31 @@ class StringUtil {
    */
   static std::string toUpper(absl::string_view s);
 
+  /**
+   * Callable struct that returns the result of string comparison ignoring case.
+   * @param lhs supplies the first string view.
+   * @param rhs supplies the second string view.
+   * @return true if strings are semantically the same and false otherwise.
+   */
+  struct CaseInsensitiveCompare {
+    bool operator()(absl::string_view lhs, absl::string_view rhs) const;
+  };
+
+  /**
+   * Callable struct that returns the hash representation of a case-insensitive string_view input.
+   * @param key supplies the string view.
+   * @return uint64_t hash representation of the supplied string view.
+   */
+  struct CaseInsensitiveHash {
+    uint64_t operator()(absl::string_view key) const;
+  };
+
+  /**
+   * Definition of unordered set of case-insensitive std::string.
+   */
+  typedef std::unordered_set<std::string, CaseInsensitiveHash, CaseInsensitiveCompare>
+      CaseUnorderedSet;
+
   /**
    * Removes all the character indices from str contained in the interval-set.
    * @param str the string containing the characters to be removed.

diff --git a/source/common/compressor/zlib_compressor_impl.h b/source/common/compressor/zlib_compressor_impl.h
@@ -27,8 +27,9 @@ class ZlibCompressorImpl : public Compressor {
   /**
    * Enum values used to set compression level during initialization.
    * best: gives best compression.
-   * speed: gives best.
-   * standard: gives normal compression. (default)
+   * speed: gives best performance.
+   * standard: requests a default compromise between speed and compression. (default) @see zlib
+   * manual.
    */
   enum class CompressionLevel : int64_t {
     Best = 9,
@@ -41,7 +42,7 @@ class ZlibCompressorImpl : public Compressor {
    * filtered: used for data produced by a filter. (or predictor) @see Z_FILTERED (zlib manual)
    * huffman: used to enforce Huffman encoding. @see RFC 1951
    * rle: used to limit match distances to one. (Run-length encoding)
-   * standard: used for normal data. (default) @see Z_DEFAULT_STRATEGY (zlib manual)
+   * standard: used for normal data. (default) @see Z_DEFAULT_STRATEGY in zlib manual.
    */
   enum class CompressionStrategy : uint64_t {
     Filtered = 1,

diff --git a/source/common/config/BUILD b/source/common/config/BUILD
@@ -104,6 +104,7 @@ envoy_cc_library(
         "//source/common/protobuf:utility_lib",
         "@envoy_api//envoy/config/filter/http/buffer/v2:buffer_cc",
         "@envoy_api//envoy/config/filter/http/fault/v2:fault_cc",
+        "@envoy_api//envoy/config/filter/http/gzip/v2:gzip_cc",
         "@envoy_api//envoy/config/filter/http/health_check/v2:health_check_cc",
         "@envoy_api//envoy/config/filter/http/lua/v2:lua_cc",
         "@envoy_api//envoy/config/filter/http/rate_limit/v2:rate_limit_cc",

diff --git a/source/common/config/filter_json.h b/source/common/config/filter_json.h
@@ -180,6 +180,5 @@ class FilterJson {
   static void translateSquashConfig(const Json::Object& json_config,
                                     envoy::config::filter::http::squash::v2::Squash& proto_config);
 };
-
 } // namespace Config
 } // namespace Envoy
diff --git a/source/common/config/well_known_names.h b/source/common/config/well_known_names.h
@@ -121,6 +121,8 @@ class HttpFilterNameValues {
   const std::string GRPC_JSON_TRANSCODER = "envoy.grpc_json_transcoder";
   // GRPC web filter
   const std::string GRPC_WEB = "envoy.grpc_web";
+  // Gzip filter
+  const std::string ENVOY_GZIP = "envoy.gzip";
   // IP tagging filter
   const std::string IP_TAGGING = "envoy.ip_tagging";
   // Rate limit filter

diff --git a/source/common/decompressor/zlib_decompressor_impl.h b/source/common/decompressor/zlib_decompressor_impl.h
@@ -46,7 +46,7 @@ class ZlibDecompressorImpl : public Decompressor {
 private:
   bool inflateNext();
 
-  uint64_t chunk_size_;
+  const uint64_t chunk_size_;
   bool initialized_;
 
   std::unique_ptr<unsigned char[]> chunk_char_ptr_;

diff --git a/source/common/http/filter/BUILD b/source/common/http/filter/BUILD
@@ -67,6 +67,24 @@ envoy_cc_library(
     ],
 )
 
+envoy_cc_library(
+    name = "gzip_filter_lib",
+    srcs = ["gzip_filter.cc"],
+    hdrs = ["gzip_filter.h"],
+    deps = [
+        "//include/envoy/http:filter_interface",
+        "//include/envoy/json:json_object_interface",
+        "//source/common/buffer:buffer_lib",
+        "//source/common/compressor:compressor_lib",
+        "//source/common/http:header_map_lib",
+        "//source/common/http:headers_lib",
+        "//source/common/json:config_schemas_lib",
+        "//source/common/json:json_validator_lib",
+        "//source/common/protobuf",
+        "@envoy_api//envoy/config/filter/http/gzip/v2:gzip_cc",
+    ],
+)
+
 envoy_cc_library(
     name = "ip_tagging_filter_lib",
     srcs = ["ip_tagging_filter.cc"],