more

Author: asgerf

javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSteps.qll

@@ -337,7 +337,17 @@ private module CachedSteps {
     exists(NameResolution::Node node1, NameResolution::Node node2 |
       NameResolution::ValueFlow::resolvedReadStep(node1, node2) and
       pred = DataFlow::valueNode(node1) and
-      succ = DataFlow::valueNode(node2)
+      succ = getNodeFromNameResolutionNode(node2)
+    )
+  }
+
+  pragma[inline]
+  private DataFlow::Node getNodeFromNameResolutionNode(NameResolution::Node node) {
+    result = DataFlow::valueNode(node)
+    or
+    exists(ImportSpecifier spec |
+      node = spec.getLocal() and
+      result = DataFlow::valueNode(spec)
     )
   }
 

javascript/ql/lib/semmle/javascript/internal/NameResolution.qll

@@ -339,6 +339,12 @@ module NameResolution {
         S::isRelevantVariable(result)
       )
       or
+      exists(ExportDefaultDeclaration exprt |
+        mod = exprt.getContainer() and
+        name = "default" and
+        result = exprt.getOperand()
+      )
+      or
       exists(ExportNamespaceSpecifier spec |
         result = spec and
         mod = spec.getContainer() and

javascript/ql/test/library-tests/EndpointNaming/EndpointNaming.expected

@@ -1,13 +1,9 @@
 testFailures
-| pack3/lib.js:1:16:1:33 |  | Unexpected result: name=(pack3).libFunction.default |
-| pack3/lib.js:1:35:1:118 | // $ na ... unction | Missing result: alias=(pack3).libFunction.default==(pack3).libFunction |
-| pack3/lib.js:1:35:1:118 | // $ na ... unction | Missing result: name=(pack3).libFunction |
 | pack8/foo.js:1:1:1:12 |  | Unexpected result: name=(pack8).Foo.Foo |
 | pack8/foo.js:1:14:1:34 | // $ na ... k8).Foo | Missing result: name=(pack8).Foo |
 | pack8/foo.js:4:26:4:28 |  | Unexpected result: alias=(pack8).Foo.default==(pack8).Foo.Foo |
 | pack8/foo.js:4:31:4:73 | // $ al ... k8).Foo | Missing result: alias=(pack8).Foo.default==(pack8).Foo |
 | pack8/foo.js:5:27:5:65 | // $ al ... k8).Foo | Missing result: alias=(pack8).Foo.Foo==(pack8).Foo |
-| pack10/foo.js:1:34:1:55 | // $ na ... 10).Foo | Missing result: name=(pack10).Foo |
 ambiguousPreferredPredecessor
 | pack2/lib.js:1:1:3:1 | def moduleImport("pack2").getMember("exports").getMember("lib").getMember("LibClass").getInstance() |
 | pack2/lib.js:8:22:8:34 | def moduleImport("pack2").getMember("exports").getMember("lib").getMember("LibClass").getMember("foo") |