use the DOTALL flag

erik-krogh · erik-krogh · commit 9b047f6f0355 · 2020-05-26T14:53:33.000+02:00
diff --git a/javascript/ql/src/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll b/javascript/ql/src/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll
@@ -51,10 +51,10 @@ module IncompleteHtmlAttributeSanitization {
     string lhs;
 
     HtmlAttributeConcatenation() {
-      lhs = this.getPreviousLeaf().getStringValue().regexpCapture("((?:[\n\r]|.)*)=\"[^\"]*", 1) and
+      lhs = this.getPreviousLeaf().getStringValue().regexpCapture("(?s)(.*)=\"[^\"]*", 1) and
       (
         this.getNextLeaf().getStringValue().regexpMatch(".*\".*") or
-        this.getRoot().getConstantStringParts().regexpMatch("(?:[\n\r]|.)*</.*")
+        this.getRoot().getConstantStringParts().regexpMatch("(?s).*</.*")
       )
     }
 

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,10 @@ module IncompleteHtmlAttributeSanitization {`
`51`	`51`	`string lhs;`
`52`	`52`
`53`	`53`	`HtmlAttributeConcatenation() {`
`54`		`- lhs = this.getPreviousLeaf().getStringValue().regexpCapture("((?:[\n\r]\|.))=\"[^\"]", 1) and`
	`54`	`+ lhs = this.getPreviousLeaf().getStringValue().regexpCapture("(?s)(.)=\"[^\"]", 1) and`
`55`	`55`	`(`
`56`	`56`	`this.getNextLeaf().getStringValue().regexpMatch(".\".") or`
`57`		`- this.getRoot().getConstantStringParts().regexpMatch("(?:[\n\r]\|.)</.")`
	`57`	`+ this.getRoot().getConstantStringParts().regexpMatch("(?s).</.")`
`58`	`58`	`)`
`59`	`59`	`}`
`60`	`60`