Fix implicit 'this' usage

JLLeitschuh · JLLeitschuh · commit 7dee22a1302a · 2022-02-14T11:00:41.000-05:00
diff --git a/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql b/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql
@@ -24,7 +24,7 @@ private class MethodFileDirectoryCreation extends MethodFileSystemFileCreation {
 }
 
 private class MethodFileFileCreation extends MethodFileSystemFileCreation {
-  MethodFileFileCreation() { this.hasName(["createNewFile"]) }
+  MethodFileFileCreation() { this.hasName("createNewFile") }
 }
 
 abstract private class FileCreationSink extends DataFlow::Node { }
@@ -191,7 +191,7 @@ class MethodAccessInsecureFileCreateTempFile extends MethodAccessInsecureFileCre
       this.getNumArgument() = 2
       or
       // The default temporary directory is used when the last argument of `File.createTempFile(string, string, File)` is `null`
-      DataFlow::localExprFlow(any(NullLiteral n), getArgument(2))
+      DataFlow::localExprFlow(any(NullLiteral n), this.getArgument(2))
     )
   }
 
@@ -203,8 +203,8 @@ class MethodAccessInsecureFileCreateTempFile extends MethodAccessInsecureFileCre
  */
 class MethodGuavaFilesCreateTempFile extends Method {
   MethodGuavaFilesCreateTempFile() {
-    getDeclaringType().hasQualifiedName("com.google.common.io", "Files") and
-    hasName("createTempDir")
+    this.getDeclaringType().hasQualifiedName("com.google.common.io", "Files") and
+    this.hasName("createTempDir")
   }
 }
 
@@ -213,14 +213,14 @@ class MethodGuavaFilesCreateTempFile extends Method {
  */
 class MethodAccessInsecureGuavaFilesCreateTempFile extends MethodAccessInsecureFileCreation {
   MethodAccessInsecureGuavaFilesCreateTempFile() {
-    getMethod() instanceof MethodGuavaFilesCreateTempFile
+    this.getMethod() instanceof MethodGuavaFilesCreateTempFile
   }
 
   override string getFileSystemEntityType() { result = "directory" }
 }
 
 /**
- * This is a hack: we include use of inherently insecure methods, which don't have any associated
+ * A hack: we include use of inherently insecure methods, which don't have any associated
  * flow path, in with results describing a path from reading `java.io.tmpdir` or similar to use
  * in a file creation op.
  *

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ private class MethodFileDirectoryCreation extends MethodFileSystemFileCreation {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`private class MethodFileFileCreation extends MethodFileSystemFileCreation {`
`27`		`- MethodFileFileCreation() { this.hasName(["createNewFile"]) }`
	`27`	`+ MethodFileFileCreation() { this.hasName("createNewFile") }`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`abstract private class FileCreationSink extends DataFlow::Node { }`
`@@ -191,7 +191,7 @@ class MethodAccessInsecureFileCreateTempFile extends MethodAccessInsecureFileCre`
`191`	`191`	`this.getNumArgument() = 2`
`192`	`192`	`or`
`193`	`193`	// The default temporary directory is used when the last argument of `File.createTempFile(string, string, File)` is `null`
`194`		`- DataFlow::localExprFlow(any(NullLiteral n), getArgument(2))`
	`194`	`+ DataFlow::localExprFlow(any(NullLiteral n), this.getArgument(2))`
`195`	`195`	`)`
`196`	`196`	`}`
`197`	`197`
`@@ -203,8 +203,8 @@ class MethodAccessInsecureFileCreateTempFile extends MethodAccessInsecureFileCre`
`203`	`203`	`*/`
`204`	`204`	`class MethodGuavaFilesCreateTempFile extends Method {`
`205`	`205`	`MethodGuavaFilesCreateTempFile() {`
`206`		`- getDeclaringType().hasQualifiedName("com.google.common.io", "Files") and`
`207`		`- hasName("createTempDir")`
	`206`	`+ this.getDeclaringType().hasQualifiedName("com.google.common.io", "Files") and`
	`207`	`+ this.hasName("createTempDir")`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`@@ -213,14 +213,14 @@ class MethodGuavaFilesCreateTempFile extends Method {`
`213`	`213`	`*/`
`214`	`214`	`class MethodAccessInsecureGuavaFilesCreateTempFile extends MethodAccessInsecureFileCreation {`
`215`	`215`	`MethodAccessInsecureGuavaFilesCreateTempFile() {`
`216`		`- getMethod() instanceof MethodGuavaFilesCreateTempFile`
	`216`	`+ this.getMethod() instanceof MethodGuavaFilesCreateTempFile`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`override string getFileSystemEntityType() { result = "directory" }`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`/**`
`223`		`- * This is a hack: we include use of inherently insecure methods, which don't have any associated`
	`223`	`+ * A hack: we include use of inherently insecure methods, which don't have any associated`
`224`	`224`	* flow path, in with results describing a path from reading `java.io.tmpdir` or similar to use
`225`	`225`	`* in a file creation op.`
`226`	`226`	`*`