Cherry-pick of envoyproxy#9839

Signed-off-by: Kuat Yessenov <kuat@google.com>
kyessenov · Jan 28, 2020 · 8898368 · 8898368
1 parent ed8447b
commit 8898368
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/docs/root/intro/arch_overview/security/rbac_filter.rst b/docs/root/intro/arch_overview/security/rbac_filter.rst
@@ -81,6 +81,7 @@ The following attributes are exposed to the language runtime:
    response.headers, string map, All response headers
    response.trailers, string map, All response trailers
    response.size, int, Size of the response body
+   response.total_size, int, Total size of the response including the approximate uncompressed size of the headers and the trailers
    response.flags, int, Additional details about the response beyond the standard response code
    source.address, string, Downstream connection remote address
    source.port, int, Downstream connection remote port

diff --git a/source/extensions/filters/common/expr/context.cc b/source/extensions/filters/common/expr/context.cc
@@ -131,6 +131,9 @@ absl::optional<CelValue> ResponseWrapper::operator[](CelValue key) const {
     return CelValue::CreateMap(&trailers_);
   } else if (value == Flags) {
     return CelValue::CreateInt64(info_.responseFlags());
+  } else if (value == TotalSize) {
+    return CelValue::CreateInt64(info_.bytesSent() + headers_.value_->byteSize().value() +
+                                 trailers_.value_->byteSize().value());
   }
   return {};
 }

diff --git a/source/extensions/filters/common/expr/context.h b/source/extensions/filters/common/expr/context.h
@@ -76,6 +76,7 @@ class HeadersWrapper : public google::api::expr::runtime::CelMap {
 
 private:
   friend class RequestWrapper;
+  friend class ResponseWrapper;
   const Http::HeaderMap* value_;
 };
 

diff --git a/test/extensions/filters/common/expr/context_test.cc b/test/extensions/filters/common/expr/context_test.cc
@@ -214,6 +214,14 @@ TEST(Context, ResponseAttributes) {
     EXPECT_EQ(123, value.value().Int64OrDie());
   }
 
+  {
+    auto value = response[CelValue::CreateString(TotalSize)];
+    EXPECT_TRUE(value.has_value());
+    ASSERT_TRUE(value.value().IsInt64());
+    EXPECT_EQ(148, value.value().Int64OrDie());
+  }
+
+
   {
     auto value = response[CelValue::CreateString(Code)];
     EXPECT_TRUE(value.has_value());