Apply naming suggestions from code review

yoff · RasmusWL · web-flow · commit 8156fa9a4df0 · 2023-09-28T11:47:10.000+02:00
Co-authored-by: Rasmus Wriedt Larsen &lt;rasmuswriedtlarsen@gmail.com&gt;
diff --git a/python/ql/lib/semmle/python/Concepts.qll b/python/ql/lib/semmle/python/Concepts.qll
@@ -378,13 +378,13 @@ module SqlExecution {
   }
 }
 
-/** Provides a class for modeling NoSql execution APIs. */
+/** Provides a class for modeling NoSQL execution APIs. */
 module NoSqlExecution {
   /**
    * A data-flow node that executes NoSQL queries.
    *
    * Extend this class to model new APIs. If you want to refine existing API models,
-   * extend `NoSQLQuery` instead.
+   * extend `NoSqlExecution` instead.
    */
   abstract class Range extends DataFlow::Node {
     /** Gets the argument that specifies the NoSql query to be executed. */
@@ -402,7 +402,7 @@ module NoSqlExecution {
  * A data-flow node that executes NoSQL queries.
  *
  * Extend this class to refine existing API models. If you want to model new APIs,
- * extend `NoSQLQuery::Range` instead.
+ * extend `NoSqlExecution::Range` instead.
  */
 class NoSqlExecution extends DataFlow::Node instanceof NoSqlExecution::Range {
   /** Gets the argument that specifies the NoSql query to be executed. */
diff --git a/python/ql/lib/semmle/python/security/dataflow/NoSQLInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/NoSQLInjectionQuery.qll
@@ -11,7 +11,7 @@ private import NoSQLInjectionCustomizations::NoSqlInjection as C
 /**
  * A taint-tracking configuration for detecting NoSQL injection vulnerabilities.
  */
-module NoSQLInjectionConfig implements DataFlow::StateConfigSig {
+module NoSqlInjectionConfig implements DataFlow::StateConfigSig {
   class FlowState = C::FlowState;
 
   predicate isSource(DataFlow::Node source, FlowState state) {
@@ -57,4 +57,4 @@ module NoSQLInjectionConfig implements DataFlow::StateConfigSig {
   }
 }
 
-module Flow = TaintTracking::GlobalWithState<NoSQLInjectionConfig>;
+module NoSqlInjectionFlow = TaintTracking::GlobalWithState<NoSqlInjectionConfig>;
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.ql
@@ -1,4 +1,4 @@
 import python
 import experimental.dataflow.TestUtil.DataflowQueryTest
 import semmle.python.security.dataflow.NoSQLInjectionQuery
-import FromTaintTrackingStateConfig<NoSQLInjectionConfig>
+import FromTaintTrackingStateConfig<NoSqlInjectionConfig>

Original file line number	Diff line number	Diff line change
`@@ -378,13 +378,13 @@ module SqlExecution {`
`378`	`378`	`}`
`379`	`379`	`}`
`380`	`380`
`381`		`-/** Provides a class for modeling NoSql execution APIs. */`
	`381`	`+/** Provides a class for modeling NoSQL execution APIs. */`
`382`	`382`	`module NoSqlExecution {`
`383`	`383`	`/**`
`384`	`384`	`* A data-flow node that executes NoSQL queries.`
`385`	`385`	`*`
`386`	`386`	`* Extend this class to model new APIs. If you want to refine existing API models,`
`387`		- * extend `NoSQLQuery` instead.
	`387`	+ * extend `NoSqlExecution` instead.
`388`	`388`	`*/`
`389`	`389`	`abstract class Range extends DataFlow::Node {`
`390`	`390`	`/** Gets the argument that specifies the NoSql query to be executed. */`
`@@ -402,7 +402,7 @@ module NoSqlExecution {`
`402`	`402`	`* A data-flow node that executes NoSQL queries.`
`403`	`403`	`*`
`404`	`404`	`* Extend this class to refine existing API models. If you want to model new APIs,`
`405`		- * extend `NoSQLQuery::Range` instead.
	`405`	+ * extend `NoSqlExecution::Range` instead.
`406`	`406`	`*/`
`407`	`407`	`class NoSqlExecution extends DataFlow::Node instanceof NoSqlExecution::Range {`
`408`	`408`	`/** Gets the argument that specifies the NoSql query to be executed. */`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ private import NoSQLInjectionCustomizations::NoSqlInjection as C`
`11`	`11`	`/**`
`12`	`12`	`* A taint-tracking configuration for detecting NoSQL injection vulnerabilities.`
`13`	`13`	`*/`
`14`		`-module NoSQLInjectionConfig implements DataFlow::StateConfigSig {`
	`14`	`+module NoSqlInjectionConfig implements DataFlow::StateConfigSig {`
`15`	`15`	`class FlowState = C::FlowState;`
`16`	`16`
`17`	`17`	`predicate isSource(DataFlow::Node source, FlowState state) {`
`@@ -57,4 +57,4 @@ module NoSQLInjectionConfig implements DataFlow::StateConfigSig {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`-module Flow = TaintTracking::GlobalWithState<NoSQLInjectionConfig>;`
	`60`	`+module NoSqlInjectionFlow = TaintTracking::GlobalWithState<NoSqlInjectionConfig>;`