Merge pull request google#8 from kiyoto-suzuki/feature/encryption_ver…

…ify_string add VerifyString for verifying encrypted string
d-yokoi · Dec 21, 2016 · 3bf29d9 · 3bf29d9
2 parents 0e05308 + 5b56af4
commit 3bf29d9
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 19 deletions.
diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
@@ -1408,12 +1408,8 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
     return Verify(reinterpret_cast<const Vector<T> *>(vec));
   }
 
+#ifndef FLATBUFFERS_ENCRYPTION
   // Verify a pointer (may be NULL) to string.
-#ifdef FLATBUFFERS_ENCRYPTION
-  bool Verify(const std::shared_ptr<String> str) const {
-    return str != nullptr;
-  }
-#else
   bool Verify(const String *str) const {
     const uint8_t *end;
     return !str ||
@@ -1446,8 +1442,7 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
         for (uoffset_t i = 0; i < vec->size(); i++) {
           const uint8_t* p = vec->Data() + sizeof(uoffset_t) * i;
           auto v = reinterpret_cast<const Vector<char> *>(p + ReadScalar<uoffset_t>(p));
-          auto str = Xxtea::DecryptString(v);
-          if (!Verify(str)) return false;
+          return (v != nullptr);
         }
       }
       return true;
@@ -1707,6 +1702,19 @@ class Table {
            verifier.Verify<T>(data_ + field_offset);
   }
 
+#ifdef FLATBUFFERS_ENCRYPTION
+  bool VerifyString(const Verifier &verifier, voffset_t field) const {
+    (void)verifier;
+    auto field_offset = GetOptionalFieldOffset(field);
+    auto p = data_ + field_offset;
+    return ReadScalar<uoffset_t>(p) > 0;
+  }
+#else
+  bool VerifyString(const Verifier &verifier, voffset_t field) const {
+    return verifier.Verify(GetString<const String *>(field));
+  }
+#endif
+
  private:
   // private constructor & copy constructor: you obtain instances of this
   // class by pointing to existing data only

diff --git a/include/flatbuffers/reflection_generated.h b/include/flatbuffers/reflection_generated.h
@@ -103,9 +103,9 @@ struct KeyValue FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_KEY) &&
-           verifier.Verify(key()) &&
+           VerifyString(verifier, VT_KEY) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_VALUE) &&
-           verifier.Verify(value()) &&
+           VerifyString(verifier, VT_VALUE) &&
            verifier.EndTable();
   }
 };
@@ -153,7 +153,7 @@ struct EnumVal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
-           verifier.Verify(name()) &&
+           VerifyString(verifier, VT_NAME) &&
            VerifyField<int64_t>(verifier, VT_VALUE) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_OBJECT) &&
            verifier.VerifyTable(object()) &&
@@ -212,7 +212,7 @@ struct Enum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
-           verifier.Verify(name()) &&
+           VerifyString(verifier, VT_NAME) &&
            VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_VALUES) &&
            verifier.Verify(values()) &&
            verifier.VerifyVectorOfTables(values()) &&
@@ -297,7 +297,7 @@ struct Field FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
-           verifier.Verify(name()) &&
+           VerifyString(verifier, VT_NAME) &&
            VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_TYPE) &&
            verifier.VerifyTable(type()) &&
            VerifyField<uint16_t>(verifier, VT_ID) &&
@@ -396,7 +396,7 @@ struct Object FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
-           verifier.Verify(name()) &&
+           VerifyString(verifier, VT_NAME) &&
            VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_FIELDS) &&
            verifier.Verify(fields()) &&
            verifier.VerifyVectorOfTables(fields()) &&
@@ -478,9 +478,9 @@ struct Schema FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
            verifier.Verify(enums()) &&
            verifier.VerifyVectorOfTables(enums()) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_FILE_IDENT) &&
-           verifier.Verify(file_ident()) &&
+           VerifyString(verifier, VT_FILE_IDENT) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_FILE_EXT) &&
-           verifier.Verify(file_ext()) &&
+           VerifyString(verifier, VT_FILE_EXT) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_ROOT_TABLE) &&
            verifier.VerifyTable(root_table()) &&
            verifier.EndTable();

diff --git a/samples/monster_generated.h b/samples/monster_generated.h
@@ -140,7 +140,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
            VerifyField<int16_t>(verifier, VT_MANA) &&
            VerifyField<int16_t>(verifier, VT_HP) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
-           verifier.Verify(name()) &&
+           VerifyString(verifier, VT_NAME) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_INVENTORY) &&
            verifier.Verify(inventory()) &&
            VerifyField<int8_t>(verifier, VT_COLOR) &&
@@ -230,7 +230,7 @@ struct Weapon FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
-           verifier.Verify(name()) &&
+           VerifyString(verifier, VT_NAME) &&
            VerifyField<int16_t>(verifier, VT_DAMAGE) &&
            verifier.EndTable();
   }

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
@@ -802,7 +802,11 @@ class CppGenerator : public BaseGenerator {
             }
             break;
           case BASE_TYPE_STRING:
+#ifdef FLATBUFFERS_ENCRYPTION
+            code += prefix + "VerifyString(verifier, " + GenFieldOffsetName(field) + ")";
+#else
             code += prefix + "verifier.Verify(" + field.name + "())";
+#endif
             break;
           case BASE_TYPE_VECTOR:
             code += prefix + "verifier.Verify(" + field.name + "())";

diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
@@ -239,7 +239,7 @@ struct Stat FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
   bool Verify(flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_ID) &&
-           verifier.Verify(id()) &&
+           VerifyString(verifier, VT_ID) &&
            VerifyField<int64_t>(verifier, VT_VAL) &&
            VerifyField<uint16_t>(verifier, VT_COUNT) &&
            verifier.EndTable();
@@ -410,7 +410,7 @@ struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
            VerifyField<int16_t>(verifier, VT_MANA) &&
            VerifyField<int16_t>(verifier, VT_HP) &&
            VerifyFieldRequired<flatbuffers::uoffset_t>(verifier, VT_NAME) &&
-           verifier.Verify(name()) &&
+           VerifyString(verifier, VT_NAME) &&
            VerifyField<flatbuffers::uoffset_t>(verifier, VT_INVENTORY) &&
            verifier.Verify(inventory()) &&
            VerifyField<int8_t>(verifier, VT_COLOR) &&