Skip to content

Bump codeql/javascript-all and fix breaking changes #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Feb 19, 2025
Merged

Bump codeql/javascript-all and fix breaking changes #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
03392f5
Bump `codeql/javascript-all` and fix breaking changes
jeongsoolee09 Feb 12, 2025
8c6ce4b
Change `BarrierGuardNode` to `BarrierGuard`
jeongsoolee09 Feb 12, 2025
75fc9b3
Bump versions of CodeQL CLI in qlt.conf.json
jeongsoolee09 Feb 12, 2025
7e2c88d
Remove UI5AMDModule
jeongsoolee09 Feb 12, 2025
bac7b71
Change `SapAmdModuleDefinition` to `SapDefineModule`
jeongsoolee09 Feb 14, 2025
1770d23
Upgrade dataflow library of UI5 to 2.4.0
jeongsoolee09 Feb 14, 2025
29a44fb
Bump javascript-all in CAP's qlpacks
jeongsoolee09 Feb 14, 2025
5aaadd6
Make `SapDefineModule` extend `AmdModuleDefinition::Range` and update…
jeongsoolee09 Feb 15, 2025
36c7eb7
Update rest of the expected files
jeongsoolee09 Feb 15, 2025
ba371e1
Bump `qlpack.yml` versions across UI5, CAP, and XSJS
jeongsoolee09 Feb 15, 2025
1666b73
[TEMP TEST] Fix version of global installed npm to `^8.6.1`
jeongsoolee09 Feb 18, 2025
144dc9f
Fix [email protected] in index-files.sh of the CDS extractor as well
jeongsoolee09 Feb 18, 2025
0c8168e
Change .cds to .cds.json in sensitive-exposure.expected
jeongsoolee09 Feb 19, 2025
241af8c
Run 'cds compile' command without '-o'
data-douser Feb 19, 2025
75579eb
Merge pull request #172 from advanced-security/data-douser/bump-javas…
jeongsoolee09 Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/run-codeql-unit-tests-javascript.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ jobs:
run: |
if ! command -v cds &> /dev/null
then
npm install -g @sap/cds-dk
## Workaround for https://github.tools.sap/cap/issues/issues/17840
npm install -g @sap/[email protected]
fi

# Compile .cds files to .cds.json files.
Expand All @@ -97,8 +98,8 @@ jobs:
echo "I am compiling $cds_file"
cds compile $cds_file \
-2 json \
-o "$cds_file.json" \
--locations
--locations \
> "$cds_file.json" 2> "$cds_file.err"
done
popd
done
Expand Down
4 changes: 2 additions & 2 deletions extractors/cds/tools/index-files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ then
# directory.
#
# We also ensure we skip node_modules, as we can end up in a recursive loop
find . -type d -name node_modules -prune -false -o -type f \( -iname 'package.json' \) -exec grep -ql '@sap/cds' {} \; -execdir bash -c "grep -q \"^\$(pwd)\(/\|$\)\" \"$response_file\"" \; -execdir bash -c "echo \"Installing @sap/cds-dk into \$(pwd) to enable CDS compilation.\"" \; -execdir npm install --silent @sap/cds-dk \; -execdir npm install --silent \;
find . -type d -name node_modules -prune -false -o -type f \( -iname 'package.json' \) -exec grep -ql '@sap/cds' {} \; -execdir bash -c "grep -q \"^\$(pwd)\(/\|$\)\" \"$response_file\"" \; -execdir bash -c "echo \"Installing @sap/cds-dk into \$(pwd) to enable CDS compilation.\"" \; -execdir npm install --silent @sap/cds-dk@8.6.1 \; -execdir npm install --silent \;

