luo980/json-schema-validator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for validate binary data in json (for bson or other

Browse Source 
implementations of binary json)
This commit is contained in:
andrejlevkovitch 2020-05-22 11:50:26 +03:00
parent 27fc1d0945
commit eac735ee63
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/json-validator.cpp
View File

@ -478,6 +478,7 @@ public:
{"boolean", json::value_t::boolean}, {"boolean", json::value_t::boolean},
{"integer", json::value_t::number_integer}, {"integer", json::value_t::number_integer},
{"number", json::value_t::number_float}, {"number", json::value_t::number_float},
{"binary", json::value_t::binary},
}; };
std::set<std::string> known_keywords; std::set<std::string> known_keywords;
@ -491,17 +492,37 @@ public:
case json::value_t::string: { case json::value_t::string: {
auto schema_type = attr.value().get<std::string>(); auto schema_type = attr.value().get<std::string>();
// add supporting validation binary types
if (schema_type == "string") {
auto found = sch.find("contentEncoding");
if (found != sch.end() && found->get<std::string>() == "binary") {
schema_type = "binary";
}
}
for (auto &t : schema_types) for (auto &t : schema_types)
if (t.first == schema_type) if (t.first == schema_type)
type_[(uint8_t) t.second] = type_schema::make(sch, t.second, root, uris, known_keywords); type_[(uint8_t) t.second] = type_schema::make(sch, t.second, root, uris, known_keywords);
} break; } break;
case json::value_t::array: // "type": ["type1", "type2"] case json::value_t::array: // "type": ["type1", "type2"]
for (auto &schema_type : attr.value()) {
json type_array = attr.value();
auto has_string_type = std::find(type_array.begin(), type_array.end(), "string");
if (has_string_type != type_array.end()) {
auto encodingFound = sch.find("contentEncoding");
if (encodingFound != sch.end() && encodingFound.value() == "binary") {
type_array.emplace_back("binary");
}
}
for (auto &schema_type : type_array)
for (auto &t : schema_types) for (auto &t : schema_types)
if (t.first == schema_type) if (t.first == schema_type)
type_[(uint8_t) t.second] = type_schema::make(sch, t.second, root, uris, known_keywords); type_[(uint8_t) t.second] = type_schema::make(sch, t.second, root, uris, known_keywords);
break; } break;
default: default:
break; break;
@ -1089,6 +1110,21 @@ public:
} }
}; };
/**\brief just a placeholder
*/
class binary : public schema
{
void validate(const json::json_pointer &, const json &, json_patch &, error_handler &) const override
{
}
public:
binary(json &, root_schema *root)
: schema(root)
{
}
};
std::shared_ptr<schema> type_schema::make(json &schema, std::shared_ptr<schema> type_schema::make(json &schema,
json::value_t type, json::value_t type,
root_schema *root, root_schema *root,
@ -1115,6 +1151,9 @@ std::shared_ptr<schema> type_schema::make(json &schema,
case json::value_t::discarded: // not a real type - silence please case json::value_t::discarded: // not a real type - silence please
break; break;
case json::value_t::binary: // can use for validate bson or other binary representation of json
return std::make_shared<binary>(schema, root);
} }
return nullptr; return nullptr;
} }

5
test/CMakeLists.txt
View File

@ -55,3 +55,8 @@ add_executable(json-patch json-patch.cpp)
target_include_directories(json-patch PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(json-patch PRIVATE ${PROJECT_SOURCE_DIR}/src)
target_link_libraries(json-patch nlohmann_json_schema_validator) target_link_libraries(json-patch nlohmann_json_schema_validator)
add_test(NAME json-patch COMMAND json-patch) add_test(NAME json-patch COMMAND json-patch)
add_executable(binary-validation binary-validation.cpp)
target_include_directories(binary-validation PRIVATE ${PROJECT_SOURCE_DIR}/src)
target_link_libraries(binary-validation PRIVATE nlohmann_json_schema_validator)
add_test(NAME binary-validation COMMAND binary-validation)