Merge pull request #1161 from esben-semmle/js/classify-mode-html

semmle-qlci · web-flow · commit 86040575b153 · 2019-03-27T12:56:04.000Z
Approved by xiemaisi
diff --git a/javascript/ql/src/semmle/javascript/GeneratedCode.qll b/javascript/ql/src/semmle/javascript/GeneratedCode.qll
@@ -121,6 +121,23 @@ private predicate isGeneratedHtml(File f) {
     e.getName() = "meta" and
     e.getAttributeByName("name").getValue() = "generator"
   )
+  or
+  20 < countStartingHtmlElements(f, _)
+}
+
+/**
+ * Gets an element that starts at line `l` in file `f`.
+ */
+private HTML::Element getAStartingElement(File f, int l) {
+  result.getFile() = f and result.getLocation().getStartLine() = l
+}
+
+
+/**
+ * Gets the number of HTML elements that start at line `l` in file `f`.
+ */
+private int countStartingHtmlElements(File f, int l) {
+  result = strictcount(getAStartingElement(f, l))
 }
 
 /**
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/AlmostManyElementsOnLine.html b/javascript/ql/test/query-tests/filters/ClassifyFiles/AlmostManyElementsOnLine.html
@@ -0,0 +1,4 @@
+<html>
+  <div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div>
+  <script>42</script>
+</html>
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/ClassifyFiles.expected b/javascript/ql/test/query-tests/filters/ClassifyFiles/ClassifyFiles.expected
@@ -1,4 +1,5 @@
 | AutoRest.js:0:0:0:0 | AutoRest.js | generated |
+| ManyElementsOnLine.html:0:0:0:0 | ManyElementsOnLine.html | generated |
 | ai.1.2.3-build0123.js:0:0:0:0 | ai.1.2.3-build0123.js | library |
 | bundle-directive.js:0:0:0:0 | bundle-directive.js | generated |
 | data.js:0:0:0:0 | data.js | generated |
diff --git a/javascript/ql/test/query-tests/filters/ClassifyFiles/ManyElementsOnLine.html b/javascript/ql/test/query-tests/filters/ClassifyFiles/ManyElementsOnLine.html
@@ -0,0 +1,4 @@
+<html>
+  <div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div>
+  <script>42</script>
+</html>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<html>
 +  <div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div>
 +  <script>42</script>
 +</html>
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`\| AutoRest.js:0:0:0:0 \| AutoRest.js \| generated \|`
	`2`	`+\| ManyElementsOnLine.html:0:0:0:0 \| ManyElementsOnLine.html \| generated \|`
`2`	`3`	`\| ai.1.2.3-build0123.js:0:0:0:0 \| ai.1.2.3-build0123.js \| library \|`
`3`	`4`	`\| bundle-directive.js:0:0:0:0 \| bundle-directive.js \| generated \|`
`4`	`5`	`\| data.js:0:0:0:0 \| data.js \| generated \|`