Skip to content

Commit ff727f8

Browse files
committed
Sync upstream javascript + manual merge
1 parent be7284a commit ff727f8

File tree

73 files changed

+1200
-476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1200
-476
lines changed

javascript/ql/integration-tests/query-suite/javascript-code-scanning.qls.expected

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ ql/javascript/ql/src/Security/CWE-079/Xss.ql
3131
ql/javascript/ql/src/Security/CWE-079/XssThroughDom.ql
3232
ql/javascript/ql/src/Security/CWE-089/SqlInjection.ql
3333
ql/javascript/ql/src/Security/CWE-094/CodeInjection.ql
34-
ql/javascript/ql/src/Security/CWE-094/ExpressionInjection.ql
3534
ql/javascript/ql/src/Security/CWE-094/ImproperCodeSanitization.ql
3635
ql/javascript/ql/src/Security/CWE-094/UnsafeDynamicMethodAccess.ql
3736
ql/javascript/ql/src/Security/CWE-1004/ClientExposedCookie.ql
@@ -48,7 +47,6 @@ ql/javascript/ql/src/Security/CWE-201/PostMessageStar.ql
4847
ql/javascript/ql/src/Security/CWE-209/StackTraceExposure.ql
4948
ql/javascript/ql/src/Security/CWE-295/DisablingCertificateValidation.ql
5049
ql/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql
51-
ql/javascript/ql/src/Security/CWE-312/ActionsArtifactLeak.ql
5250
ql/javascript/ql/src/Security/CWE-312/BuildArtifactLeak.ql
5351
ql/javascript/ql/src/Security/CWE-312/CleartextLogging.ql
5452
ql/javascript/ql/src/Security/CWE-312/CleartextStorage.ql

javascript/ql/integration-tests/query-suite/javascript-security-and-quality.qls.expected

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ ql/javascript/ql/src/Security/CWE-079/Xss.ql
119119
ql/javascript/ql/src/Security/CWE-079/XssThroughDom.ql
120120
ql/javascript/ql/src/Security/CWE-089/SqlInjection.ql
121121
ql/javascript/ql/src/Security/CWE-094/CodeInjection.ql
122-
ql/javascript/ql/src/Security/CWE-094/ExpressionInjection.ql
123122
ql/javascript/ql/src/Security/CWE-094/ImproperCodeSanitization.ql
124123
ql/javascript/ql/src/Security/CWE-094/UnsafeCodeConstruction.ql
125124
ql/javascript/ql/src/Security/CWE-094/UnsafeDynamicMethodAccess.ql
@@ -140,7 +139,6 @@ ql/javascript/ql/src/Security/CWE-201/PostMessageStar.ql
140139
ql/javascript/ql/src/Security/CWE-209/StackTraceExposure.ql
141140
ql/javascript/ql/src/Security/CWE-295/DisablingCertificateValidation.ql
142141
ql/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql
143-
ql/javascript/ql/src/Security/CWE-312/ActionsArtifactLeak.ql
144142
ql/javascript/ql/src/Security/CWE-312/BuildArtifactLeak.ql
145143
ql/javascript/ql/src/Security/CWE-312/CleartextLogging.ql
146144
ql/javascript/ql/src/Security/CWE-312/CleartextStorage.ql

javascript/ql/integration-tests/query-suite/javascript-security-extended.qls.expected

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ ql/javascript/ql/src/Security/CWE-079/Xss.ql
3434
ql/javascript/ql/src/Security/CWE-079/XssThroughDom.ql
3535
ql/javascript/ql/src/Security/CWE-089/SqlInjection.ql
3636
ql/javascript/ql/src/Security/CWE-094/CodeInjection.ql
37-
ql/javascript/ql/src/Security/CWE-094/ExpressionInjection.ql
3837
ql/javascript/ql/src/Security/CWE-094/ImproperCodeSanitization.ql
3938
ql/javascript/ql/src/Security/CWE-094/UnsafeCodeConstruction.ql
4039
ql/javascript/ql/src/Security/CWE-094/UnsafeDynamicMethodAccess.ql
@@ -55,7 +54,6 @@ ql/javascript/ql/src/Security/CWE-201/PostMessageStar.ql
5554
ql/javascript/ql/src/Security/CWE-209/StackTraceExposure.ql
5655
ql/javascript/ql/src/Security/CWE-295/DisablingCertificateValidation.ql
5756
ql/javascript/ql/src/Security/CWE-300/InsecureDependencyResolution.ql
58-
ql/javascript/ql/src/Security/CWE-312/ActionsArtifactLeak.ql
5957
ql/javascript/ql/src/Security/CWE-312/BuildArtifactLeak.ql
6058
ql/javascript/ql/src/Security/CWE-312/CleartextLogging.ql
6159
ql/javascript/ql/src/Security/CWE-312/CleartextStorage.ql

