Merge pull request #284 from advanced-security/codeql-query-format-1

data-douser · web-flow · commit 003cfdbf38af · 2026-01-27T02:31:21.000-07:00
Apply `codeql query format` for `.ql` &amp; `.qll` files
diff --git a/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll b/javascript/frameworks/cap/lib/advanced_security/javascript/frameworks/cap/dataflow/DataFlow.qll
@@ -110,7 +110,11 @@ class AsyncStyleCommunication extends InterServiceCommunication {
       [
         srvEmit.getEmitter().getDefinition().getManifestName(),
         srvEmit.getEmitter().getDefinition().getUnqualifiedName()
-      ] = orchestratingRegistration.getReceiver().(ServiceInstanceFromCdsConnectTo).getServiceDesignator() and
+      ] =
+        orchestratingRegistration
+            .getReceiver()
+            .(ServiceInstanceFromCdsConnectTo)
+            .getServiceDesignator() and
       recipient = methodCallOnReceiver.getReceiver() and
       methodCallOnReceiver.getEnclosingFunction() = orchestratingRegistration.getHandler().asExpr()
     )
diff --git a/javascript/frameworks/cap/test/models/cds/applicationserviceinstance/applicationserviceinstance.ql b/javascript/frameworks/cap/test/models/cds/applicationserviceinstance/applicationserviceinstance.ql
@@ -1,5 +1,5 @@
 import javascript
 import advanced_security.javascript.frameworks.cap.CDS
 
-from ServiceInstance svc 
-select svc
+from ServiceInstance svc
+select svc
diff --git a/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql b/javascript/frameworks/cap/test/models/cds/cxn/parseexpr.ql
@@ -2,4 +2,4 @@ import javascript
 import advanced_security.javascript.frameworks.cap.dataflow.DataFlow
 
 from ParseSink sink
-select sink
+select sink
diff --git a/javascript/frameworks/cap/test/models/cds/logger/logger.ql b/javascript/frameworks/cap/test/models/cds/logger/logger.ql
@@ -2,4 +2,4 @@ import javascript
 import advanced_security.javascript.frameworks.cap.CAPLogInjectionQuery
 
 from CdsLogSink sink
-select sink
+select sink
diff --git a/javascript/frameworks/cap/test/models/cds/remoteflowsources/HandlerParameterOfExposedService.ql b/javascript/frameworks/cap/test/models/cds/remoteflowsources/HandlerParameterOfExposedService.ql
@@ -2,4 +2,4 @@ import javascript
 import advanced_security.javascript.frameworks.cap.RemoteFlowSources
 
 from HandlerParameterOfExposedService handlerParameterOfExposedService
-select handlerParameterOfExposedService
+select handlerParameterOfExposedService
diff --git a/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql b/javascript/frameworks/cap/test/models/cds/requesthandler/requesthandler.ql
@@ -2,4 +2,4 @@ import javascript
 import advanced_security.javascript.frameworks.cap.CDS
 
 from Handler handler
-select handler.getAParameter()
+select handler.getAParameter()
diff --git a/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql b/javascript/frameworks/cap/test/models/cds/userdefinedservice/userdefinedservice.ql
@@ -2,4 +2,4 @@ import javascript
 import advanced_security.javascript.frameworks.cap.CDS
 
 from UserDefinedService svc
-select svc
+select svc
diff --git a/javascript/frameworks/cap/test/models/cql/delete/delete.ql b/javascript/frameworks/cap/test/models/cql/delete/delete.ql
@@ -3,4 +3,3 @@ import advanced_security.javascript.frameworks.cap.CQL
 
 from CqlClause s
 select s.getLocation(), s
-
diff --git a/javascript/frameworks/cap/test/models/cql/select/select.ql b/javascript/frameworks/cap/test/models/cql/select/select.ql
@@ -2,4 +2,4 @@ import javascript
 import advanced_security.javascript.frameworks.cap.CQL
 
 from CqlClause s
