Autoformat

smowton · smowton · commit e8c970828204 · 2023-10-24T11:06:19.000+01:00
diff --git a/java/ql/integration-tests/all-platforms/kotlin/nested_generic_types/test.ql b/java/ql/integration-tests/all-platforms/kotlin/nested_generic_types/test.ql
@@ -30,9 +30,7 @@ query predicate nestedTypes(NestedType nt, RefType parent) {
   parent = nt.getEnclosingType()
 }
 
-query predicate javaKotlinCalleeAgreement(
-  MethodCall javaMa, MethodCall kotlinMa, Callable callee
-) {
+query predicate javaKotlinCalleeAgreement(MethodCall javaMa, MethodCall kotlinMa, Callable callee) {
   javaMa.getCallee() = callee and
   kotlinMa.getCallee() = callee and
   javaMa.getFile().getExtension() = "java" and
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
@@ -1251,7 +1251,7 @@ class ClassInstanceExpr extends Expr, ConstructorCall, @classinstancexpr {
   override string getAPrimaryQlClass() { result = "ClassInstanceExpr" }
 }
 
-/** 
+/**
  * An explicit `new ClassName(...)` expression.
  *
  * Note this does not include implicit instance creation such as lambda expressions
diff --git a/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll b/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll
@@ -58,9 +58,7 @@ private predicate implicitEnclosingThisCopy(ConstructorCall cc, RefType t1, RefT
 private predicate enclosingInstanceAccess(ExprParent e, RefType t) {
   e.(InstanceAccess).isEnclosingInstanceAccess(t)
   or
-  exists(MethodCall ma |
-    ma.isEnclosingMethodCall(t) and ma = e and not exists(ma.getQualifier())
-  )
+  exists(MethodCall ma | ma.isEnclosingMethodCall(t) and ma = e and not exists(ma.getQualifier()))
   or
   exists(FieldAccess fa | fa.isEnclosingFieldAccess(t) and fa = e and not exists(fa.getQualifier()))
   or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -466,9 +466,7 @@ class ObjectOutputStreamVar extends LocalVariableDecl {
   }
 
   /** DEPRECATED: Alias for `getAWriteObjectMethodCall`. */
-  deprecated MethodCall getAWriteObjectMethodAccess() { 
-    result = this.getAWriteObjectMethodCall()
-  }
+  deprecated MethodCall getAWriteObjectMethodAccess() { result = this.getAWriteObjectMethodCall() }
 }
 
 /** Flow through string formatting. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/Mockito.qll b/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
@@ -78,9 +78,7 @@ class MockitoInitedTest extends Class {
         m.calls*(initMocks)
       )
       or
-      exists(MethodCall call | call.getCallee() = initMocks |
-        call.getArgument(0).getType() = this
-      )
+      exists(MethodCall call | call.getCallee() = initMocks | call.getArgument(0).getType() = this)
     )
   }
 }
diff --git a/java/ql/lib/semmle/code/java/os/OSCheck.qll b/java/ql/lib/semmle/code/java/os/OSCheck.qll
@@ -158,9 +158,8 @@ private class IsUnixFromPosixFromFileSystem extends IsUnixGuard instanceof Metho
       supportedFileAttributeViewsMethod.hasName("supportedFileAttributeViews") and
       supportedFileAttributeViewsMethod.getDeclaringType() instanceof TypeFileSystem
     |
-      DataFlow::localExprFlow(any(MethodCall ma |
-          ma.getMethod() = supportedFileAttributeViewsMethod
-        ), super.getQualifier())
+      DataFlow::localExprFlow(any(MethodCall ma | ma.getMethod() = supportedFileAttributeViewsMethod),
+        super.getQualifier())
     )
   }
 }
diff --git a/java/ql/lib/semmle/code/java/security/FileReadWrite.qll b/java/ql/lib/semmle/code/java/security/FileReadWrite.qll
@@ -13,9 +13,7 @@ private predicate directFileRead(Expr fileAccess, Expr fileReadingExpr) {
         .hasQualifiedName("java.io", ["RandomAccessFile", "FileReader", "FileInputStream"])
   )
   or
-  exists(MethodCall ma, Method filesMethod |
-    ma = fileReadingExpr and filesMethod = ma.getMethod()
-  |
+  exists(MethodCall ma, Method filesMethod | ma = fileReadingExpr and filesMethod = ma.getMethod() |
     (
       // Identify all method calls on the `Files` class that imply that we are reading the file
       // represented by the first argument.
diff --git a/java/ql/lib/semmle/code/java/security/HardcodedCredentialsComparison.qll b/java/ql/lib/semmle/code/java/security/HardcodedCredentialsComparison.qll
@@ -18,9 +18,7 @@ deprecated class EqualsAccess = EqualsCall;
 /**
  * Holds if `sink` compares password `p` against a hardcoded expression `source`.
  */
-predicate isHardcodedCredentialsComparison(
-  EqualsCall sink, HardcodedExpr source, PasswordVariable p
-) {
+predicate isHardcodedCredentialsComparison(EqualsCall sink, HardcodedExpr source, PasswordVariable p) {
   source = sink.getQualifier() and
   p.getAnAccess() = sink.getArgument(0)
   or
diff --git a/java/ql/lib/semmle/code/java/security/PartialPathTraversal.qll b/java/ql/lib/semmle/code/java/security/PartialPathTraversal.qll
@@ -60,4 +60,4 @@ class PartialPathTraversalMethodCall extends MethodCall {
 }
 
 /** DEPRECATED: Alias for `PartialPathTraversalMethodCall`. */
-deprecated class PartialPathTraversalMethodAccess = PartialPathTraversalMethodCall;
+deprecated class PartialPathTraversalMethodAccess = PartialPathTraversalMethodCall;
diff --git a/java/ql/lib/semmle/code/java/security/TempDirLocalInformationDisclosureQuery.qll b/java/ql/lib/semmle/code/java/security/TempDirLocalInformationDisclosureQuery.qll
@@ -260,4 +260,5 @@ class MethodCallInsecureGuavaFilesCreateTempFile extends MethodCallInsecureFileC
 }
 
 /** DEPRECATED: Alias for `MethodCallInsecureGuavaFilesCreateTempFile`. */
-deprecated class MethodAccessInsecureGuavaFilesCreateTempFile = MethodCallInsecureGuavaFilesCreateTempFile;
+deprecated class MethodAccessInsecureGuavaFilesCreateTempFile =
+  MethodCallInsecureGuavaFilesCreateTempFile;
diff --git a/java/ql/src/Likely Bugs/Collections/IteratorRemoveMayFail.ql b/java/ql/src/Likely Bugs/Collections/IteratorRemoveMayFail.ql
@@ -15,9 +15,7 @@ import java
 
 class SpecialCollectionCreation extends MethodCall {
   SpecialCollectionCreation() {
-    exists(Method m, RefType rt |
-      m = this.(MethodCall).getCallee() and rt = m.getDeclaringType()
-    |
+    exists(Method m, RefType rt | m = this.(MethodCall).getCallee() and rt = m.getDeclaringType() |
       rt.hasQualifiedName("java.util", "Arrays") and m.hasName("asList")
       or
       rt.hasQualifiedName("java.util", "Collections") and
diff --git a/java/ql/src/Likely Bugs/Collections/ReadOnlyContainer.ql b/java/ql/src/Likely Bugs/Collections/ReadOnlyContainer.ql
@@ -32,9 +32,7 @@ where
     v instanceof LocalVariableDecl and exists(ReturnStmt ret | ret.getResult() = va)
     or
     // ...or a call to a query method on `v`.
-    exists(MethodCall ma | va = ma.getQualifier() |
-      ma.getMethod() instanceof ContainerQueryMethod
-    )
+    exists(MethodCall ma | va = ma.getQualifier() | ma.getMethod() instanceof ContainerQueryMethod)
   ) and
   // There is at least one call to a query method.
   exists(MethodCall ma | v.getAnAccess() = ma.getQualifier() |
diff --git a/java/ql/src/Likely Bugs/Concurrency/InconsistentAccess.ql b/java/ql/src/Likely Bugs/Concurrency/InconsistentAccess.ql
@@ -30,9 +30,7 @@ predicate locallySynchronized(MethodCall ma) {
 predicate hasUnsynchronizedCall(Method m) {
   m.isPublic() and not m.isSynchronized()
   or
-  exists(MethodCall ma, Method caller |
-    ma.getMethod() = m and caller = ma.getEnclosingCallable()
-  |
+  exists(MethodCall ma, Method caller | ma.getMethod() = m and caller = ma.getEnclosingCallable() |
     hasUnsynchronizedCall(caller) and
     not caller.isSynchronized() and
     not locallySynchronized(ma)
diff --git a/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql b/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql
@@ -25,9 +25,7 @@ import semmle.code.java.security.TempDirLocalInformationDisclosureQuery
  * resulting in a zero-length paths.
  */
 module InsecureMethodPathGraph implements DataFlow::PathGraphSig<MethodCallInsecureFileCreation> {
-  predicate edges(MethodCallInsecureFileCreation n1, MethodCallInsecureFileCreation n2) {
-    none()
-  }
+  predicate edges(MethodCallInsecureFileCreation n1, MethodCallInsecureFileCreation n2) { none() }
 
   predicate nodes(MethodCallInsecureFileCreation n, string key, string val) {
     key = "semmle.label" and val = n.toString()
diff --git a/java/ql/src/Security/CWE/CWE-807/ConditionalBypass.ql b/java/ql/src/Security/CWE/CWE-807/ConditionalBypass.ql
@@ -18,8 +18,7 @@ import semmle.code.java.security.ConditionalBypassQuery
 import ConditionalBypassFlow::PathGraph
 
 from
-  ConditionalBypassFlow::PathNode source, ConditionalBypassFlow::PathNode sink, MethodCall m,
-  Expr e
+  ConditionalBypassFlow::PathNode source, ConditionalBypassFlow::PathNode sink, MethodCall m, Expr e
 where
   conditionControlsMethod(m, e) and
   sink.getNode().asExpr() = e and
diff --git a/java/ql/src/Security/CWE/CWE-833/LockOrderInconsistency.ql b/java/ql/src/Security/CWE/CWE-833/LockOrderInconsistency.ql
@@ -155,9 +155,7 @@ predicate inDifferentRunnables(MethodCall ma1, MethodCall ma2) {
  * in statement `inner` that is qualified by one of the parameters of `outer`, and there is
  * another access to `outer` that may cause locking to be performed in a different order.
  */
-predicate badMethodCallLockOrder(
-  MethodCall outerAccess, MethodCall innerAccess, MethodCall other
-) {
+predicate badMethodCallLockOrder(MethodCall outerAccess, MethodCall innerAccess, MethodCall other) {
   exists(Synched outer, Synched inner |
     inner = innerAccess and
     inner = outer.getInnerSynch() and
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll b/java/ql/src/Violations of Best Practice/Dead Code/DeadLocals.qll
@@ -91,9 +91,7 @@ predicate exprHasNoEffect(Expr e) {
       constructorHasEffect(c)
     )
     or
-    exists(MethodCall ma, Method m |
-      bad = ma and m = ma.getMethod().getAPossibleImplementation()
-    |
+    exists(MethodCall ma, Method m | bad = ma and m = ma.getMethod().getAPossibleImplementation() |
       methodHasEffect(m) or not m.fromSource()
     )
   )
diff --git a/java/ql/src/experimental/Security/CWE/CWE-502/UnsafeDeserializationRmi.ql b/java/ql/src/experimental/Security/CWE/CWE-502/UnsafeDeserializationRmi.ql
@@ -56,9 +56,7 @@ private module BindingUnsafeRemoteObjectConfig implements DataFlow::ConfigSig {
   }
 
   predicate isSink(DataFlow::Node sink) {
-    exists(MethodCall ma | ma.getArgument(1) = sink.asExpr() |
-      ma.getMethod() instanceof BindMethod
-    )
+    exists(MethodCall ma | ma.getArgument(1) = sink.asExpr() | ma.getMethod() instanceof BindMethod)
   }
 
   predicate isAdditionalFlowStep(DataFlow::Node fromNode, DataFlow::Node toNode) {
diff --git a/java/ql/src/experimental/Security/CWE/CWE-759/HashWithoutSalt.ql b/java/ql/src/experimental/Security/CWE/CWE-759/HashWithoutSalt.ql
@@ -117,9 +117,7 @@ predicate hasHashAncestor(MethodCall ma) {
 }
 
 /** Holds if `MethodCall` ma is a hashing call without a sibling node making another hashing call. */
-predicate isSingleHashMethodCall(MethodCall ma) {
-  isHashAccess(ma) and not hasAnotherHashCall(ma)
-}
+predicate isSingleHashMethodCall(MethodCall ma) { isHashAccess(ma) and not hasAnotherHashCall(ma) }
 
 /** Holds if `MethodCall` ma is a single hashing call that is not invoked by a wrapper method. */
 predicate isSink(MethodCall ma) { isSingleHashMethodCall(ma) and not hasHashAncestor(ma) }
diff --git a/java/ql/test/kotlin/library-tests/jvmoverloads_flow/test.ql b/java/ql/test/kotlin/library-tests/jvmoverloads_flow/test.ql
@@ -2,9 +2,7 @@ import java
 import semmle.code.java.dataflow.DataFlow
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node n) {
-    n.asExpr().(MethodCall).getCallee().getName() = "source"
-  }
+  predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getCallee().getName() = "source" }
 
   predicate isSink(DataFlow::Node n) {
     n.asExpr().(Argument).getCall().getCallee().getName() = "sink"
diff --git a/java/ql/test/kotlin/library-tests/super-method-calls/test.ql b/java/ql/test/kotlin/library-tests/super-method-calls/test.ql
@@ -2,9 +2,7 @@ import java
 import semmle.code.java.dataflow.DataFlow
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node n) {
-    n.asExpr().(MethodCall).getMethod().getName() = "source"
-  }
+  predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().getName() = "source" }
 
   predicate isSink(DataFlow::Node n) {
     n.asExpr().(Argument).getCall().getCallee().getName() = "sink"
diff --git a/java/ql/test/library-tests/dataflow/local-flow/flow.ql b/java/ql/test/library-tests/dataflow/local-flow/flow.ql
@@ -2,9 +2,7 @@ import java
 import semmle.code.java.dataflow.DataFlow
 
 module Config implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) {
-    src.asExpr().(MethodCall).getMethod().hasName("source")
-  }
+  predicate isSource(DataFlow::Node src) { src.asExpr().(MethodCall).getMethod().hasName("source") }
 
   predicate isSink(DataFlow::Node sink) {
     exists(MethodCall ma |
diff --git a/java/ql/test/library-tests/dataflow/taintgettersetter/taintgettersetter.ql b/java/ql/test/library-tests/dataflow/taintgettersetter/taintgettersetter.ql
@@ -5,9 +5,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("taint") }
 
   predicate isSink(DataFlow::Node n) {
-    exists(MethodCall sink |
-      sink.getAnArgument() = n.asExpr() and sink.getMethod().hasName("sink")
-    )
+    exists(MethodCall sink | sink.getAnArgument() = n.asExpr() and sink.getMethod().hasName("sink"))
   }
 
   predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
diff --git a/java/ql/test/library-tests/dataflow/typepruning/test.ql b/java/ql/test/library-tests/dataflow/typepruning/test.ql
@@ -6,9 +6,7 @@ module Config implements DataFlow::ConfigSig {
   predicate isSource(Node n) { n.asExpr().(MethodCall).getMethod().hasName("source") }
 
   predicate isSink(Node n) {
-    exists(MethodCall sink |
-      sink.getAnArgument() = n.asExpr() and sink.getMethod().hasName("sink")
-    )
+    exists(MethodCall sink | sink.getAnArgument() = n.asExpr() and sink.getMethod().hasName("sink"))
   }
 
   predicate isAdditionalFlowStep(Node n1, Node n2) {

Original file line number	Diff line number	Diff line change
`@@ -1251,7 +1251,7 @@ class ClassInstanceExpr extends Expr, ConstructorCall, @classinstancexpr {`
`1251`	`1251`	`override string getAPrimaryQlClass() { result = "ClassInstanceExpr" }`
`1252`	`1252`	`}`
`1253`	`1253`
`1254`		`-/**`
	`1254`	`+/**`
`1255`	`1255`	* An explicit `new ClassName(...)` expression.
`1256`	`1256`	`*`
`1257`	`1257`	`* Note this does not include implicit instance creation such as lambda expressions`
Original file line number	Diff line number	Diff line change
`@@ -466,9 +466,7 @@ class ObjectOutputStreamVar extends LocalVariableDecl {`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	/** DEPRECATED: Alias for `getAWriteObjectMethodCall`. */
`469`		`- deprecated MethodCall getAWriteObjectMethodAccess() {`
`470`		`- result = this.getAWriteObjectMethodCall()`
`471`		`- }`
	`469`	`+ deprecated MethodCall getAWriteObjectMethodAccess() { result = this.getAWriteObjectMethodCall() }`
`472`	`470`	`}`
`473`	`471`
`474`	`472`	`/** Flow through string formatting. */`
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,7 @@ class MockitoInitedTest extends Class {`
`78`	`78`	`m.calls*(initMocks)`
`79`	`79`	`)`
`80`	`80`	`or`
`81`		`- exists(MethodCall call \| call.getCallee() = initMocks \|`
`82`		`- call.getArgument(0).getType() = this`
`83`		`- )`
	`81`	`+ exists(MethodCall call \| call.getCallee() = initMocks \| call.getArgument(0).getType() = this)`
`84`	`82`	`)`
`85`	`83`	`}`
`86`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,9 +158,8 @@ private class IsUnixFromPosixFromFileSystem extends IsUnixGuard instanceof Metho`
`158`	`158`	`supportedFileAttributeViewsMethod.hasName("supportedFileAttributeViews") and`
`159`	`159`	`supportedFileAttributeViewsMethod.getDeclaringType() instanceof TypeFileSystem`
`160`	`160`	`\|`
`161`		`- DataFlow::localExprFlow(any(MethodCall ma \|`
`162`		`- ma.getMethod() = supportedFileAttributeViewsMethod`
`163`		`- ), super.getQualifier())`
	`161`	`+ DataFlow::localExprFlow(any(MethodCall ma \| ma.getMethod() = supportedFileAttributeViewsMethod),`
	`162`	`+ super.getQualifier())`
`164`	`163`	`)`
`165`	`164`	`}`
`166`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@ private predicate directFileRead(Expr fileAccess, Expr fileReadingExpr) {`
`13`	`13`	`.hasQualifiedName("java.io", ["RandomAccessFile", "FileReader", "FileInputStream"])`
`14`	`14`	`)`
`15`	`15`	`or`
`16`		`- exists(MethodCall ma, Method filesMethod \|`
`17`		`- ma = fileReadingExpr and filesMethod = ma.getMethod()`
`18`		`- \|`
	`16`	`+ exists(MethodCall ma, Method filesMethod \| ma = fileReadingExpr and filesMethod = ma.getMethod() \|`
`19`	`17`	`(`
`20`	`18`	// Identify all method calls on the `Files` class that imply that we are reading the file
`21`	`19`	`// represented by the first argument.`
Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,4 @@ class PartialPathTraversalMethodCall extends MethodCall {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	/** DEPRECATED: Alias for `PartialPathTraversalMethodCall`. */
`63`		`-deprecated class PartialPathTraversalMethodAccess = PartialPathTraversalMethodCall;`
	`63`	`+deprecated class PartialPathTraversalMethodAccess = PartialPathTraversalMethodCall;`
Original file line number	Diff line number	Diff line change
`@@ -260,4 +260,5 @@ class MethodCallInsecureGuavaFilesCreateTempFile extends MethodCallInsecureFileC`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	/** DEPRECATED: Alias for `MethodCallInsecureGuavaFilesCreateTempFile`. */
`263`		`-deprecated class MethodAccessInsecureGuavaFilesCreateTempFile = MethodCallInsecureGuavaFilesCreateTempFile;`
	`263`	`+deprecated class MethodAccessInsecureGuavaFilesCreateTempFile =`
	`264`	`+ MethodCallInsecureGuavaFilesCreateTempFile;`