Ruby: renames for rb/ldap-injection

alexrford · alexrford · commit eb34bbbfd222 · 2023-09-03T17:20:04.000+01:00
diff --git a/ruby/ql/lib/codeql/ruby/security/LdapInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/LdapInjectionQuery.qll
@@ -5,25 +5,30 @@
 
 private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
+private import LdapInjectionCustomizations::LdapInjection as LI
 
-/** Provides a taint-tracking configuration for detecting LDAP Injections vulnerabilities. */
-module LdapInjection {
+/**
+ * Provides a taint-tracking configuration for detecting LDAP Injections vulnerabilities.
+ * DEPRECATED: Use `LdapInjectionFlow` instead
+ */
+deprecated module LdapInjection {
   import LdapInjectionCustomizations::LdapInjection
+  import TaintTracking::Global<LdapInjectionConfig>
+}
 
-  /**
-   * A taint-tracking configuration for detecting LDAP Injections vulnerabilities.
-   */
-  private module Config implements DataFlow::ConfigSig {
-    predicate isSource(DataFlow::Node source) { source instanceof Source }
+private module LdapInjectionConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof LI::Source }
 
-    predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
+  predicate isSink(DataFlow::Node sink) { sink instanceof LI::Sink }
 
-    predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+  predicate isBarrier(DataFlow::Node node) { node instanceof LI::Sanitizer }
 
-    predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-      LdapInjection::isAdditionalFlowStep(node1, node2)
-    }
+  predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
+    LI::isAdditionalFlowStep(node1, node2)
   }
-
-  import TaintTracking::Global<Config>
 }
+
+/**
+ * Taint-tracking for detecting LDAP Injections vulnerabilities.
+ */
+module LdapInjectionFlow = TaintTracking::Global<LdapInjectionConfig>;
diff --git a/ruby/ql/src/experimental/ldap-injection/LdapInjection.ql b/ruby/ql/src/experimental/ldap-injection/LdapInjection.ql
@@ -13,9 +13,9 @@
 
 import codeql.ruby.DataFlow
 import codeql.ruby.security.LdapInjectionQuery
-import LdapInjection::PathGraph
+import LdapInjectionFlow::PathGraph
 
-from LdapInjection::PathNode source, LdapInjection::PathNode sink
-where LdapInjection::flowPath(source, sink)
+from LdapInjectionFlow::PathNode source, LdapInjectionFlow::PathNode sink
+where LdapInjectionFlow::flowPath(source, sink)
 select sink.getNode(), source, sink, "This LDAP query depends on a $@.", source.getNode(),
   "user-provided value"