# Use the npx command to dynamically install the cds development kit (@sap/cds-dk) package if necessary,
# which then provides the cds command line tool in directories which are not covered by the package.json
Expand All @@ -52,7 +52,7 @@ echo "Processing CDS files to JSON"
# the same name
while IFS= read -r cds_file; do
echo "Processing CDS file $cds_file to:"
if ! $cds_command compile "$cds_file" -2 json -o "$cds_file.json" --locations 2> "$cds_file.err"; then
if ! $cds_command compile "$cds_file" -2 json --locations > "$cds_file.json" 2> "$cds_file.err"; then
stderr_truncated=`grep "^\[ERROR\]" "$cds_file.err" | tail -n 4`
error_message=$'Could not compile the file '"$cds_file"$'.\nReported error(s):\n```\n'"$stderr_truncated"$'\n```'
echo "$error_message"
Expand Down
4 changes: 2 additions & 2 deletions javascript/frameworks/cap/ext/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
library: true
name: advanced-security/javascript-sap-cap-models
version: 0.3.0
version: 0.4.0
extensionTargets:
codeql/javascript-all: "^2.0.0"
codeql/javascript-all: "^2.4.0"
22 changes: 12 additions & 10 deletions javascript/frameworks/cap/lib/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
lockVersion: 1.0.0
dependencies:
codeql/dataflow:
version: 1.1.2
codeql/javascript-all:
version: 2.0.0
codeql/javascript-all:
version: 2.4.0
codeql/mad:
version: 1.0.8
version: 1.0.16
codeql/regex:
version: 1.0.8
version: 1.0.16
codeql/ssa:
version: 1.0.8
version: 1.0.16
codeql/threat-models:
version: 1.0.16
codeql/tutorial:
version: 1.0.8
version: 1.0.16
codeql/typetracking:
version: 1.0.8
version: 2.0.0
codeql/util:
version: 1.0.8
version: 2.0.3
codeql/xml:
version: 1.0.8
version: 1.0.16
codeql/yaml:
version: 1.0.8
version: 1.0.16
compiled: false
6 changes: 3 additions & 3 deletions javascript/frameworks/cap/lib/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
library: true
name: advanced-security/javascript-sap-cap-all
version: 0.3.0
version: 0.4.0
suites: codeql-suites
extractor: javascript
dependencies:
codeql/javascript-all: "^2.0.0"
advanced-security/javascript-sap-cap-models: "^0.3.0"
codeql/javascript-all: "^2.4.0"
advanced-security/javascript-sap-cap-models: "^0.4.0"
22 changes: 12 additions & 10 deletions javascript/frameworks/cap/src/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
lockVersion: 1.0.0
dependencies:
codeql/dataflow:
version: 1.1.2
codeql/javascript-all:
version: 2.0.0
codeql/javascript-all:
version: 2.4.0
codeql/mad:
version: 1.0.8
version: 1.0.16
codeql/regex:
version: 1.0.8
version: 1.0.16
codeql/ssa:
version: 1.0.8
version: 1.0.16
codeql/threat-models:
version: 1.0.16
codeql/tutorial:
version: 1.0.8
version: 1.0.16
codeql/typetracking:
version: 1.0.8
version: 2.0.0
codeql/util:
version: 1.0.8
version: 2.0.3
codeql/xml:
version: 1.0.8
version: 1.0.16
codeql/yaml:
version: 1.0.8
version: 1.0.16
compiled: false
8 changes: 4 additions & 4 deletions javascript/frameworks/cap/src/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
library: false
name: advanced-security/javascript-sap-cap-queries
version: 0.3.0
version: 0.4.0
suites: codeql-suites
extractor: javascript
dependencies:
codeql/javascript-all: "^2.0.0"
advanced-security/javascript-sap-cap-models: "^0.3.0"
advanced-security/javascript-sap-cap-all: "^0.3.0"
codeql/javascript-all: "^2.4.0"
advanced-security/javascript-sap-cap-models: "^0.4.0"
advanced-security/javascript-sap-cap-all: "^0.4.0"
default-suite-file: codeql-suites/javascript-code-scanning.qls
22 changes: 12 additions & 10 deletions javascript/frameworks/cap/test/codeql-pack.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,25 @@
lockVersion: 1.0.0
dependencies:
codeql/dataflow:
version: 1.1.2
codeql/javascript-all:
version: 2.0.0
codeql/javascript-all:
version: 2.4.0
codeql/mad:
version: 1.0.8
version: 1.0.16
codeql/regex:
version: 1.0.8
version: 1.0.16
codeql/ssa:
version: 1.0.8
version: 1.0.16
codeql/threat-models:
version: 1.0.16
codeql/tutorial:
version: 1.0.8
version: 1.0.16
codeql/typetracking:
version: 1.0.8
version: 2.0.0
codeql/util:
version: 1.0.8
version: 2.0.3
codeql/xml:
version: 1.0.8
version: 1.0.16
codeql/yaml:
version: 1.0.8
version: 1.0.16
compiled: false
10 changes: 5 additions & 5 deletions javascript/frameworks/cap/test/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: advanced-security/javascript-sap-cap-queries-tests
version: 0.3.0
version: 0.4.0
extractor: javascript
dependencies:
codeql/javascript-all: "^2.0.0"
advanced-security/javascript-sap-cap-queries: "^0.3.0"
advanced-security/javascript-sap-cap-models: "^0.3.0"
advanced-security/javascript-sap-cap-all: "^0.3.0"
codeql/javascript-all: "^2.4.0"
advanced-security/javascript-sap-cap-queries: "^0.4.0"
advanced-security/javascript-sap-cap-models: "^0.4.0"
advanced-security/javascript-sap-cap-all: "^0.4.0"
4 changes: 4 additions & 0 deletions javascript/frameworks/cap/test/queries/cqlinjection/cqlinjection.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
WARNING: module 'PathGraph' has been deprecated and may be removed in future (CqlInjection.ql:14,8-27)
WARNING: type 'Configuration' has been deprecated and may be removed in future (CqlInjection.ql:19,33-61)
WARNING: type 'PathNode' has been deprecated and may be removed in future (CqlInjection.ql:46,29-47)
WARNING: type 'PathNode' has been deprecated and may be removed in future (CqlInjection.ql:46,56-74)
nodes
| cqlinjection.js:7:34:7:36 | req |
| cqlinjection.js:7:34:7:36 | req |
Expand Down
3 changes: 3 additions & 0 deletions ...on/log-injection-not-depending-on-request/log-injection-not-depending-on-request.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
WARNING: module 'PathGraph' has been deprecated and may be removed in future (LogInjection.ql:14,8-27)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,43-61)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,70-88)
nodes
edges
#select
3 changes: 3 additions & 0 deletions ...t/queries/loginjection/log-injection-type-sanitized/log-injection-type-sanitized.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
WARNING: module 'PathGraph' has been deprecated and may be removed in future (LogInjection.ql:14,8-27)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,43-61)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,70-88)
nodes
edges
#select
3 changes: 3 additions & 0 deletions ...-injection-with-complete-protocol-none/log-injection-with-complete-protocol-none.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
WARNING: module 'PathGraph' has been deprecated and may be removed in future (LogInjection.ql:14,8-27)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,43-61)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,70-88)
nodes
edges
#select
3 changes: 3 additions & 0 deletions ...-injection-with-service1-protocol-none/log-injection-with-service1-protocol-none.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
WARNING: module 'PathGraph' has been deprecated and may be removed in future (LogInjection.ql:14,8-27)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,43-61)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,70-88)
nodes
| srv/service2.js:6:29:6:31 | msg |
| srv/service2.js:6:29:6:31 | msg |
Expand Down
3 changes: 3 additions & 0 deletions ...-injection-with-service2-protocol-none/log-injection-with-service2-protocol-none.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
WARNING: module 'PathGraph' has been deprecated and may be removed in future (LogInjection.ql:14,8-27)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,43-61)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,70-88)
nodes
| srv/service1.js:6:33:6:35 | req |
| srv/service1.js:6:33:6:35 | req |
Expand Down
3 changes: 3 additions & 0 deletions ...njection/log-injection-without-protocol-none/log-injection-without-protocol-none.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
WARNING: module 'PathGraph' has been deprecated and may be removed in future (LogInjection.ql:14,8-27)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,43-61)
WARNING: type 'PathNode' has been deprecated and may be removed in future (LogInjection.ql:18,70-88)
nodes
| srv/service1.js:6:33:6:35 | req |
| srv/service1.js:6:33:6:35 | req |
Expand Down
6 changes: 5 additions & 1 deletion javascript/frameworks/cap/test/queries/sensitive-exposure/sensitive-exposure.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
WARNING: module 'PathGraph' has been deprecated and may be removed in future (SensitiveExposure.ql:17,8-27)
WARNING: type 'Configuration' has been deprecated and may be removed in future (SensitiveExposure.ql:50,42-70)
WARNING: type 'PathNode' has been deprecated and may be removed in future (SensitiveExposure.ql:60,41-59)
WARNING: type 'PathNode' has been deprecated and may be removed in future (SensitiveExposure.ql:60,68-86)
nodes
| sensitive-exposure.js:9:32:9:42 | Sample.name |
| sensitive-exposure.js:9:32:9:42 | Sample.name |
| sensitive-exposure.js:9:32:9:42 | Sample.name |
edges
| sensitive-exposure.js:9:32:9:42 | Sample.name | sensitive-exposure.js:9:32:9:42 | Sample.name |
#select
| sensitive-exposure.js:9:32:9:42 | Sample.name | sensitive-exposure.js:9:32:9:42 | Sample.name | sensitive-exposure.js:9:32:9:42 | Sample.name | Log entry depends on the $@ field which is annotated as potentially sensitive. | sensitive-exposure.cds:4:5:4:8 | {\\n ... } | name |
| sensitive-exposure.js:9:32:9:42 | Sample.name | sensitive-exposure.js:9:32:9:42 | Sample.name | sensitive-exposure.js:9:32:9:42 | Sample.name | Log entry depends on the $@ field which is annotated as potentially sensitive. | sensitive-exposure.cds:4:5:4:8 | {\\n ... } | name |
4 changes: 2 additions & 2 deletions javascript/frameworks/ui5/ext/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
library: true
name: advanced-security/javascript-sap-ui5-models
version: 0.6.0
version: 0.7.0
extensionTargets:
codeql/javascript-all: "^2.0.0"
codeql/javascript-all: "^2.4.0"
dataExtensions:
- "*.model.yml"
4 changes: 2 additions & 2 deletions ...ript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/RemoteFlowSources.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ class ODataServiceModel extends UI5ExternalModel {
this instanceof NewNode and
(
exists(RequiredObject oDataModel |
oDataModel.flowsTo(this.getCalleeNode()) and
oDataModel.getDependencyType() = "sap/ui/model/odata/v2/ODataModel"
oDataModel.asSourceNode().flowsTo(this.getCalleeNode()) and
oDataModel.getDependency() = "sap/ui/model/odata/v2/ODataModel"
)
or
this.getCalleeName() = "ODataModel"
Expand Down
Loading
Loading