Add validation using com.networknt validator; tests pass

Author: fdechelle

build.gradle

@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'net.jimblackler.jsonschemafriend:core:0.11.2'
+    implementation 'com.networknt:json-schema-validator:1.0.64'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.0.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'

src/main/java/org/idmef/IDMEFValidator.java

@@ -1,43 +1,58 @@
 package org.idmef;
 
-import net.jimblackler.jsonschemafriend.*;
 
-import java.net.URL;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.SpecVersion;
+import com.networknt.schema.ValidationMessage;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
 
 public class IDMEFValidator {
     private static final String SCHEMA_RESOURCE_PATH = "/IDMEFv2.schema";
 
     /**
-     * Constructs an empty Message.
+     * Constructs a Validator.
      */
-    public IDMEFValidator() { }
+    public IDMEFValidator() {
+    }
+
+    private boolean validateJsonNode(JsonNode jsonNode) throws IDMEFException {
+        JsonSchemaFactory factory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4);
+        InputStream is = IDMEFValidator.class.getResourceAsStream(SCHEMA_RESOURCE_PATH);
+        if (is == null)
+            throw new IDMEFException("cannot load schema");
+
+        JsonSchema schema = factory.getSchema(is);
+
+        Set<ValidationMessage> errors = schema.validate(jsonNode);
+
+        return errors.size() == 0;
+    }
 
     /**
-     * Validate the Message content w.r.t. current IDMEF JSON schema.
+     * Validate the object content w.r.t. current IDMEF JSON schema.
      *
-     * @throws IDMEFException if the Message is not valid.
      */
-    public void validate(IDMEFObject idmefObject) throws IDMEFException {
-        URL r = IDMEFValidator.class.getResource(SCHEMA_RESOURCE_PATH);
-        if (r == null)
-            throw new IDMEFException("Cannot locate schema resource");
-
-        Schema schema;
-
-        SchemaStore schemaStore = new SchemaStore();
-        try {
-            schema = schemaStore.loadSchema(r);
-        } catch (GenerationException e) {
-            throw new IDMEFException("error loading schema:" + e.getMessage());
-        }
-
-        Validator validator = new Validator();
-
-        try {
-            validator.validate(schema, idmefObject);
-        } catch (ValidationException e) {
-            throw new IDMEFException("error validating:" + e.getMessage());
-        }
+    public boolean validate(IDMEFObject idmefObject) throws IDMEFException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        JsonNode jsonNode = objectMapper.valueToTree(idmefObject);
+
+        return validateJsonNode(jsonNode);
     }
 
+    /**
+     * Validate the bytes w.r.t. current IDMEF JSON schema.
+     *
+     */
+    public boolean validate(byte[] json) throws IOException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        JsonNode jsonNode = objectMapper.readTree(json);
+
+        return validateJsonNode(jsonNode);
+    }
 }

src/test/java/TestValidate.java

@@ -1,24 +1,57 @@
+import org.idmef.IDMEFException;
 import org.idmef.IDMEFObject;
 import org.idmef.IDMEFValidator;
 import org.junit.jupiter.api.Test;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class TestValidate {
 
-    private static void validate(IDMEFObject idmefObject) {
+    private static boolean validate(IDMEFObject idmefObject) {
+        IDMEFValidator validator = new IDMEFValidator();
+
+        try {
+            return validator.validate(idmefObject);
+        } catch (IDMEFException e) {
+            fail(e.getMessage());
+        }
+
+        return false;
+    }
+
+    private static boolean validate(byte[] json) {
         IDMEFValidator validator = new IDMEFValidator();
 
         try {
-            validator.validate(idmefObject);
-        } catch (Exception e) {
+            return validator.validate(json);
+        } catch (IOException e) {
             fail(e.getMessage());
         }
+
+        return false;
     }
 
     @Test
     void testValidateMessage1() {
-        validate(Util.message1());
+        assertTrue(validate(Util.message1()));
     }
 
+    @Test
+    void testValidateString1() {
+        assertTrue(validate(Util.string1().getBytes(StandardCharsets.UTF_8)));
+    }
+
+    @Test
+    void testValidateMessage2() {
+        assertTrue(validate(Util.message2()));
+    }
+
+    @Test
+    void testValidateString2() {
+        assertTrue(validate(Util.string2().getBytes(StandardCharsets.UTF_8)));
+    }
 }

src/test/java/Util.java

@@ -29,6 +29,8 @@ static IDMEFObject message1() {
         analyzer.put("Data", new String[]{"Log"});
         analyzer.put("Method", new String[]{"Monitor"});
 
+        msg.put("Analyzer", analyzer);
+
         return msg;
     }