escape bytes attributes in DebugString (envoyproxy#103)

rshriram · Aug 29, 2017 · c6fbd2e · c6fbd2e
1 parent fb3e1b7
commit c6fbd2e
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/mixerclient/src/attribute.cc b/mixerclient/src/attribute.cc
@@ -14,11 +14,31 @@
  */
 
 #include "include/attribute.h"
+#include <iomanip>
+#include <locale>
 #include <sstream>
 
 namespace istio {
 namespace mixer_client {
 
+namespace {
+
+std::string escape(const std::string& source) {
+  std::stringstream ss;
+  static const std::locale& loc = std::locale::classic();
+
+  for (const auto& c : source) {
+    if (std::isprint(c, loc)) {
+      ss << c;
+    } else {
+      ss << "\\x" << std::setfill('0') << std::setw(2) << std::hex
+         << static_cast<uint16_t>(c);
+    }
+  }
+  return ss.str();
+}
+}
+
 const std::string Attributes::kQuotaName = "quota.name";
 const std::string Attributes::kQuotaAmount = "quota.amount";
 
@@ -120,7 +140,7 @@ std::string Attributes::DebugString() const {
         ss << "(STRING): " << it.second.str_v;
         break;
       case Attributes::Value::ValueType::BYTES:
-        ss << "(BYTES): " << it.second.str_v;
+        ss << "(BYTES): " << escape(it.second.str_v);
         break;
       case Attributes::Value::ValueType::INT64:
         ss << "(INT64): " << it.second.value.int64_v;