Merge pull request #32 from asger-semmle/export-import-flow

Max Schaefer · web-flow · commit 0de9eed71c0e · 2018-08-08T16:35:43.000+01:00
TypeScript: bugfixes for import-assign statement
diff --git a/javascript/ql/src/semmle/javascript/DefUse.qll b/javascript/ql/src/semmle/javascript/DefUse.qll
@@ -43,8 +43,8 @@ private predicate defn(ControlFlowNode def, Expr lhs, AST::ValueNode rhs) {
   exists (EnumDeclaration ed | def = ed.getIdentifier() |
     lhs = def and rhs = ed
   ) or
-  exists (ImportEqualsDeclaration i | def = i.getId() |
-    lhs = def and rhs = i.getImportedEntity()
+  exists (ImportEqualsDeclaration i | def = i |
+    lhs = i.getId() and rhs = i.getImportedEntity()
   ) or
   exists (EnumMember member | def = member.getIdentifier() |
     lhs = def and rhs = member.getInitializer()
diff --git a/javascript/ql/src/semmle/javascript/ES2015Modules.qll b/javascript/ql/src/semmle/javascript/ES2015Modules.qll
@@ -308,7 +308,8 @@ class ExportNamedDeclaration extends ExportDeclaration, @exportnameddeclaration
       result = op.(NamespaceDeclaration).getId() or
       result = op.(EnumDeclaration).getIdentifier() or
       result = op.(InterfaceDeclaration).getIdentifier() or
-      result = op.(TypeAliasDeclaration).getIdentifier()
+      result = op.(TypeAliasDeclaration).getIdentifier() or
+      result = op.(ImportEqualsDeclaration).getId()
     )
   }
 
diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll
@@ -224,6 +224,10 @@ class ImportEqualsDeclaration extends Stmt, @importequalsdeclaration {
   Expr getImportedEntity() {
     result = getChildExpr(1)
   }
+
+  override ControlFlowNode getFirstControlFlowNode() {
+    result = getId()
+  }
 }
 
 /**
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_import.ts b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_import.ts
@@ -0,0 +1,3 @@
+import * as Something from 'somewhere';
+
+export import importExport = Something.thingy;
diff --git a/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_import_client.ts b/javascript/ql/test/query-tests/Expressions/SuspiciousPropAccess/export_import_client.ts
@@ -0,0 +1,5 @@
+import { importExport } from "./export_import";
+
+function test() {
+  let f = importExport.prop; // OK
+}

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,8 @@ class ExportNamedDeclaration extends ExportDeclaration, @exportnameddeclaration`
`308`	`308`	`result = op.(NamespaceDeclaration).getId() or`
`309`	`309`	`result = op.(EnumDeclaration).getIdentifier() or`
`310`	`310`	`result = op.(InterfaceDeclaration).getIdentifier() or`
`311`		`- result = op.(TypeAliasDeclaration).getIdentifier()`
	`311`	`+ result = op.(TypeAliasDeclaration).getIdentifier() or`
	`312`	`+ result = op.(ImportEqualsDeclaration).getId()`
`312`	`313`	`)`
`313`	`314`	`}`
`314`	`315`
Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,10 @@ class ImportEqualsDeclaration extends Stmt, @importequalsdeclaration {`
`224`	`224`	`Expr getImportedEntity() {`
`225`	`225`	`result = getChildExpr(1)`
`226`	`226`	`}`
	`227`	`+`
	`228`	`+ override ControlFlowNode getFirstControlFlowNode() {`
	`229`	`+ result = getId()`
	`230`	`+ }`
`227`	`231`	`}`
`228`	`232`
`229`	`233`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import * as Something from 'somewhere';`
	`2`	`+`
	`3`	`+export import importExport = Something.thingy;`