implement upstream secure bit (#2133)

kyessenov · Joshua Blatt · commit d857bdd02af7 · 2019-02-28T21:27:15.000-08:00
Signed-off-by: Kuat Yessenov &lt;kuat@google.com&gt;
diff --git a/include/istio/control/http/report_data.h b/include/istio/control/http/report_data.h
@@ -49,6 +49,9 @@ class ReportData {
   // Get destination ip/port.
   virtual bool GetDestinationIpPort(std::string *ip, int *port) const = 0;
 
+  // Indicates whether the upstream connection is secure.
+  virtual bool IsUpstreamSecure() const = 0;
+
   // Get Rbac attributes.
   struct RbacReportInfo {
     std::string permissive_resp_code;
diff --git a/include/istio/control/tcp/report_data.h b/include/istio/control/tcp/report_data.h
@@ -45,6 +45,9 @@ class ReportData {
   // Get upstream host UID. This value overrides the value in the report bag.
   virtual bool GetDestinationUID(std::string *uid) const = 0;
 
+  // Indicates whether the upstream connection is secure.
+  virtual bool IsUpstreamSecure() const = 0;
+
   // ConnectionEvent is used to indicates the tcp connection event in Report
   // call.
   enum ConnectionEvent {
diff --git a/include/istio/utils/attribute_names.h b/include/istio/utils/attribute_names.h
@@ -78,6 +78,7 @@ struct AttributeName {
   static const char kConnectionDuration[];
   static const char kConnectionMtls[];
   static const char kConnectionRequestedServerName[];
+  static const char kConnectionUpstreamSecure[];
   static const char kConnectionId[];
   // Record TCP connection status: open, continue, close
   static const char kConnectionEvent[];
diff --git a/src/envoy/http/mixer/report_data.h b/src/envoy/http/mixer/report_data.h
@@ -115,6 +115,16 @@ class ReportData : public ::istio::control::http::ReportData,
     return false;
   }
 
+  bool IsUpstreamSecure() const override {
+    if (info_.upstreamHost()) {
+      return info_.upstreamHost()
+          ->cluster()
+          .transportSocketFactory()
+          .implementsSecureTransport();
+    }
+    return false;
+  }
+
   bool GetGrpcStatus(GrpcStatus *status) const override {
     // Check trailer first.
     // If not response body, grpc-status is in response headers.
diff --git a/src/envoy/tcp/mixer/filter.cc b/src/envoy/tcp/mixer/filter.cc
@@ -219,6 +219,16 @@ bool Filter::GetDestinationUID(std::string *uid) const {
   return false;
 }
 
+bool Filter::IsUpstreamSecure() const {
+  if (filter_callbacks_->upstreamHost()) {
+    return filter_callbacks_->upstreamHost()
+        ->cluster()
+        .transportSocketFactory()
+        .implementsSecureTransport();
+  }
+  return false;
+}
+
 const ::google::protobuf::Map<std::string, ::google::protobuf::Struct>
     &Filter::GetDynamicFilterState() const {
   return cached_filter_metadata_;
diff --git a/src/envoy/tcp/mixer/filter.h b/src/envoy/tcp/mixer/filter.h
@@ -60,6 +60,7 @@ class Filter : public Network::Filter,
   // ReportData virtual functions.
   bool GetDestinationIpPort(std::string *str_ip, int *port) const override;
   bool GetDestinationUID(std::string *uid) const override;
+  bool IsUpstreamSecure() const override;
   const ::google::protobuf::Map<std::string, ::google::protobuf::Struct>
       &GetDynamicFilterState() const override;
   void GetReportInfo(
diff --git a/src/envoy/utils/utils.h b/src/envoy/utils/utils.h
@@ -20,6 +20,7 @@
 
 #include "envoy/http/header_map.h"
 #include "envoy/network/connection.h"
+#include "envoy/upstream/upstream.h"
 #include "google/protobuf/util/json_util.h"
 #include "include/istio/mixerclient/check_response.h"
 
diff --git a/src/istio/control/http/attributes_builder.cc b/src/istio/control/http/attributes_builder.cc
@@ -222,6 +222,10 @@ void AttributesBuilder::ExtractReportAttributes(
     builder.AddString(utils::AttributeName::kDestinationUID, uid);
   }
 
+  if (report_data->IsUpstreamSecure()) {
+    builder.AddBool(utils::AttributeName::kConnectionUpstreamSecure, true);
+  }
+
   std::map<std::string, std::string> headers =
       report_data->GetResponseHeaders();
   builder.AddStringMap(utils::AttributeName::kResponseHeaders, headers);
diff --git a/src/istio/control/http/attributes_builder_test.cc b/src/istio/control/http/attributes_builder_test.cc
@@ -758,6 +758,7 @@ TEST(AttributesBuilderTest, TestReportAttributes) {
         *uid = "pod1.ns2";
         return true;
       }));
+  EXPECT_CALL(mock_data, IsUpstreamSecure()).WillOnce(testing::Return(true));
   EXPECT_CALL(mock_data, GetResponseHeaders())
       .WillOnce(Invoke([]() -> std::map<std::string, std::string> {
         std::map<std::string, std::string> map;
@@ -803,6 +804,9 @@ TEST(AttributesBuilderTest, TestReportAttributes) {
   (*expected_attributes
         .mutable_attributes())[utils::AttributeName::kDestinationUID]
       .set_string_value("pod1.ns2");
+  (*expected_attributes
+        .mutable_attributes())[utils::AttributeName::kConnectionUpstreamSecure]
+      .set_bool_value(true);
   (*expected_attributes
         .mutable_attributes())[utils::AttributeName::kResponseGrpcStatus]
       .set_string_value("grpc-status");
@@ -838,6 +842,7 @@ TEST(AttributesBuilderTest, TestReportAttributesWithDestIP) {
         return true;
       }));
   EXPECT_CALL(mock_data, GetDestinationUID(_)).WillOnce(testing::Return(false));
+  EXPECT_CALL(mock_data, IsUpstreamSecure()).WillOnce(testing::Return(false));
   EXPECT_CALL(mock_data, GetResponseHeaders())
       .WillOnce(Invoke([]() -> std::map<std::string, std::string> {
         std::map<std::string, std::string> map;
diff --git a/src/istio/control/http/mock_report_data.h b/src/istio/control/http/mock_report_data.h
@@ -30,6 +30,7 @@ class MockReportData : public ReportData {
   MOCK_CONST_METHOD1(GetReportInfo, void(ReportInfo *info));
   MOCK_CONST_METHOD2(GetDestinationIpPort, bool(std::string *ip, int *port));
   MOCK_CONST_METHOD1(GetDestinationUID, bool(std::string *ip));
+  MOCK_CONST_METHOD0(IsUpstreamSecure, bool());
   MOCK_CONST_METHOD1(GetGrpcStatus, bool(GrpcStatus *status));
   MOCK_CONST_METHOD1(GetRbacReportInfo, bool(RbacReportInfo *info));
   MOCK_CONST_METHOD0(
diff --git a/src/istio/control/tcp/attributes_builder.cc b/src/istio/control/tcp/attributes_builder.cc
@@ -133,6 +133,10 @@ void AttributesBuilder::ExtractReportAttributes(
     builder.AddString(utils::AttributeName::kDestinationUID, uid);
   }
 
+  if (report_data->IsUpstreamSecure()) {
+    builder.AddBool(utils::AttributeName::kConnectionUpstreamSecure, true);
+  }
+
   builder.FlattenMapOfStringToStruct(report_data->GetDynamicFilterState());
 
   builder.AddTimestamp(utils::AttributeName::kContextTime,
diff --git a/src/istio/control/tcp/attributes_builder_test.cc b/src/istio/control/tcp/attributes_builder_test.cc
@@ -138,6 +138,12 @@ attributes {
     int64_value: 0
   }
 }
+attributes {
+  key: "connection.upstream_secure"
+  value {
+    bool_value: true
+  }
+}
 attributes {
   key: "context.time"
   value {
@@ -256,6 +262,12 @@ attributes {
     string_value: "pod1.ns2"
   }
 }
+attributes {
+  key: "connection.upstream_secure"
+  value {
+    bool_value: true
+  }
+}
 attributes {
   key: "foo.bar.com"
   value {
@@ -317,6 +329,12 @@ attributes {
     bytes_value: "1.2.3.4"
   }
 }
+attributes {
+  key: "connection.upstream_secure"
+  value {
+    bool_value: true
+  }
+}
 attributes {
   key: "destination.port"
   value {
@@ -402,6 +420,12 @@ attributes {
     string_value: "pod1.ns2"
   }
 }
+attributes {
+  key: "connection.upstream_secure"
+  value {
+    bool_value: true
+  }
+}
 attributes {
   key: "foo.bar.com"
   value {
@@ -501,6 +525,8 @@ TEST(AttributesBuilderTest, TestReportAttributes) {
         *uid = "pod1.ns2";
         return true;
       }));
+  EXPECT_CALL(mock_data, IsUpstreamSecure())
+      .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(mock_data, GetDynamicFilterState())
       .Times(4)
       .WillRepeatedly(ReturnRef(filter_metadata));
diff --git a/src/istio/control/tcp/mock_report_data.h b/src/istio/control/tcp/mock_report_data.h
@@ -28,6 +28,7 @@ class MockReportData : public ReportData {
  public:
   MOCK_CONST_METHOD2(GetDestinationIpPort, bool(std::string *ip, int *port));
   MOCK_CONST_METHOD1(GetDestinationUID, bool(std::string *));
+  MOCK_CONST_METHOD0(IsUpstreamSecure, bool());
   MOCK_CONST_METHOD0(
       GetDynamicFilterState,
       const ::google::protobuf::Map<std::string, ::google::protobuf::Struct>
diff --git a/src/istio/utils/attribute_names.cc b/src/istio/utils/attribute_names.cc
@@ -75,6 +75,8 @@ const char AttributeName::kConnectionDuration[] = "connection.duration";
 const char AttributeName::kConnectionMtls[] = "connection.mtls";
 const char AttributeName::kConnectionRequestedServerName[] =
     "connection.requested_server_name";
+const char AttributeName::kConnectionUpstreamSecure[] =
+    "connection.upstream_secure";
 
 // Downstream TCP connection id.
 const char AttributeName::kConnectionId[] = "connection.id";
