Refactored method accesses to the RandomDataSource library

java/ql/lib/semmle/code/java/security/RandomDataSource.qll

@@ -107,6 +107,15 @@ class StdlibRandomSource extends RandomDataSource {
   }
 }
 
+/**
+ * A method access calling the `random` of `java.lang.Math`.
+ */
+class MathRandomSource extends RandomDataSource {
+  MathRandomSource() { this.getMethod().hasQualifiedName("java.lang", "Math", "random") }
+
+  override Expr getOutput() { result = this }
+}
+
 /**
  * A method access calling a method declared on `org.apache.commons.lang3.RandomUtils`
  * that returns random data or writes random data to an argument.
@@ -143,3 +152,17 @@ class ApacheCommonsRandomSource extends RandomDataSource {
 
   override Expr getOutput() { result = this }
 }
+
+/**
+ * A method access calling a method declared on `org.apache.commons.lang3.RandomStringUtils`
+ */
+class ApacheCommonsRandomStringSource extends RandomDataSource {
+  ApacheCommonsRandomStringSource() {
+    exists(Method m | m = this.getMethod() |
+      m.getName().matches("random%") and
+      m.getDeclaringType().hasQualifiedName("org.apache.commons.lang3", "RandomStringUtils")
+    )
+  }
+
+  override Expr getOutput() { result = this }
+}

java/ql/lib/semmle/code/java/security/WeakRandomnessQuery.qll

@@ -21,44 +21,11 @@ class TypeRandom extends RefType {
  */
 abstract class WeakRandomnessSource extends DataFlow::Node { }
 
-/**
- * A node representing a call to a constructor of `java.util.Random`.
- */
-private class JavaRandomSource extends WeakRandomnessSource {
-  JavaRandomSource() { this.asExpr().(ClassInstanceExpr).getType() instanceof TypeRandom }
-}
-
-/**
- * A node representing a call to one of the methods of `org.apache.commons.lang.RandomStringUtils`.
- */
-private class ApacheRandomStringUtilsMethodAccessSource extends WeakRandomnessSource {
-  ApacheRandomStringUtilsMethodAccessSource() {
-    this.asExpr()
-        .(MethodAccess)
-        .getMethod()
-        .hasQualifiedName("org.apache.commons.lang", "RandomStringUtils",
-          [
-            "random", "randomAlphabetic", "randomAlphanumeric", "randomAscii", "randomGraph",
-            "randomNumeric", "randomPrint"
-          ])
-  }
-}
-
-private class ThreadLocalRandomSource extends WeakRandomnessSource {
-  ThreadLocalRandomSource() {
-    this.asExpr()
-        .(MethodAccess)
-        .getMethod()
-        .hasQualifiedName("java.util.concurrent", "ThreadLocalRandom", "current")
-  }
-}
-
-/**
- * The `random` method of `java.lang.Math`.
- */
-private class MathRandomMethodAccess extends WeakRandomnessSource {
-  MathRandomMethodAccess() {
-    this.asExpr().(MethodAccess).getMethod().hasQualifiedName("java.lang", "Math", "random")
+private class RandomMethodSource extends WeakRandomnessSource {
+  RandomMethodSource() {
+    exists(RandomDataSource s | this.asExpr() = s.getOutput() |
+      not s.getQualifier().getType() instanceof SafeRandomImplementation
+    )
   }
 }
 
@@ -121,8 +88,6 @@ module WeakRandomnessConfig implements DataFlow::ConfigSig {
 
   predicate isSink(DataFlow::Node sink) { sink instanceof WeakRandomnessSink }
 
-  predicate isBarrier(DataFlow::Node n) { n.getTypeBound() instanceof SafeRandomImplementation }
-
   predicate isBarrierIn(DataFlow::Node n) { isSource(n) }
 
   predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
@@ -130,18 +95,6 @@ module WeakRandomnessConfig implements DataFlow::ConfigSig {
     or
     n1.asExpr() = n2.asExpr().(UnaryExpr).getExpr()
     or
-    exists(MethodAccess ma, Method m |
-      n1.asExpr() = ma.getQualifier() and
-      ma.getMethod() = m and
-      m.getDeclaringType().getAnAncestor() instanceof TypeRandom
-    |
-      m.hasName(["nextInt", "nextLong", "nextFloat", "nextDouble", "nextBoolean", "nextGaussian"]) and
-      n2.asExpr() = ma
-      or
-      m.hasName("nextBytes") and
-      n2.(DataFlow::PostUpdateNode).getPreUpdateNode().asExpr() = ma.getArgument(0)
-    )
-    or
     covertsBytesToString(n1, n2)
   }
 }