Merge pull request #11756 from aibaars/fix-ql-module-parameter

QL: fix visibility of module parameters

Author: erik-krogh

ql/ql/src/codeql_ql/ast/internal/Type.qll

@@ -387,7 +387,7 @@ private predicate defines(FileOrModule m, string name, Type t, boolean public) {
   exists(Module mod, SignatureExpr param, int i |
     m.asModule() = mod and
     mod.hasParameter(i, name, param) and
-    public = true
+    public = false
   |
     // resolve to the signature class
     t = param.asType().getResolvedType()

ql/ql/test/modules/ClassSig.qll

@@ -0,0 +1,17 @@
+signature class FooSig;
+
+class FooImpl extends string {
+  FooImpl() { this = "FooImpl" }
+}
+
+module Bar<FooSig Foo> { }
+
+module Scope {
+  import Bar<FooImpl>
+
+  class Foo extends int {
+    Foo() { this = 1 }
+  }
+
+  predicate fooTest(Foo f) { none() }
+}

ql/ql/test/modules/test.expected

@@ -1,3 +1,21 @@
+getTarget
+| ClassSig.qll:10:3:10:21 | Import | ClassSig.qll:7:8:7:10 | Bar |
+| ClassSig.qll:10:10:10:21 | Bar | ClassSig.qll:7:8:7:10 | Bar |
+| Foo.qll:5:34:5:38 | TypeExpr | Foo.qll:1:26:1:30 | MySig |
+| Foo.qll:9:24:9:28 | TypeExpr | Foo.qll:1:26:1:30 | MySig |
+| Foo.qll:17:1:17:16 | Import | Foo.qll:15:8:15:16 | SimpleMod |
+| Foo.qll:17:8:17:16 | SimpleMod | Foo.qll:15:8:15:16 | SimpleMod |
+| Foo.qll:19:38:19:52 | MkThing | Foo.qll:9:16:9:22 | MkThing |
+| Foo.qll:19:38:19:60 | TypeExpr | Foo.qll:10:20:10:25 | SubMod |
+| Foo.qll:19:46:19:51 | TypeExpr | Foo.qll:5:16:5:21 | MyImpl |
+getTargetType
+| ClassSig.qll:3:23:3:28 | TypeExpr | file://:0:0:0:0 | string |
+| ClassSig.qll:7:12:7:17 | TypeExpr | ClassSig.qll:1:17:1:22 | FooSig |
+| ClassSig.qll:10:3:10:21 | Import | ClassSig.qll:7:8:7:10 | Bar |
+| ClassSig.qll:10:10:10:21 | Bar | ClassSig.qll:7:8:7:10 | Bar |
+| ClassSig.qll:10:14:10:20 | TypeExpr | ClassSig.qll:3:7:3:13 | FooImpl |
+| ClassSig.qll:12:21:12:23 | TypeExpr | file://:0:0:0:0 | int |
+| ClassSig.qll:16:21:16:23 | TypeExpr | ClassSig.qll:12:9:12:11 | Foo |
 | Foo.qll:5:34:5:38 | TypeExpr | Foo.qll:1:26:1:30 | MySig |
 | Foo.qll:9:24:9:28 | TypeExpr | Foo.qll:1:26:1:30 | MySig |
 | Foo.qll:17:1:17:16 | Import | Foo.qll:15:8:15:16 | SimpleMod |

ql/ql/test/modules/test.ql

@@ -1,3 +1,5 @@
 import ql
 
 query Type getTarget(TypeRef me) { result = me.getResolvedModule().toType() }
+
+query Type getTargetType(TypeRef me) { result = me.getResolvedType() }