QL: Merge pull request #34 from github/dbscheme-and-qlpack-support

Add support for dbscheme and qlpack.yml

Author: tausbn

Cargo.lock

@@ -10,7 +10,7 @@ edition = "2018"
 flate2 = "1.0"
 node-types = { path = "../node-types" }
 tree-sitter = "0.19"
-tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "ef46f6c4c076cc06bb206686794cec26b5c544a7" }
+tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "e08901378e2fd5c33f1e88bbb59716fd36f094f7" }
 clap = "2.33"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }

extractor/Cargo.toml

@@ -10,4 +10,4 @@ edition = "2018"
 node-types = { path = "../node-types" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", features = ["env-filter"] }
-tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "ef46f6c4c076cc06bb206686794cec26b5c544a7" }
+tree-sitter-ql = { git = "https://github.com/tausbn/tree-sitter-ql.git", rev = "e08901378e2fd5c33f1e88bbb59716fd36f094f7" }

generator/Cargo.toml

@@ -82,7 +82,10 @@ class TopLevel extends TTopLevel, AstNode {
    */
   ModuleMember getAMember() { result = getMember(_) }
 
-  ModuleMember getMember(int i) { toGenerated(result) = file.getChild(i).getChild(_) }
+  /** Gets the `i`'th member of this top-level module. */
+  ModuleMember getMember(int i) {
+    toGenerated(result) = file.getChild(i).(Generated::ModuleMember).getChild(_)
+  }
 
   /** Gets a top-level import in this module. */
   Import getAnImport() { result = this.getAMember() }
@@ -119,7 +122,7 @@ class TopLevel extends TTopLevel, AstNode {
 
   override string getAPrimaryQlClass() { result = "TopLevel" }
 
-  override QLDoc getQLDoc() { toGenerated(result) = file.getChild(0).getChild(0) }
+  override QLDoc getQLDoc() { result = this.getMember(0) }
 }
 
 class QLDoc extends TQLDoc, AstNode {

ql/src/codeql_ql/ast/Ast.qll

@@ -28,7 +28,7 @@ private class File_ extends FileOrModule, TFile {
 
   override ContainerOrModule getEnclosing() { result = TFolder(f.getParentContainer()) }
 
-  override string getName() { result = f.getStem() }
+  override string getName() { result = f.getStem().replaceAll(" ", "_") }
 
   override string toString() { result = f.toString() }
 
@@ -48,9 +48,13 @@ private class Folder_ extends ContainerOrModule, TFolder {
 
   Folder_() { this = TFolder(f) }
 
-  override ContainerOrModule getEnclosing() { result = TFolder(f.getParentContainer()) }
+  override ContainerOrModule getEnclosing() {
+    result = TFolder(f.getParentContainer()) and
+    // if this the the root, then we stop.
+    not exists(f.getFile("qlpack.yml"))
+  }
 
-  override string getName() { result = f.getStem() }
+  override string getName() { result = f.getStem().replaceAll(" ", "_") }
 
   override string toString() { result = f.toString() }
 
@@ -63,6 +67,11 @@ private class Folder_ extends ContainerOrModule, TFolder {
     endline = 0 and
     endcolumn = 0
   }
+
+  /**
+   * Gets the folder that this IPA type represents.
+   */
+  Folder getFolder() { result = f }
 }
 
 // TODO: Use `AstNode::getParent` once it is total
@@ -108,6 +117,7 @@ private predicate resolveQualifiedName(Import imp, ContainerOrModule m, int i) {
       exists(Container c, Container parent |
         // should ideally look at `qlpack.yml` files
         parent = imp.getLocation().getFile().getParentContainer+() and
+        exists(parent.getFile("qlpack.yml")) and
         c.getParentContainer() = parent and
         q = m.getName()
       |
@@ -116,7 +126,17 @@ private predicate resolveQualifiedName(Import imp, ContainerOrModule m, int i) {
         m = TFolder(c)
       )
       or
-      definesModule(getEnclosingModule(imp).getEnclosing*(), q, m, _)
+      q = imp.getQualifiedName(i) and
+      exists(ContainerOrModule container | container = getEnclosingModule(imp).getEnclosing+() |
+        definesModule(container, q, m, _) and
+        (
+          exists(container.(Folder_).getFolder().getFile("qlpack.yml")) or
+          container.(Folder_).getFolder() = imp.getLocation().getFile().getParentContainer() or
+          not container instanceof Folder_
+        )
+      )
+      or
+      definesModule(getEnclosingModule(imp), q, m, _)
     )
     or
     exists(Folder_ mid |
@@ -166,13 +186,21 @@ private module Cached {
   predicate resolveModuleExpr(ModuleExpr me, FileOrModule m) {
     not m = TFile(any(File f | f.getExtension() = "ql")) and
     not exists(me.getQualifier()) and
-    definesModule(getEnclosingModule(me).getEnclosing*(), me.getName(), m, _)
+    exists(ContainerOrModule enclosing, string name | resolveModuleExprHelper(me, enclosing, name) |
+      definesModule(enclosing.getEnclosing*(), name, m, _)
+    )
     or
     exists(FileOrModule mid |
       resolveModuleExpr(me.getQualifier(), mid) and
       definesModule(mid, me.getName(), m, true)
     )
   }
+
+  pragma[noinline]
+  private predicate resolveModuleExprHelper(ModuleExpr me, ContainerOrModule enclosing, string name) {
+    enclosing = getEnclosingModule(me) and
+    name = me.getName()
+  }
 }
 
 import Cached