rename more acronyms

2026-04-30 11:15:13 +02:00 · 2022-08-24 12:59:07 +02:00
parent 06afe9c0f4
commit cc7a9ef97a
93 changed files with 693 additions and 451 deletions
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/DebugResultInclusion.ql
@@ -15,16 +15,16 @@ import extraction.ExtractEndpointData

 string getAReasonSinkExcluded(DataFlow::Node sinkCandidate, Query query) {
  query instanceof NosqlInjectionQuery and
-  result = NosqlInjectionATM::SinkEndpointFilter::getAReasonSinkExcluded(sinkCandidate)
+  result = NosqlInjectionAtm::SinkEndpointFilter::getAReasonSinkExcluded(sinkCandidate)
  or
  query instanceof SqlInjectionQuery and
-  result = SqlInjectionATM::SinkEndpointFilter::getAReasonSinkExcluded(sinkCandidate)
+  result = SqlInjectionAtm::SinkEndpointFilter::getAReasonSinkExcluded(sinkCandidate)
  or
  query instanceof TaintedPathQuery and
-  result = TaintedPathATM::SinkEndpointFilter::getAReasonSinkExcluded(sinkCandidate)
+  result = TaintedPathAtm::SinkEndpointFilter::getAReasonSinkExcluded(sinkCandidate)
  or
  query instanceof XssQuery and
-  result = XssATM::SinkEndpointFilter::getAReasonSinkExcluded(sinkCandidate)
+  result = XssAtm::SinkEndpointFilter::getAReasonSinkExcluded(sinkCandidate)
 }

 pragma[inline]
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll
@@ -14,10 +14,26 @@ import experimental.adaptivethreatmodeling.EndpointFeatures as EndpointFeatures
 import experimental.adaptivethreatmodeling.EndpointScoring as EndpointScoring
 import experimental.adaptivethreatmodeling.EndpointTypes
 import experimental.adaptivethreatmodeling.FilteringReasons
-import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionATM
-import experimental.adaptivethreatmodeling.SqlInjectionATM as SqlInjectionATM
-import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathATM
-import experimental.adaptivethreatmodeling.XssATM as XssATM
+import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionAtm
+
+/** DEPRECATED: Alias for NosqlInjectionAtm */
+deprecated module NosqlInjectionATM = NosqlInjectionAtm;
+
+import experimental.adaptivethreatmodeling.SqlInjectionATM as SqlInjectionAtm
+
+/** DEPRECATED: Alias for SqlInjectionAtm */
+deprecated module SqlInjectionATM = SqlInjectionAtm;
+
+import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathAtm
+
+/** DEPRECATED: Alias for TaintedPathAtm */
+deprecated module TaintedPathATM = TaintedPathAtm;
+
+import experimental.adaptivethreatmodeling.XssATM as XssAtm
+
+/** DEPRECATED: Alias for XssAtm */
+deprecated module XssATM = XssAtm;
+
 import Labels
 import NoFeaturizationRestrictionsConfig
 import Queries
@@ -25,13 +41,13 @@ import Queries
 /** Gets the ATM configuration object for the specified query. */
 AtmConfig getAtmCfg(Query query) {
  query instanceof NosqlInjectionQuery and
-  result instanceof NosqlInjectionATM::NosqlInjectionAtmConfig
+  result instanceof NosqlInjectionAtm::NosqlInjectionAtmConfig
  or
-  query instanceof SqlInjectionQuery and result instanceof SqlInjectionATM::SqlInjectionAtmConfig
+  query instanceof SqlInjectionQuery and result instanceof SqlInjectionAtm::SqlInjectionAtmConfig
  or
-  query instanceof TaintedPathQuery and result instanceof TaintedPathATM::TaintedPathAtmConfig
+  query instanceof TaintedPathQuery and result instanceof TaintedPathAtm::TaintedPathAtmConfig
  or
-  query instanceof XssQuery and result instanceof XssATM::DomBasedXssAtmConfig
+  query instanceof XssQuery and result instanceof XssAtm::DomBasedXssAtmConfig
 }

 /** DEPRECATED: Alias for getAtmCfg */
