JS: Extract mapping from HTML node to parent Expression

asgerf · asgerf · commit f24af58a60ea · 2021-01-18T12:19:08.000Z
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -1143,15 +1143,15 @@ public Label visit(Property nd, Context c) {
       locationManager.emitNodeLocation(nd, propkey);
       visitAll(nd.getDecorators(), propkey, IdContext.varBind, -1, -1);
       visit(nd.getKey(), propkey, 0, nd.isComputed() ? IdContext.varBind : IdContext.label);
-      visit(nd.getValue(), propkey, 1, c.idcontext);
+      Label valueLabel = visit(nd.getValue(), propkey, 1, c.idcontext);
       visit(nd.getDefaultValue(), propkey, 2, IdContext.varBind);
       if (nd.isComputed()) trapwriter.addTuple("is_computed", propkey);
       if (nd.isMethod()) trapwriter.addTuple("is_method", propkey);
 
       // Extract the value of a property named `template` as HTML, in order to support
       // Angular2 components with an inline template.
       if (!nd.isComputed() && "template".equals(tryGetIdentifierName(nd.getKey()))) {
-        extractStringValueAsHtml(nd.getValue());
+        extractStringValueAsHtml(nd.getValue(), valueLabel);
       }
       
       return propkey;
@@ -1160,7 +1160,7 @@ public Label visit(Property nd, Context c) {
     /**
      * Extracts the string value of <code>expr</code> as an HTML snippet.
      */
-    private void extractStringValueAsHtml(Expression expr) {
+    private void extractStringValueAsHtml(Expression expr, Label exprLabel) {
       TextualExtractor textualExtractor = lexicalExtractor.getTextualExtractor();
       if (textualExtractor.isSnippet()) {
         return; // do not create nested snippets
@@ -1185,7 +1185,11 @@ private void extractStringValueAsHtml(Expression expr) {
           getMetrics(),
           vfile.toFile());
       HTMLExtractor html = HTMLExtractor.forEmbeddedHtml(config);
-      html.extract(innerTextualExtractor);
+      List<Label> rootNodes = html.extractEx(innerTextualExtractor).fst();
+      int rootNodeIndex = 0;
+      for (Label rootNode : rootNodes) {
+        trapwriter.addTuple("xml_element_parent_expression", rootNode, exprLabel, rootNodeIndex++);
+      }
     }
 
     private String tryGetIdentifierName(Expression e) {
diff --git a/javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java
@@ -1,7 +1,9 @@
 package com.semmle.js.extractor;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -180,9 +182,13 @@ public HTMLExtractor(ExtractorConfig config, ExtractorState state) {
   public static HTMLExtractor forEmbeddedHtml(ExtractorConfig config) {
     return new HTMLExtractor(config, null, true);
   }
-
+  
   @Override
-  public LoCInfo extract(TextualExtractor textualExtractor) {
+  public LoCInfo extract(TextualExtractor textualExtractor) throws IOException {
+    return extractEx(textualExtractor).snd();
+  }
+
+  public Pair<List<Label>, LoCInfo> extractEx(TextualExtractor textualExtractor) {
     // Angular templates contain attribute names that are not valid HTML/XML, such as [foo], (foo), [(foo)], and *foo.
     // Allow a large number of errors in attribute names, so the Jericho parser does not give up.
     Attributes.setDefaultMaxErrorCount(100);
@@ -198,9 +204,9 @@ public LoCInfo extract(TextualExtractor textualExtractor) {
     
     extractor.setStartOffset(locationManager.getStartLine() - 1, locationManager.getStartColumn() - 1);
 
-    extractor.doit(Option.some(eltHandler));
+    List<Label> rootNodes = extractor.doit(Option.some(eltHandler));
 
-    return locInfo;
+    return Pair.make(rootNodes, locInfo);
   }
 
   /**
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -136,6 +136,11 @@ toplevel_parent_xml_node(
   unique int toplevel: @toplevel ref,
   int xmlnode: @xml_node_with_code ref);
 
+xml_element_parent_expression(
+  unique int xmlnode: @xmlelement ref,
+  int expression: @expr ref,
+  int index: int ref);
+
 // statements
 #keyset[parent, idx]
 stmts (unique int id: @stmt, 
