modified call trace

Author: wiauxb

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

@@ -45,6 +45,7 @@ public class Directive implements Comparable<Directive>, Serializable {
     private String disabledBy;
     private String type;
     private String fileURI;
+    private String entityURI;
 
     public Directive(CompileContext ctx, Individual resource) {
 
@@ -94,10 +95,11 @@ public Directive(CompileContext ctx, Individual resource) {
             }
         });
 
-        this.trace = ctx.getTraceURIs();
+        this.trace = ctx.getCallTrace();
 
         this.resource = resource;
         this.resourceURI = resource.getURI();
+        this.entityURI = getURIForName(name);
     }
 
     public static void removeById(int id, String disabledBy) {
@@ -120,6 +122,10 @@ public static void removeByTag(String tag, String disabledBy) {
         });
     }
 
+    public String getEntityURI() {
+        return entityURI;
+    }
+
     public boolean isBeacon() {
         return resource.hasOntClass(OntCWAF.BEACON);
     }
@@ -160,6 +166,10 @@ public String getType() {
         return type;
     }
 
+    public String getFileURI() {
+        return fileURI;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) return true;
@@ -249,7 +259,7 @@ public void updateContext(CompileContext ctx) {
     }
 
     public Individual toEntityIndividual(OntModel model) {
-        Individual ind = model.createIndividual(getURIForName(name), resource.getOntClass());
+        Individual ind = model.createIndividual(entityURI, resource.getOntClass());
         ind.addLiteral(OntCWAF.DIR_LINE_NUM, lineNum);
         ind.addLiteral(OntCWAF.PHASE, phase);
         if (id != null) {

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

@@ -100,11 +100,11 @@ private static Stream<Directive> getOrderedDirectives(CompileContext ctx, Indivi
     }
 
     public static Stream<Directive> compileContainer(CompileContext ctx, Individual container) {
-        ctx.push(container);
+        ctx.stackTracePush(container);
         Stream<Directive> directives = getOrderedDirectives(ctx, container);
         CompileContext ctx_copy = new CompileContext(ctx);
         Stream<Directive> res = directives.flatMap( dir -> compileDirective(ctx_copy, dir));
-        ctx.pop();
+        ctx.stackTracePop();
         return res;
     }
 
@@ -124,7 +124,10 @@ public static Stream<Directive> compileFile(CompileContext ctx, Individual file,
 
     private static Stream<Directive> expandInclude(CompileContext ctx, Directive include) {
         Individual file = include.getIndividual().getProperty(OntCWAF.INCLUDE_FILE).getObject().as(Individual.class);
-        return compileFile(ctx, file);//, include.getScope()
+        ctx.callTracePush(include, file);
+        Stream<Directive> res = compileFile(ctx, file);
+        ctx.callTracePop();
+        return res;//, include.getScope()
     }
 
     private static Stream<Directive> expandUse(CompileContext ctx, Directive use) {
@@ -145,7 +148,11 @@ private static Stream<Directive> expandUse(CompileContext ctx, Directive use) {
         // }
         String[] args = use.getArgs();
         // System.err.println("Using macro: " + macro.getLocalName() + " with args " + Arrays.toString(args));
-        return compileMacroContent(ctx, macro, args); //, use.getScope()
+
+        ctx.callTracePush(use, macro);
+        Stream<Directive> res = compileMacroContent(ctx, macro, args);
+        ctx.callTracePop();
+        return res; //, use.getScope()
     }
 
     private static Stream<Directive> compileMacroContent(CompileContext ctx, Individual macro, String[] args) { //, String[] use_scope

cwaf-ontology/src/main/java/be/uclouvain/service/context/CallTraceElem.java

@@ -0,0 +1,34 @@
+package be.uclouvain.service.context;
+
+import org.apache.jena.ontology.Individual;
+
+import be.uclouvain.model.Directive;
+import be.uclouvain.vocabulary.OntCWAF;
+
+public class CallTraceElem {
+    
+    String callingURI;
+    String calledURI;
+    String fileURI;
+    int lineNum;
+
+    public CallTraceElem(Directive directive, Individual called) {
+        this.callingURI = directive.getIndividual().getURI();
+        this.calledURI = called.getURI();
+        this.fileURI = directive.getFileURI();
+        this.lineNum = directive.getLineNum();
+    }
+
+    public CallTraceElem(String callingURI, String calledURI, String fileURI, int lineNum) {
+        this.callingURI = callingURI;
+        this.calledURI = calledURI;
+        this.fileURI = fileURI;
+        this.lineNum = lineNum;
+    }
+
+    @Override
+    public String toString() {
+        String file = fileURI.replace(OntCWAF.NS, "");
+        return calledURI + " from " + callingURI + "(" + file + ":" + lineNum + ")";
+    }
+}

cwaf-ontology/src/main/java/be/uclouvain/service/context/CompileContext.java

@@ -9,6 +9,7 @@
 import org.apache.jena.rdf.model.ModelFactory;
 
 import be.uclouvain.model.Condition;
+import be.uclouvain.model.Directive;
 import be.uclouvain.model.LocalVar;
 import be.uclouvain.model.Scope;
 
@@ -18,6 +19,7 @@ public class CompileContext{
     private OntModel schema;
     private OntModel infModel;
     private Stack<Individual> trace = new Stack<>();
+    private Stack<CallTraceElem> callTrace = new Stack<>();
     private List<LocalVar> localVars = new ArrayList<>();
     private Stack<Condition> existance_conditions = new Stack<>();
     private Scope scope = new Scope();
@@ -45,6 +47,7 @@ public CompileContext(CompileContext other){
         definedMacros.addAll(other.definedMacros);
 
         trace.addAll(other.trace);
+        callTrace.addAll(other.callTrace);
         localVars.addAll(other.localVars);
         existance_conditions.addAll(other.existance_conditions);
     }
@@ -72,14 +75,27 @@ public void setSchema(OntModel schema) {
         this.infModel.add(schema);
     }
 
-    public void push(Individual directive) {
+    public void stackTracePush(Individual directive) {
         trace.push(directive);
     }
 
-    public Individual pop() {
+    public Individual stackTracePop() {
         return trace.pop();
     }
 
+    public void callTracePush(Directive directive, Individual called) {
+        CallTraceElem elem = new CallTraceElem(directive, called);
+        callTrace.push(elem);
+    }
+
+    public void callTracePush(CallTraceElem elem) {
+        callTrace.push(elem);
+    }
+
+    public CallTraceElem callTracePop() {
+        return callTrace.pop();
+    }
+
     public void addVar(String name, String value){
         if (localVars.stream().anyMatch(v -> v.name.equals(name))){
             localVars.removeIf(v -> v.name.equals(name));
@@ -172,12 +188,12 @@ public Stack<Individual> getTrace() {
         return trace;
     }
 
-    public Stack<String> getTraceURIs() {
-        Stack<String> uris = new Stack<>();
-        for (Individual ind : trace) {
-            uris.push(ind.getURI());
+    public Stack<String> getCallTrace() {
+        Stack<String> trace = new Stack<>();
+        for (CallTraceElem elem : callTrace) {
+            trace.push(elem.toString());
         }
-        return uris;
+        return trace;
     }
 
     public String getCurrentVirtualHost() {