@@ -39,13 +55,13 @@ deprecated ATMConfig getATMCfg(Query query) { result = getAtmCfg(query) }

 /** Gets the ATM data flow configuration for the specified query. */
 DataFlow::Configuration getDataFlowCfg(Query query) {
-  query instanceof NosqlInjectionQuery and result instanceof NosqlInjectionATM::Configuration
+  query instanceof NosqlInjectionQuery and result instanceof NosqlInjectionAtm::Configuration
  or
-  query instanceof SqlInjectionQuery and result instanceof SqlInjectionATM::Configuration
+  query instanceof SqlInjectionQuery and result instanceof SqlInjectionAtm::Configuration
  or
-  query instanceof TaintedPathQuery and result instanceof TaintedPathATM::Configuration
+  query instanceof TaintedPathQuery and result instanceof TaintedPathAtm::Configuration
  or
-  query instanceof XssQuery and result instanceof XssATM::Configuration
+  query instanceof XssQuery and result instanceof XssAtm::Configuration
 }

 /** Gets a known sink for the specified query. */
--- a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointMapping.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointMapping.ql
@@ -4,25 +4,25 @@
 * Maps ML-powered queries to their `EndpointType` for clearer labelling while evaluating ML model during training.
 */

-import experimental.adaptivethreatmodeling.SqlInjectionATM as SqlInjectionATM
-import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionATM
-import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathATM
-import experimental.adaptivethreatmodeling.XssATM as XssATM
+import experimental.adaptivethreatmodeling.SqlInjectionATM as SqlInjectionAtm
+import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionAtm
+import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathAtm
+import experimental.adaptivethreatmodeling.XssATM as XssAtm
 import experimental.adaptivethreatmodeling.AdaptiveThreatModeling

 from string queryName, AtmConfig c, EndpointType e
 where
  (
    queryName = "SqlInjection" and
-    c instanceof SqlInjectionATM::SqlInjectionAtmConfig
+    c instanceof SqlInjectionAtm::SqlInjectionAtmConfig
    or
    queryName = "NosqlInjection" and
-    c instanceof NosqlInjectionATM::NosqlInjectionAtmConfig
+    c instanceof NosqlInjectionAtm::NosqlInjectionAtmConfig
    or
    queryName = "TaintedPath" and
-    c instanceof TaintedPathATM::TaintedPathAtmConfig
+    c instanceof TaintedPathAtm::TaintedPathAtmConfig
    or
-    queryName = "Xss" and c instanceof XssATM::DomBasedXssAtmConfig
+    queryName = "Xss" and c instanceof XssAtm::DomBasedXssAtmConfig
  ) and
  e = c.getASinkEndpointType()
 select queryName, e.getEncoding() as label
--- a/javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/EndpointFeatures.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/EndpointFeatures.ql
@@ -7,20 +7,20 @@
 */

 import javascript
