Merge pull request #13016 from kaspersv/kaspersv/js-explicit-this-receivers3

JS: Make implicit this receivers explicit

Author: kaspersv

javascript/ql/examples/queries/dataflow/DecodingAfterSanitization/DecodingAfterSanitizationGeneralized.ql

@@ -21,8 +21,8 @@ class DecodingCall extends CallNode {
   Node input;
 
   DecodingCall() {
-    getCalleeName().matches("decodeURI%") and
-    input = getArgument(0) and
+    this.getCalleeName().matches("decodeURI%") and
+    input = this.getArgument(0) and
     kind = "URI decoding"
     or
     input = this.(JsonParserCall).getInput() and

javascript/ql/lib/Declarations/UnusedVariable.qll

@@ -11,7 +11,7 @@ import LanguageFeatures.UnusedIndexVariable
  */
 class UnusedLocal extends LocalVariable {
   UnusedLocal() {
-    not exists(getAnAccess()) and
+    not exists(this.getAnAccess()) and
     not exists(Parameter p | this = p.getAVariable()) and
     not exists(FunctionExpr fe | this = fe.getVariable()) and
     not exists(ClassExpr ce | this = ce.getVariable()) and
@@ -20,6 +20,6 @@ class UnusedLocal extends LocalVariable {
     // avoid double reporting
     not unusedIndexVariable(_, this, _) and
     // common convention: variables with leading underscore are intentionally unused
-    getName().charAt(0) != "_"
+    this.getName().charAt(0) != "_"
   }
 }

javascript/ql/lib/Expressions/ExprHasNoEffect.qll

@@ -83,7 +83,7 @@ predicate isGetterProperty(string name) {
  * A property access that may invoke a getter.
  */
 class GetterPropertyAccess extends PropAccess {
-  override predicate isImpure() { isGetterProperty(getPropertyName()) }
+  override predicate isImpure() { isGetterProperty(this.getPropertyName()) }
 }
 
 /**

javascript/ql/lib/semmle/javascript/AMD.qll

@@ -28,49 +28,51 @@ private import Expressions.ExprHasNoEffect
 class AmdModuleDefinition extends CallExpr {
   AmdModuleDefinition() {
     inVoidContext(this) and
-    getCallee().(GlobalVarAccess).getName() = "define" and
-    exists(int n | n = getNumArgument() |
+    this.getCallee().(GlobalVarAccess).getName() = "define" and
+    exists(int n | n = this.getNumArgument() |
       n = 1
       or
-      n = 2 and getArgument(0) instanceof ArrayExpr
+      n = 2 and this.getArgument(0) instanceof ArrayExpr
       or
-      n = 3 and getArgument(0) instanceof ConstantString and getArgument(1) instanceof ArrayExpr
+      n = 3 and
+      this.getArgument(0) instanceof ConstantString and
+      this.getArgument(1) instanceof ArrayExpr
     )
   }
 
   /** Gets the array of module dependencies, if any. */
   ArrayExpr getDependencies() {
-    result = getArgument(0) or
-    result = getArgument(1)
+    result = this.getArgument(0) or
+    result = this.getArgument(1)
   }
 
   /** Gets the `i`th dependency of this module definition. */
-  PathExpr getDependency(int i) { result = getDependencies().getElement(i) }
+  PathExpr getDependency(int i) { result = this.getDependencies().getElement(i) }
 
   /** Gets a dependency of this module definition. */
   PathExpr getADependency() {
-    result = getDependency(_) or
-    result = getARequireCall().getAnArgument()
+    result = this.getDependency(_) or
+    result = this.getARequireCall().getAnArgument()
   }
 
   /**
    * Gets a data flow node containing the factory value of this module definition.
    */
   pragma[nomagic]
   DataFlow::SourceNode getFactoryNode() {
-    result = getFactoryNodeInternal() and
+    result = this.getFactoryNodeInternal() and
     result instanceof DataFlow::ValueNode
   }
 
   private DataFlow::Node getFactoryNodeInternal() {
     // To avoid recursion, this should not depend on `SourceNode`.
-    result = DataFlow::valueNode(getLastArgument()) or
-    result = getFactoryNodeInternal().getAPredecessor()
+    result = DataFlow::valueNode(this.getLastArgument()) or
+    result = this.getFactoryNodeInternal().getAPredecessor()
   }
 
   /** Gets the expression defining this module. */
   Expr getModuleExpr() {
-    exists(DataFlow::Node f | f = getFactoryNode() |
+    exists(DataFlow::Node f | f = this.getFactoryNode() |
       if f instanceof DataFlow::FunctionNode
       then
         exists(ReturnStmt ret | ret.getContainer() = f.(DataFlow::FunctionNode).getAstNode() |
@@ -81,15 +83,15 @@ class AmdModuleDefinition extends CallExpr {
   }
 
   /** Gets a source node whose value becomes the definition of this module. */
-  DataFlow::SourceNode getAModuleSource() { result.flowsToExpr(getModuleExpr()) }
+  DataFlow::SourceNode getAModuleSource() { result.flowsToExpr(this.getModuleExpr()) }
 
   /**
    * Holds if `p` is the parameter corresponding to dependency `dep`.
    */
   predicate dependencyParameter(PathExpr dep, Parameter p) {
     exists(int i |
-      dep = getDependency(i) and
-      p = getFactoryParameter(i)
+      dep = this.getDependency(i) and
+      p = this.getFactoryParameter(i)
     )
   }
 
@@ -107,7 +109,7 @@ class AmdModuleDefinition extends CallExpr {
    */
   Parameter getDependencyParameter(string name) {
     exists(PathExpr dep |
-      dependencyParameter(dep, result) and
+      this.dependencyParameter(dep, result) and
       dep.getValue() = name
     )
   }
@@ -116,54 +118,54 @@ class AmdModuleDefinition extends CallExpr {
    * Gets the `i`th parameter of the factory function of this module.
    */
   private Parameter getFactoryParameter(int i) {
-    getFactoryNodeInternal().asExpr().(Function).getParameter(i) = result
+    this.getFactoryNodeInternal().asExpr().(Function).getParameter(i) = result
   }
 
   /**
    * Gets the parameter corresponding to the pseudo-dependency `require`.
    */
   Parameter getRequireParameter() {
-    result = getDependencyParameter("require")
+    result = this.getDependencyParameter("require")
     or
     // if no dependencies are listed, the first parameter is assumed to be `require`
-    not exists(getDependencies()) and result = getFactoryParameter(0)
+    not exists(this.getDependencies()) and result = this.getFactoryParameter(0)
   }
 
   pragma[noinline]
-  private Variable getRequireVariable() { result = getRequireParameter().getVariable() }
+  private Variable getRequireVariable() { result = this.getRequireParameter().getVariable() }
 
   /**
    * Gets the parameter corresponding to the pseudo-dependency `exports`.
    */
   Parameter getExportsParameter() {
-    result = getDependencyParameter("exports")
+    result = this.getDependencyParameter("exports")
     or
     // if no dependencies are listed, the second parameter is assumed to be `exports`
-    not exists(getDependencies()) and result = getFactoryParameter(1)
+    not exists(this.getDependencies()) and result = this.getFactoryParameter(1)
   }
 
   /**
    * Gets the parameter corresponding to the pseudo-dependency `module`.
    */
   Parameter getModuleParameter() {
-    result = getDependencyParameter("module")
+    result = this.getDependencyParameter("module")
     or
     // if no dependencies are listed, the third parameter is assumed to be `module`
-    not exists(getDependencies()) and result = getFactoryParameter(2)
+    not exists(this.getDependencies()) and result = this.getFactoryParameter(2)
   }
 
   /**
    * Gets an abstract value representing one or more values that may flow
    * into this module's `module.exports` property.
    */
   DefiniteAbstractValue getAModuleExportsValue() {
-    result = [getAnImplicitExportsValue(), getAnExplicitExportsValue()]
+    result = [this.getAnImplicitExportsValue(), this.getAnExplicitExportsValue()]
   }
 
   pragma[noinline, nomagic]
   private AbstractValue getAnImplicitExportsValue() {
     // implicit exports: anything that is returned from the factory function
-    result = getModuleExpr().analyze().getAValue()
+    result = this.getModuleExpr().analyze().getAValue()
   }
 
   pragma[noinline]
@@ -182,7 +184,7 @@ class AmdModuleDefinition extends CallExpr {
    * Gets a call to `require` inside this module.
    */
   CallExpr getARequireCall() {
-    result.getCallee().getUnderlyingValue() = getRequireVariable().getAnAccess()
+    result.getCallee().getUnderlyingValue() = this.getRequireVariable().getAnAccess()
   }
 }
 
@@ -200,7 +202,7 @@ private class AmdDependencyPath extends PathExprCandidate {
 private class ConstantAmdDependencyPathElement extends PathExpr, ConstantString {
   ConstantAmdDependencyPathElement() { this = any(AmdDependencyPath amd).getAPart() }
 
-  override string getValue() { result = getStringValue() }
+  override string getValue() { result = this.getStringValue() }
 }
 
 /**
@@ -239,7 +241,7 @@ private class AmdDependencyImport extends Import {
    */
   private File guessTarget() {
     exists(PathString imported, string abspath, string dirname, string basename |
-      targetCandidate(result, abspath, imported, dirname, basename)
+      this.targetCandidate(result, abspath, imported, dirname, basename)
     |
       abspath.regexpMatch(".*/\\Q" + imported + "\\E")
       or
@@ -262,7 +264,7 @@ private class AmdDependencyImport extends Import {
   private predicate targetCandidate(
     File f, string abspath, PathString imported, string dirname, string basename
   ) {
-    imported = getImportedPath().getValue() and
+    imported = this.getImportedPath().getValue() and
     f.getStem() = imported.getStem() and
     f.getAbsolutePath() = abspath and
     dirname = imported.getDirName() and
@@ -273,14 +275,14 @@ private class AmdDependencyImport extends Import {
    * Gets the module whose absolute path matches this import, if there is only a single such module.
    */
   private Module resolveByAbsolutePath() {
-    result.getFile() = unique(File file | file = guessTarget())
+    result.getFile() = unique(File file | file = this.guessTarget())
   }
 
   override Module getImportedModule() {
     result = super.getImportedModule()
     or
     not exists(super.getImportedModule()) and
-    result = resolveByAbsolutePath()
+    result = this.resolveByAbsolutePath()
   }
 
   override DataFlow::Node getImportedModuleNode() {
@@ -314,7 +316,7 @@ class AmdModule extends Module {
 
   override DataFlow::Node getAnExportedValue(string name) {
     exists(DataFlow::PropWrite pwn | result = pwn.getRhs() |
-      pwn.getBase().analyze().getAValue() = getDefine().getAModuleExportsValue() and
+      pwn.getBase().analyze().getAValue() = this.getDefine().getAModuleExportsValue() and
       name = pwn.getPropertyName()
     )
   }
@@ -329,6 +331,6 @@ class AmdModule extends Module {
     )
     or
     // Returned from factory function
-    result = getDefine().getModuleExpr().flow()
+    result = this.getDefine().getModuleExpr().flow()
   }
 }

javascript/ql/lib/semmle/javascript/Base64.qll

@@ -73,7 +73,7 @@ module Base64 {
 private class Btoa extends Base64::Encode::Range, DataFlow::CallNode {
   Btoa() { this = DataFlow::globalVarRef("btoa").getACall() }
 
-  override DataFlow::Node getInput() { result = getArgument(0) }
+  override DataFlow::Node getInput() { result = this.getArgument(0) }
 
   override DataFlow::Node getOutput() { result = this }
 }
@@ -82,7 +82,7 @@ private class Btoa extends Base64::Encode::Range, DataFlow::CallNode {
 private class Atob extends Base64::Decode::Range, DataFlow::CallNode {
   Atob() { this = DataFlow::globalVarRef("atob").getACall() }
 
-  override DataFlow::Node getInput() { result = getArgument(0) }
+  override DataFlow::Node getInput() { result = this.getArgument(0) }
 
   override DataFlow::Node getOutput() { result = this }
 }
@@ -93,11 +93,11 @@ private class Atob extends Base64::Decode::Range, DataFlow::CallNode {
  */
 private class Buffer_toString extends Base64::Encode::Range, DataFlow::MethodCallNode {
   Buffer_toString() {
-    getMethodName() = "toString" and
-    getArgument(0).mayHaveStringValue("base64")
+    this.getMethodName() = "toString" and
+    this.getArgument(0).mayHaveStringValue("base64")
   }
 
-  override DataFlow::Node getInput() { result = getReceiver() }
+  override DataFlow::Node getInput() { result = this.getReceiver() }
 
   override DataFlow::Node getOutput() { result = this }
 }
@@ -106,10 +106,10 @@ private class Buffer_toString extends Base64::Encode::Range, DataFlow::MethodCal
 private class Buffer_from extends Base64::Decode::Range, DataFlow::CallNode {
   Buffer_from() {
     this = DataFlow::globalVarRef("Buffer").getAMemberCall("from") and
-    getArgument(1).mayHaveStringValue("base64")
+    this.getArgument(1).mayHaveStringValue("base64")
   }
 
-  override DataFlow::Node getInput() { result = getArgument(0) }
+  override DataFlow::Node getInput() { result = this.getArgument(0) }
 
   override DataFlow::Node getOutput() { result = this }
 }
@@ -149,7 +149,7 @@ private class NpmBase64Encode extends Base64::Encode::Range, DataFlow::CallNode
     )
   }
 
-  override DataFlow::Node getInput() { result = getArgument(0) }
+  override DataFlow::Node getInput() { result = this.getArgument(0) }
 
   override DataFlow::Node getOutput() { result = this }
 }
@@ -186,7 +186,7 @@ private class NpmBase64Decode extends Base64::Decode::Range, DataFlow::CallNode
     )
   }
 
-  override DataFlow::Node getInput() { result = getArgument(0) }
+  override DataFlow::Node getInput() { result = this.getArgument(0) }
 
   override DataFlow::Node getOutput() { result = this }
 }