-select s.getLocation(), s
+select s.getLocation(), s
diff --git a/javascript/frameworks/cap/test/models/cql/taintedclause/taintedclause.ql b/javascript/frameworks/cap/test/models/cql/taintedclause/taintedclause.ql
@@ -2,4 +2,4 @@ import javascript
 import advanced_security.javascript.frameworks.cap.CAPCqlInjectionQuery
 
 from CqlClauseParserCallWithStringConcat clause
-select clause
+select clause
diff --git a/javascript/frameworks/cap/test/models/cql/update/update.ql b/javascript/frameworks/cap/test/models/cql/update/update.ql
@@ -3,4 +3,3 @@ import advanced_security.javascript.frameworks.cap.CQL
 
 from CqlClause s
 select s.getLocation(), s
-
diff --git a/javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5UnsafeLogAccessQuery.qll b/javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5UnsafeLogAccessQuery.qll
@@ -42,4 +42,4 @@ class LogEntriesNode extends TLogEntriesNode {
     or
     this.asUI5ControlNode().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
-}
+}
diff --git a/javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5WebcomponentsReact.qll b/javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/UI5WebcomponentsReact.qll
@@ -19,7 +19,7 @@ class WebComponentImport extends DataFlow::SourceNode {
 
 /**
  * The `ref` attribute of a JSX attribute. e.g.
- * 
+ *
  * ``` javascript
  * <SomeElement ref={x}>
  * ```
diff --git a/javascript/frameworks/ui5/src/Diagnostics/ListHtmlSinks.ql b/javascript/frameworks/ui5/src/Diagnostics/ListHtmlSinks.ql
@@ -8,14 +8,14 @@
  * @tags diagnostics
  */
 
- import javascript
- import advanced_security.javascript.frameworks.ui5.dataflow.DataFlow
+import javascript
+import advanced_security.javascript.frameworks.ui5.dataflow.DataFlow
 
- from DataFlow::Node sink, string kind
- where
-   sink = ModelOutput::getASinkNode(kind).asSink() and
-   kind = "ui5-html-injection"
-   or
-   sink instanceof UI5ExternalModel and
-   kind = "ui5-model-sink"
-select sink, "SAP UI5 Html injection sink with kind: " + kind
+from DataFlow::Node sink, string kind
+where
+  sink = ModelOutput::getASinkNode(kind).asSink() and
+  kind = "ui5-html-injection"
+  or
+  sink instanceof UI5ExternalModel and
+  kind = "ui5-model-sink"
+select sink, "SAP UI5 Html injection sink with kind: " + kind
diff --git a/javascript/frameworks/ui5/src/Diagnostics/ListRemoteFlowSources.ql b/javascript/frameworks/ui5/src/Diagnostics/ListRemoteFlowSources.ql
@@ -13,4 +13,4 @@ import advanced_security.javascript.frameworks.ui5.dataflow.DataFlow
 
 from RemoteFlowSource source, string type
 where type = source.getSourceType()
-select source, "Remote flow source of type: " + type
+select source, "Remote flow source of type: " + type
diff --git a/javascript/frameworks/ui5/src/UI5Clickjacking/UI5Clickjacking.ql b/javascript/frameworks/ui5/src/UI5Clickjacking/UI5Clickjacking.ql
@@ -17,9 +17,7 @@ import semmle.javascript.RestrictedLocations
 private import advanced_security.javascript.frameworks.ui5.UI5
 
 class FirstLineOfDocumentElementWebApp extends HTML::DocumentElement, FirstLineOf {
-  FirstLineOfDocumentElementWebApp() {
-    exists(WebApp app | app.getDocument() = this)
-  }
+  FirstLineOfDocumentElementWebApp() { exists(WebApp app | app.getDocument() = this) }
 }
 
 private newtype TAlertLocation =
diff --git a/javascript/frameworks/ui5/src/UI5PathInjection/UI5PathInjection.ql b/javascript/frameworks/ui5/src/UI5PathInjection/UI5PathInjection.ql
@@ -21,7 +21,7 @@ module UI5PathInjectionFlow = TaintTracking::Global<UI5PathInjection>;
 module UI5PathInjectionPathGraph =
   UI5PathGraph<UI5PathInjectionFlow::PathNode, UI5PathInjectionFlow::PathGraph>;
 
-import UI5PathInjectionPathGraph 
+import UI5PathInjectionPathGraph
 
 from
   UI5PathInjectionPathGraph::UI5PathNode source, UI5PathInjectionPathGraph::UI5PathNode sink,
diff --git a/javascript/frameworks/ui5/test/lib/JsonParser/JsonParser.ql b/javascript/frameworks/ui5/test/lib/JsonParser/JsonParser.ql
@@ -2,15 +2,13 @@ import javascript
 import advanced_security.javascript.frameworks.ui5.JsonParser
 
 module MakeStringLiteralJsonReader implements JsonParser::MakeJsonReaderSig<StringLiteral> {
-    class JsonReader extends StringLiteral {
-        string getJson() {
-            result = this.getValue()
-        }
-    } 
+  class JsonReader extends StringLiteral {
+    string getJson() { result = this.getValue() }
+  }
 }
 
-module StringLiteralJsonParser  = JsonParser::Make<StringLiteral, MakeStringLiteralJsonReader>;
+module StringLiteralJsonParser = JsonParser::Make<StringLiteral, MakeStringLiteralJsonReader>;
 
-from StringLiteralJsonParser::JsonValue val, MakeStringLiteralJsonReader::JsonReader reader 
+from StringLiteralJsonParser::JsonValue val, MakeStringLiteralJsonReader::JsonReader reader
 where val = StringLiteralJsonParser::parse(reader)
-select reader, val, val.getType()
+select reader, val, val.getType()
diff --git a/javascript/frameworks/ui5/test/models/attachDisplay_detachDisplay/attachDisplay_detachDisplay.ql b/javascript/frameworks/ui5/test/models/attachDisplay_detachDisplay/attachDisplay_detachDisplay.ql
@@ -12,4 +12,4 @@ predicate step(DataFlow::Node start, DataFlow::Node end) {
 
 from DataFlow::Node start, DataFlow::Node end
 where step(start, end)
-select start, end
+select start, end
diff --git a/javascript/frameworks/xsjs/test/models/sink/sink.ql b/javascript/frameworks/xsjs/test/models/sink/sink.ql
@@ -14,4 +14,4 @@ from DataFlow::Node sink, string kind
 where
   sink = ModelOutput::getASinkNode(kind).asSink() and
   kind = "html-injection"
-select sink, "XSJS HTML injection sink with kind: " + kind
+select sink, "XSJS HTML injection sink with kind: " + kind

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,11 @@ class AsyncStyleCommunication extends InterServiceCommunication {`
`110`	`110`	`[`
`111`	`111`	`srvEmit.getEmitter().getDefinition().getManifestName(),`
`112`	`112`	`srvEmit.getEmitter().getDefinition().getUnqualifiedName()`
`113`		`- ] = orchestratingRegistration.getReceiver().(ServiceInstanceFromCdsConnectTo).getServiceDesignator() and`
	`113`	`+ ] =`
	`114`	`+ orchestratingRegistration`
	`115`	`+ .getReceiver()`
	`116`	`+ .(ServiceInstanceFromCdsConnectTo)`
	`117`	`+ .getServiceDesignator() and`
`114`	`118`	`recipient = methodCallOnReceiver.getReceiver() and`
`115`	`119`	`methodCallOnReceiver.getEnclosingFunction() = orchestratingRegistration.getHandler().asExpr()`
`116`	`120`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,3 @@ import advanced_security.javascript.frameworks.cap.CQL`
`3`	`3`
`4`	`4`	`from CqlClause s`
`5`	`5`	`select s.getLocation(), s`
`6`		`-`