unified: Bulk imports

Author: asgerf

unified/ql/lib/codeql/unified/internal/LocalNameBinding.qll

@@ -326,6 +326,9 @@ private module LocalNameBindingInput implements LocalNameBindingInputSig<Locatio
     scope = any(TopLevel t) // Global module names are in scope here
     or
     scope = any(TopLevel t).getBody() // Imported names are in scope here
+    or
+    // Scopes with a bulk-import have uncertain members
+    bindingContext(any(BulkImportingPattern b), scope, _)
   }
 }
 

unified/ql/lib/codeql/unified/internal/NameBindingPlugin.qll

@@ -20,7 +20,7 @@ class NameBindingPlugin extends Unit {
    * Need only be implemented for members that occur in the context of class or top-level, as other
    * contexts are considered local already.
    */
-  predicate isPrivateToLocalScope(Member member) { none() }
+  predicate isPrivateToLocalScope(Stmt member) { none() }
 }
 
 /** Holds if `member` is an instance member. */
@@ -32,7 +32,7 @@ predicate isInstanceMember(Member member) {
 }
 
 /** Holds if `member` is only visible in its local scope. */
-predicate isPrivateToLocalScope(Member member) {
+predicate isPrivateToLocalScope(Stmt member) {
   any(NameBindingPlugin p).isPrivateToLocalScope(member)
 }
 

unified/ql/lib/codeql/unified/internal/NameBindingPluginSwift.qll

@@ -13,10 +13,13 @@ class NameBindingPluginSwift extends NameBindingPlugin {
     not member.hasModifier(["static", "class", "enum_case"])
   }
 
-  override predicate isPrivateToLocalScope(Member member) {
+  override predicate isPrivateToLocalScope(Stmt member) {
     // Private top-level members
     member = any(TopLevel top).getBody().getAStmt() and
     member.hasModifier(["private", "fileprivate"])
+    or
+    // Imports are always file-local
+    member instanceof ImportDeclaration
     //
     // Note: Private class members can be seen within type-extensions in the same file,
     // so we can't declare those private to their local scope.

unified/ql/lib/codeql/unified/internal/StaticNameBinding.qll

@@ -8,6 +8,7 @@ private import codeql.unified.internal.NameBindingPlugin
 
 private newtype TNameBindingNode =
   TIdentifier(Identifier n) or
+  TBulkImport(BulkImportingPattern p) or
   TLocalName(LocalName local) or
   TExportedNamespace(ClassLikeDeclaration cls) or
   TLocalNamespace(AstNode n) {
@@ -26,6 +27,8 @@ class NameBindingNode extends TNameBindingNode {
 
   Identifier asIdentifier() { this.isIdentifier(result) }
 
+  predicate isBulkImport(BulkImportingPattern p) { this = TBulkImport(p) }
+
   predicate isLocalName(LocalName local) { this = TLocalName(local) }
 
   /** Holds if this represents the set of static members available in the given namespace. */
@@ -43,6 +46,8 @@ class NameBindingNode extends TNameBindingNode {
   string toString() {
     exists(Identifier n | this.isIdentifier(n) and result = "Identifier(" + n + ")")
     or
+    exists(BulkImportingPattern p | this.isBulkImport(p) and result = "BulkImport(" + p + ")")
+    or
     exists(LocalName local | this.isLocalName(local) and result = "LocalName(" + local + ")")
     or
     exists(ClassLikeDeclaration cls |
@@ -63,6 +68,8 @@ class NameBindingNode extends TNameBindingNode {
   Location getLocation() {
     exists(Identifier n | this.isIdentifier(n) and result = n.getLocation())
     or
+    exists(BulkImportingPattern p | this.isBulkImport(p) and result = p.getLocation())
+    or
     exists(LocalName local | this.isLocalName(local) and result = local.getLocation())
     or
     exists(ClassLikeDeclaration cls | this.isExportedNamespace(cls) and result = cls.getLocation())
@@ -86,7 +93,11 @@ Identifier getIdentifierFromRef(AstNode n) {
   result = n.(NamedTypeExpr).getName()
 }
 
-NameBindingNode getNodeFromRef(AstNode n) { result.isIdentifier(getIdentifierFromRef(n)) }
+NameBindingNode getNodeFromRef(AstNode n) {
+  result.isIdentifier(getIdentifierFromRef(n))
+  or
+  result.isBulkImport(n)
+}
 
 NameBindingNode getModuleNodeFromFile(File f) {
   exists(ModuleScopeRepr mod |
@@ -186,6 +197,20 @@ predicate valueStep(NameBindingNode node1, NameBindingNode node2) {
     node1 = getNodeFromRef(imprt.getImportedExpr()) and
     node2 = getNodeFromRef(imprt.getPattern())
   )
+  or
+  exists(BulkImportingPattern p, AstNode scope, AstNode declaration |
+    bindingContext(p, scope, declaration) and
+    node1 = getNodeFromRef(p)
+  |
+    node2 = getNodeFromUncertainScope(scope)
+    or
+    // Bulk re-exporting declarations
+    exists(TopLevel top |
+      declaration = top.getBody().getAStmt() and
+      not isPrivateToLocalScope(declaration) and
+      node2 = getModuleNodeFromFile(top.getFile())
+    )
+  )
 }
 
 predicate inheritanceStep(NameBindingNode supertype, NameBindingNode subtype) {

unified/ql/test/library-tests/static-name-binding/package1/Sources/Target1/File3.swift

@@ -0,0 +1,4 @@
+import Target2
+
+private let x1: B.C; // $ access=Target2.B access=Target2.B.C
+private let x2: Target2.B.C; // $ access=Target2.B access=Target2.B.C