added containing file in entities

Author: wiauxb

cwaf-ontology/src/main/java/be/uclouvain/model/Directive.java

@@ -44,6 +44,7 @@ public class Directive implements Comparable<Directive>, Serializable {
     private Stack<String> trace;
     private String disabledBy;
     private String type;
+    private String fileURI;
 
     public Directive(CompileContext ctx, Individual resource) {
 
@@ -58,6 +59,13 @@ public Directive(CompileContext ctx, Individual resource) {
             this.type = resource.getPropertyValue(OntCWAF.DIR_TYPE).asLiteral().getString();
         }
 
+        // Retrieve the directive's file
+        ctx.getInfModel().listStatements(null, OntCWAF.CONTAINS_DIRECTIVE, resource).forEachRemaining( stmt -> {
+            if (stmt.getSubject().hasProperty(OntCWAF.FILE_PATH)) {
+                this.fileURI = stmt.getSubject().getURI();
+            }
+        });
+
         if (resource.hasOntClass(OntCWAF.MOD_SEC_RULE)) {
             if (resource.hasProperty(OntCWAF.RULE_ID)) {
                 setId(resource.getPropertyValue(OntCWAF.RULE_ID).asLiteral().getInt());
@@ -191,9 +199,9 @@ public String toString() {
                 ", ifLevel=" + ifLevel +
                 ", location='" + (location == null ? "global" : location) + '\'' +
                 ", virtualHost='" + (virtualHost== null ? "" : virtualHost) + '\'' +
-                ", lineNum=" + lineNum +
                 ", id=" + id +
                 ", tags=" + tags +
+                ", in " + fileURI + ":" + lineNum +
                 (EC == "true" ? "" : ", EC=" + EC) +
                 "}\t\t" + name + "\t\t(" + argsString + ")" + (disabledBy == null ? "" : " disabled by " + disabledBy);
     }
@@ -259,6 +267,7 @@ public Individual toEntityIndividual(OntModel model) {
         ind.addLiteral(OntCWAF.ARGUMENTS, String.join(" ", args));
         ind.addProperty(OntCWAF.INSTANCE_OF, resource);
         ind.addLiteral(OntCWAF.STACK_TRACE, trace.toString());
+        ind.addProperty(OntCWAF.CONTAINED_IN, fileURI);
         return ind; 
     }
 }

cwaf-ontology/src/main/java/be/uclouvain/service/Parser.java

@@ -42,7 +42,6 @@ public static OntModel parseConfig(String filePath) throws IOException {
     }
 
     private static Individual parseConfigFile(String filePath, OntModel model, Bag file_bag) throws IOException{
-        //TODO handle "\" for multiline directives
 
         //Check if file is already in the bag
         for (Iterator<RDFNode> i = file_bag.iterator(); i.hasNext();) {