javascript/ql/integration-tests/query-suite/not_included_in_qls.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ ql/javascript/ql/src/Summary/TaintSinks.ql
6767
ql/javascript/ql/src/Summary/TaintSources.ql
6868
ql/javascript/ql/src/definitions.ql
6969
ql/javascript/ql/src/experimental/Security/CWE-094-dataURL/CodeInjection.ql
70-
ql/javascript/ql/src/experimental/Security/CWE-094/UntrustedCheckout.ql
7170
ql/javascript/ql/src/experimental/Security/CWE-099/EnvValueAndKeyInjection.ql
7271
ql/javascript/ql/src/experimental/Security/CWE-099/EnvValueInjection.ql
7372
ql/javascript/ql/src/experimental/Security/CWE-340/TokenBuiltFromUUID.ql
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/javascript-all
4+
extensible: summaryModel
5+
data:
6+
- ["react", "Member[use]", "Argument[0].Awaited", "ReturnValue", "value"]

javascript/ql/lib/javascript.qll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ import semmle.javascript.frameworks.DigitalOcean
9292
import semmle.javascript.frameworks.DomEvents
9393
import semmle.javascript.frameworks.Electron
9494
import semmle.javascript.frameworks.EventEmitter
95+
import semmle.javascript.frameworks.Execa
9596
import semmle.javascript.frameworks.Files
9697
import semmle.javascript.frameworks.Firebase
9798
import semmle.javascript.frameworks.FormParsers

javascript/ql/lib/semmle/javascript/Actions.qll

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/**
2+
* PENDING DEPRECATION. Models for GitHub Actions workflow files are part of the actions qlpack now.
3+
*
24
* Libraries for modeling GitHub Actions workflow files written in YAML.
35
* See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions.
46
*/

javascript/ql/lib/semmle/javascript/dataflow/AdditionalFlowSteps.qll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class LegacyFlowStep extends Unit {
152152
* Holds if `pred` → `succ` should be considered a data flow edge
153153
* transforming values with label `predlbl` to have label `succlbl`.
154154
*/
155-
predicate step(
155+
deprecated predicate step(
156156
DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
157157
DataFlow::FlowLabel succlbl
158158
) {
@@ -207,7 +207,7 @@ module LegacyFlowStep {
207207
* transforming values with label `predlbl` to have label `succlbl`.
208208
*/
209209
cached
210-
predicate step(
210+
deprecated predicate step(
211211
DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
212212
DataFlow::FlowLabel succlbl
213213
) {
@@ -282,7 +282,7 @@ class SharedFlowStep extends Unit {
282282
* Holds if `pred` → `succ` should be considered a data flow edge
283283
* transforming values with label `predlbl` to have label `succlbl`.
284284
*/
285-
predicate step(
285+
deprecated predicate step(
286286
DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
287287
DataFlow::FlowLabel succlbl
288288
) {
@@ -364,7 +364,7 @@ module SharedFlowStep {
364364
* Holds if `pred` → `succ` should be considered a data flow edge
365365
* transforming values with label `predlbl` to have label `succlbl`.
366366
*/
367-
predicate step(
367+
deprecated predicate step(
368368
DataFlow::Node pred, DataFlow::Node succ, DataFlow::FlowLabel predlbl,
369369
DataFlow::FlowLabel succlbl
370370
) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Alias for the library `semmle.javascript.explore.BackwardDataFlow`.
33
*/
4-
// deprecated module;
4+
deprecated module;
55

66
import semmle.javascript.explore.BackwardDataFlow

0 commit comments

Comments
 (0)