-import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionATM
-import experimental.adaptivethreatmodeling.SqlInjectionATM as SqlInjectionATM
-import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathATM
-import experimental.adaptivethreatmodeling.XssATM as XssATM
+import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionAtm
+import experimental.adaptivethreatmodeling.SqlInjectionATM as SqlInjectionAtm
+import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathAtm
+import experimental.adaptivethreatmodeling.XssATM as XssAtm
 import experimental.adaptivethreatmodeling.EndpointFeatures as EndpointFeatures
 import experimental.adaptivethreatmodeling.StandardEndpointFilters as StandardEndpointFilters
 import extraction.NoFeaturizationRestrictionsConfig

 query predicate tokenFeatures(DataFlow::Node endpoint, string featureName, string featureValue) {
  (
-    not exists(NosqlInjectionATM::SinkEndpointFilter::getAReasonSinkExcluded(endpoint)) or
-    not exists(SqlInjectionATM::SinkEndpointFilter::getAReasonSinkExcluded(endpoint)) or
-    not exists(TaintedPathATM::SinkEndpointFilter::getAReasonSinkExcluded(endpoint)) or
-    not exists(XssATM::SinkEndpointFilter::getAReasonSinkExcluded(endpoint)) or
+    not exists(NosqlInjectionAtm::SinkEndpointFilter::getAReasonSinkExcluded(endpoint)) or
+    not exists(SqlInjectionAtm::SinkEndpointFilter::getAReasonSinkExcluded(endpoint)) or
+    not exists(TaintedPathAtm::SinkEndpointFilter::getAReasonSinkExcluded(endpoint)) or
+    not exists(XssAtm::SinkEndpointFilter::getAReasonSinkExcluded(endpoint)) or
    StandardEndpointFilters::isArgumentToModeledFunction(endpoint)
  ) and
  EndpointFeatures::tokenFeatures(endpoint, featureName, featureValue)
--- a/javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/FilteredTruePositives.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/FilteredTruePositives.ql
@@ -17,31 +17,31 @@ import semmle.javascript.security.dataflow.SqlInjectionCustomizations
 import semmle.javascript.security.dataflow.TaintedPathCustomizations
 import semmle.javascript.security.dataflow.DomBasedXssCustomizations
 import experimental.adaptivethreatmodeling.StandardEndpointFilters as StandardEndpointFilters
-import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionATM
-import experimental.adaptivethreatmodeling.SqlInjectionATM as SqlInjectionATM
-import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathATM
-import experimental.adaptivethreatmodeling.XssATM as XssATM
+import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionAtm
+import experimental.adaptivethreatmodeling.SqlInjectionATM as SqlInjectionAtm
+import experimental.adaptivethreatmodeling.TaintedPathATM as TaintedPathAtm
+import experimental.adaptivethreatmodeling.XssATM as XssAtm

 query predicate nosqlFilteredTruePositives(DataFlow::Node endpoint, string reason) {
  endpoint instanceof NosqlInjection::Sink and
-  reason = NosqlInjectionATM::SinkEndpointFilter::getAReasonSinkExcluded(endpoint) and
+  reason = NosqlInjectionAtm::SinkEndpointFilter::getAReasonSinkExcluded(endpoint) and
  not reason = ["argument to modeled function", "modeled sink", "modeled database access"]
 }

 query predicate sqlFilteredTruePositives(DataFlow::Node endpoint, string reason) {
  endpoint instanceof SqlInjection::Sink and
-  reason = SqlInjectionATM::SinkEndpointFilter::getAReasonSinkExcluded(endpoint) and
+  reason = SqlInjectionAtm::SinkEndpointFilter::getAReasonSinkExcluded(endpoint) and
  reason != "argument to modeled function"
 }

 query predicate taintedPathFilteredTruePositives(DataFlow::Node endpoint, string reason) {
  endpoint instanceof TaintedPath::Sink and
-  reason = TaintedPathATM::SinkEndpointFilter::getAReasonSinkExcluded(endpoint) and
+  reason = TaintedPathAtm::SinkEndpointFilter::getAReasonSinkExcluded(endpoint) and
  reason != "argument to modeled function"
 }

 query predicate xssFilteredTruePositives(DataFlow::Node endpoint, string reason) {
  endpoint instanceof DomBasedXss::Sink and
-  reason = XssATM::SinkEndpointFilter::getAReasonSinkExcluded(endpoint) and
+  reason = XssAtm::SinkEndpointFilter::getAReasonSinkExcluded(endpoint) and
  reason != "argument to modeled function"
 }
--- a/javascript/ql/experimental/adaptivethreatmodeling/test/modeled_apis/nosql_endpoint_filter_ignores_modeled_apis.ql
+++ b/javascript/ql/experimental/adaptivethreatmodeling/test/modeled_apis/nosql_endpoint_filter_ignores_modeled_apis.ql
@@ -1,6 +1,6 @@
 import javascript
-import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionATM
+import experimental.adaptivethreatmodeling.NosqlInjectionATM as NosqlInjectionAtm

 query predicate effectiveSinks(DataFlow::Node node) {
-  not exists(NosqlInjectionATM::SinkEndpointFilter::getAReasonSinkExcluded(node))
+  not exists(NosqlInjectionAtm::SinkEndpointFilter::getAReasonSinkExcluded(node))
 }