Enclose Sinks and ReMethods in a module

jorgectf · jorgectf · commit 3daec8e6a27a · 2021-04-27T19:54:15.000+02:00
diff --git a/python/ql/src/semmle/python/frameworks/Stdlib.qll b/python/ql/src/semmle/python/frameworks/Stdlib.qll
@@ -868,30 +868,32 @@ private module Stdlib {
   // ---------------------------------------------------------------------------
   // re
   // ---------------------------------------------------------------------------
-  /** List of re methods. */
-  private class ReMethods extends string {
-    ReMethods() { this in ["match", "fullmatch", "search", "split", "findall", "finditer"] }
-  }
-
-  /** re.ReMethod(pattern, string) */
-  private class DirectRegex extends DataFlow::Node {
-    DirectRegex() {
-      exists(ReMethods reMethod, DataFlow::CallCfgNode reCall |
-        reCall = API::moduleImport("re").getMember(reMethod).getACall() and
-        this = reCall.getArg(0)
-      )
+  private module Re {
+    /** List of re methods. */
+    private class ReMethods extends string {
+      ReMethods() { this in ["match", "fullmatch", "search", "split", "findall", "finditer"] }
+    }
+
+    /** re.ReMethod(pattern, string) */
+    private class DirectRegex extends DataFlow::Node {
+      DirectRegex() {
+        exists(ReMethods reMethod, DataFlow::CallCfgNode reCall |
+          reCall = API::moduleImport("re").getMember(reMethod).getACall() and
+          this = reCall.getArg(0)
+        )
+      }
     }
-  }
 
-  /** re.compile(pattern).ReMethod */
-  class CompiledRegex extends DataFlow::Node {
-    CompiledRegex() {
-      exists(DataFlow::CallCfgNode patternCall, DataFlow::AttrRead reMethod |
-        patternCall = API::moduleImport("re").getMember("compile").getACall() and
-        patternCall = reMethod.getObject().getALocalSource() and
-        reMethod.getAttributeName() instanceof ReMethods and
-        this = patternCall.getArg(0)
-      )
+    /** re.compile(pattern).ReMethod */
+    class CompiledRegex extends DataFlow::Node {
+      CompiledRegex() {
+        exists(DataFlow::CallCfgNode patternCall, DataFlow::AttrRead reMethod |
+          patternCall = API::moduleImport("re").getMember("compile").getACall() and
+          patternCall = reMethod.getObject().getALocalSource() and
+          reMethod.getAttributeName() instanceof ReMethods and
+          this = patternCall.getArg(0)
+        )
+      }
     }
   }
 }
