Ruby: use new dataflow api in Typhoeus.qll

github · Sep 21, 2023 · a64d372 · a64d372
1 parent 699f752
commit a64d372
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Typhoeus.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Typhoeus.qll
@@ -7,7 +7,6 @@ private import codeql.ruby.CFG
 private import codeql.ruby.Concepts
 private import codeql.ruby.ApiGraphs
 private import codeql.ruby.DataFlow
-private import codeql.ruby.dataflow.internal.DataFlowImplForHttpClientLibraries as DataFlowImplForHttpClientLibraries
 
 /**
  * A call that makes an HTTP request using `Typhoeus`.
@@ -38,26 +37,21 @@ class TyphoeusHttpRequest extends Http::Client::Request::Range, DataFlow::CallNo
   override predicate disablesCertificateValidation(
     DataFlow::Node disablingNode, DataFlow::Node argumentOrigin
   ) {
-    any(TyphoeusDisablesCertificateValidationConfiguration config)
-        .hasFlow(argumentOrigin, disablingNode) and
+    TyphoeusDisablesCertificateValidationFlow::flow(argumentOrigin, disablingNode) and
     disablingNode = this.getCertificateValidationControllingValue()
   }
 
   override string getFramework() { result = "Typhoeus" }
 }
 
 /** A configuration to track values that can disable certificate validation for Typhoeus. */
-private class TyphoeusDisablesCertificateValidationConfiguration extends DataFlowImplForHttpClientLibraries::Configuration
-{
-  TyphoeusDisablesCertificateValidationConfiguration() {
-    this = "TyphoeusDisablesCertificateValidationConfiguration"
-  }
-
-  override predicate isSource(DataFlow::Node source) {
-    source.asExpr().getExpr().(BooleanLiteral).isFalse()
-  }
+private module TyphoeusDisablesCertificateValidationConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source.asExpr().getExpr().(BooleanLiteral).isFalse() }
 
-  override predicate isSink(DataFlow::Node sink) {
+  predicate isSink(DataFlow::Node sink) {
     sink = any(TyphoeusHttpRequest req).getCertificateValidationControllingValue()
   }
 }
+
+private module TyphoeusDisablesCertificateValidationFlow =
+  DataFlow::Global<TyphoeusDisablesCertificateValidationConfig>;