Apply suggestions from code review

jorgectf · yoff · jorgectf · commit b27b77c38fda · 2021-04-27T19:54:18.000+02:00
Co-authored-by: yoff &lt;lerchedahl@gmail.com&gt;
diff --git a/python/ql/src/semmle/python/Concepts.qll b/python/ql/src/semmle/python/Concepts.qll
@@ -661,9 +661,7 @@ class RegexExecution extends DataFlow::Node {
 
 module RegexExecution {
   abstract class Range extends DataFlow::Node {
-    DataFlow::Node getRegexNode() {
-      result instanceof DirectRegex or result instanceof CompiledRegex
-    }
+    abstract DataFlow::Node getRegexNode();
   }
 }
 
diff --git a/python/ql/src/semmle/python/frameworks/Stdlib.qll b/python/ql/src/semmle/python/frameworks/Stdlib.qll
@@ -875,7 +875,7 @@ private module Stdlib {
     }
 
     /** re.ReMethod(pattern, string) */
-    private class DirectRegex extends DataFlow::Node {
+    private class DirectRegex extends RegexExecution::Range {
       DirectRegex() {
         exists(ReMethods reMethod, DataFlow::CallCfgNode reCall |
           reCall = API::moduleImport("re").getMember(reMethod).getACall() and
@@ -885,7 +885,7 @@ private module Stdlib {
     }
 
     /** re.compile(pattern).ReMethod */
-    private class CompiledRegex extends DataFlow::Node {
+    private class CompiledRegex extends RegexExecution::Range {
       CompiledRegex() {
         exists(DataFlow::CallCfgNode patternCall, DataFlow::AttrRead reMethod |
           patternCall = API::moduleImport("re").getMember("compile").getACall() and
@@ -896,7 +896,7 @@ private module Stdlib {
       }
     }
 
-    private class RegexEscape extends Concepts::RegexExecution {
+    private class RegexEscape extends DataFlow::Node {
       RegexEscape() {
         this =
           API::moduleImport("re").getMember("escape").getACall().(DataFlow::CallCfgNode).getArg(0)

Original file line number	Diff line number	Diff line change
`@@ -661,9 +661,7 @@ class RegexExecution extends DataFlow::Node {`
`661`	`661`
`662`	`662`	`module RegexExecution {`
`663`	`663`	`abstract class Range extends DataFlow::Node {`
`664`		`- DataFlow::Node getRegexNode() {`
`665`		`- result instanceof DirectRegex or result instanceof CompiledRegex`
`666`		`- }`
	`664`	`+ abstract DataFlow::Node getRegexNode();`
`667`	`665`	`}`
`668`	`666`	`}`
`669`	`667`
Original file line number	Diff line number	Diff line change
`@@ -875,7 +875,7 @@ private module Stdlib {`
`875`	`875`	`}`
`876`	`876`
`877`	`877`	`/** re.ReMethod(pattern, string) */`
`878`		`- private class DirectRegex extends DataFlow::Node {`
	`878`	`+ private class DirectRegex extends RegexExecution::Range {`
`879`	`879`	`DirectRegex() {`
`880`	`880`	`exists(ReMethods reMethod, DataFlow::CallCfgNode reCall \|`
`881`	`881`	`reCall = API::moduleImport("re").getMember(reMethod).getACall() and`
`@@ -885,7 +885,7 @@ private module Stdlib {`
`885`	`885`	`}`
`886`	`886`
`887`	`887`	`/** re.compile(pattern).ReMethod */`
`888`		`- private class CompiledRegex extends DataFlow::Node {`
	`888`	`+ private class CompiledRegex extends RegexExecution::Range {`
`889`	`889`	`CompiledRegex() {`
`890`	`890`	`exists(DataFlow::CallCfgNode patternCall, DataFlow::AttrRead reMethod \|`
`891`	`891`	`patternCall = API::moduleImport("re").getMember("compile").getACall() and`
`@@ -896,7 +896,7 @@ private module Stdlib {`
`896`	`896`	`}`
`897`	`897`	`}`
`898`	`898`
`899`		`- private class RegexEscape extends Concepts::RegexExecution {`
	`899`	`+ private class RegexEscape extends DataFlow::Node {`
`900`	`900`	`RegexEscape() {`
`901`	`901`	`this =`
`902`	`902`	`API::moduleImport("re").getMember("escape").getACall().(DataFlow::CallCfgNode).getArg(0)`