Skip to content

Commit 2d9e55d

Browse files
felickzCopilot
felickz
and
Copilot
authored
Fix indentation for 'pack' and 'extensible' fields in model YAML files (#146)
* Fix indentation for 'pack' and 'extensible' fields in model YAML files * Fix validate-test-results CI step: use find instead of glob, fix jq quoting Agent-Logs-Url: https://github.com/GitHubSecurityLab/CodeQL-Community-Packs/sessions/4c10e063-602b-451a-aac5-30643a92609c Co-authored-by: felickz <1760475+felickz@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent 85fcbd5 commit 2d9e55d

File tree

8 files changed

+39
-38
lines changed

8 files changed

+39
-38
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,17 @@ jobs:
132132

133133
- name: Validate test results
134134
run: |
135-
if [[ ! -n "$(find . -name 'test_report_*' -print -quit)" ]]; then
135+
mapfile -t test_reports < <(find . -name 'test_report_*.json')
136+
if [[ ${#test_reports[@]} -eq 0 ]]; then
136137
echo "No test results found"
137138
exit 0
138139
fi
139140
140-
for json_report in *-test-results/test_report_*
141+
for json_report in "${test_reports[@]}"
141142
do
142-
jq --raw-output '"PASS \(map(select(.pass == true)) | length)/\(length)'" $json_report\"" "$json_report"
143+
jq --raw-output '"PASS \(map(select(.pass == true)) | length)/\(length)"' "$json_report"
143144
done
144-
FAILING_TESTS=$(jq --raw-output '.[] | select(.pass == false)' *-test-results/test_report_*.json)
145+
FAILING_TESTS=$(jq --raw-output '.[] | select(.pass == false)' "${test_reports[@]}")
145146
if [[ ! -z "$FAILING_TESTS" ]]; then
146147
echo "ERROR: The following tests failed:"
147148
echo $FAILING_TESTS | jq .

‎python/ext/generated/flask.model.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/python-all
4-
extensible: sourceModel
3+
pack: codeql/python-all
4+
extensible: sourceModel
55
data:
66
- ["flask", "Member[app].Member[Flask].Instance.Member[open_instance_resource]", "Argument[1,resource:]", "file"]
77
- ["flask", "Member[app].Member[Flask].Instance.Member[open_instance_resource]", "Argument[2,mode:]", "file"]
@@ -41,8 +41,8 @@ extensions:
4141
- ["flask", "Member[sessions].Member[SecureCookieSessionInterface].Instance.Member[open_session]", "Argument[1,app:]", "remote"]
4242
- ["flask", "Member[sessions].Member[SecureCookieSessionInterface].Instance.Member[save_session]", "Argument[1,app:]", "remote"]
4343
- addsTo:
44-
pack: codeql/python-all
45-
extensible: sinkModel
44+
pack: codeql/python-all
45+
extensible: sinkModel
4646
data:
4747
- ["flask", "Member[app].Member[Flask].Instance.Member[open_instance_resource]", "Argument[1,resource:]", "path-injection"]
4848
- ["flask", "Member[app].Member[Flask].Instance.Member[open_resource]", "Argument[1,resource:]", "path-injection"]
@@ -53,8 +53,8 @@ extensions:
5353
- ["flask", "Member[config].Member[Config].Instance.Member[from_file]", "Argument[1,filename:]", "path-injection"]
5454
- ["flask", "Member[config].Member[Config].Instance.Member[from_pyfile]", "Argument[1,filename:]", "path-injection"]
5555
- addsTo:
56-
pack: codeql/python-all
57-
extensible: summaryModel
56+
pack: codeql/python-all
57+
extensible: summaryModel
5858
data:
5959
- ["flask", "Member[app].Member[Flask].Instance.Member[app_context]", "Argument[self]", "ReturnValue", "taint"]
6060
- ["flask", "Member[app].Member[Flask].Instance.Member[create_jinja_environment]", "Argument[self]", "ReturnValue", "taint"]

‎python/ext/generated/ghastoolkit.model.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/python-all
4-
extensible: sourceModel
3+
pack: codeql/python-all
4+
extensible: sourceModel
55
data:
66
- ["ghastoolkit", "Member[codeql].Member[cli].Member[CodeQL].Instance.Member[getResults]", "Argument[1,database:]", "file"]
77
- ["ghastoolkit", "Member[codeql].Member[cli].Member[CodeQL].Instance.Member[getResults]", "Argument[2,path:]", "file"]
@@ -55,8 +55,8 @@ extensions:
5555
- ["ghastoolkit", "Member[supplychain].Member[licensing].Member[Licenses].Instance.Member[load]", "Argument[1,path:]", "file"]
5656
- ["ghastoolkit", "Member[utils].Member[cli].Member[CommandLine].Instance.Member[parse_args]", "ReturnValue", "commandargs"]
5757
- addsTo:
58-
pack: codeql/python-all
59-
extensible: sinkModel
58+
pack: codeql/python-all
59+
extensible: sinkModel
6060
data:
6161
- ["ghastoolkit", "Member[codeql].Member[cli].Member[CodeQL].Instance.Member[getResults]", "Argument[1,database:]", "path-injection"]
6262
- ["ghastoolkit", "Member[codeql].Member[cli].Member[CodeQL].Instance.Member[runQuery]", "Argument[1,database:]", "path-injection"]
@@ -77,8 +77,8 @@ extensions:
7777
- ["ghastoolkit", "Member[supplychain].Member[licensing].Member[Licenses].Instance.Member[generateLockfile]", "Argument[1,path:]", "path-injection"]
7878
- ["ghastoolkit", "Member[supplychain].Member[licensing].Member[Licenses].Instance.Member[load]", "Argument[1,path:]", "path-injection"]
7979
- addsTo:
80-
pack: codeql/python-all
81-
extensible: summaryModel
80+
pack: codeql/python-all
81+
extensible: summaryModel
8282
data:
8383
- ["ghastoolkit", "Member[codeql].Member[cli].Member[CodeQL].Instance.Member[createDatabase]", "Argument[1,database:]", "ReturnValue", "taint"]
8484
- ["ghastoolkit", "Member[codeql].Member[cli].Member[CodeQL].Instance.Member[createDatabase]", "Argument[2,output:]", "ReturnValue", "taint"]

‎python/ext/generated/itsdangerous.model.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/python-all
4-
extensible: summaryModel
3+
pack: codeql/python-all
4+
extensible: summaryModel
55
data:
66
- ["itsdangerous", "Member[encoding].Member[base64_decode]", "Argument[0,string:]", "ReturnValue", "taint"]
77
- ["itsdangerous", "Member[encoding].Member[base64_encode]", "Argument[0,string:]", "ReturnValue", "taint"]

‎python/ext/generated/openai.model.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/python-all
4-
extensible: sourceModel
3+
pack: codeql/python-all
4+
extensible: sourceModel
55
data:
66
- ["openai", "Argument[self]", "file"]
77
- ["openai", "Member[_legacy_response].Member[HttpxBinaryResponseContent].Instance.Member[stream_to_file]", "Argument[1,file:]", "file"]
@@ -24,8 +24,8 @@ extensions:
2424
- ["openai", "Member[lib].Member[_validators].Member[read_any_format]", "Argument[self]", "file"]
2525
- ["openai", "Member[lib].Member[_validators].Member[read_any_format]", "ReturnValue", "file"]
2626
- addsTo:
27-
pack: codeql/python-all
28-
extensible: summaryModel
27+
pack: codeql/python-all
28+
extensible: summaryModel
2929
data:
3030
- ["openai", "Argument[self]", "Argument[1,_fields_set:]", "taint"]
3131
- ["openai", "Member[_base_client].Member[AsyncAPIClient].Instance.Member[delete]", "Argument[self]", "ReturnValue", "taint"]

‎python/ext/generated/pymysql.model.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/python-all
4-
extensible: sinkModel
3+
pack: codeql/python-all
4+
extensible: sinkModel
55
data:
66
- ["pymysql", "Member[connections].Member[Connection].Instance.Member[connect]", "Argument[1,sock:]", "path-injection"]
77
- ["pymysql", "Member[connections].Member[Connection].Instance.Member[connect]", "Argument[1,sock:]", "sql-injection"]
88
- ["pymysql", "Member[cursors].Member[Cursor].Instance.Member[executemany]", "Argument[1,query:]", "sql-injection"]
99
- ["pymysql", "Member[cursors].Member[Cursor].Instance.Member[executemany]", "Argument[2,args:]", "sql-injection"]
1010
- addsTo:
11-
pack: codeql/python-all
12-
extensible: summaryModel
11+
pack: codeql/python-all
12+
extensible: summaryModel
1313
data:
1414
- ["pymysql", "Member[Binary]", "Argument[0,x:]", "ReturnValue", "taint"]
1515
- ["pymysql", "Member[_auth].Member[caching_sha2_password_auth]", "Argument[1,pkt:]", "Argument[0,conn:]", "taint"]

‎python/ext/generated/urllib3.model.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/python-all
4-
extensible: sourceModel
3+
pack: codeql/python-all
4+
extensible: sourceModel
55
data:
66
- ["urllib3", "Member[util].Member[ssl_].Member[create_urllib3_context]", "Argument[0,ssl_version:]", "environment"]
77
- ["urllib3", "Member[util].Member[ssl_].Member[create_urllib3_context]", "Argument[3,ciphers:]", "environment"]
@@ -10,13 +10,13 @@ extensions:
1010
- ["urllib3", "Member[util].Member[ssl_].Member[ssl_wrap_socket]", "Argument[6,ssl_version:]", "environment"]
1111
- ["urllib3", "Member[util].Member[ssl_].Member[ssl_wrap_socket]", "Argument[7,ciphers:]", "environment"]
1212
- addsTo:
13-
pack: codeql/python-all
14-
extensible: sinkModel
13+
pack: codeql/python-all
14+
extensible: sinkModel
1515
data:
1616
- ["urllib3", "Member[util].Member[ssl_].Member[ssl_wrap_socket]", "Argument[1,keyfile:]", "path-injection"]
1717
- addsTo:
18-
pack: codeql/python-all
19-
extensible: summaryModel
18+
pack: codeql/python-all
19+
extensible: summaryModel
2020
data:
2121
- ["urllib3", "Member[_collections].Member[HTTPHeaderDict].Instance.Member[getlist]", "Argument[2,default:]", "ReturnValue", "taint"]
2222
- ["urllib3", "Member[_collections].Member[HTTPHeaderDict].Instance.Member[getlist]", "Argument[self]", "ReturnValue", "taint"]

‎python/ext/generated/werkzeug.model.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extensions:
22
- addsTo:
3-
pack: codeql/python-all
4-
extensible: sourceModel
3+
pack: codeql/python-all
4+
extensible: sourceModel
55
data:
66
- ["werkzeug", "Member[_reloader].Member[ReloaderLoop].Instance.Member[restart_with_reloader]", "ReturnValue", "environment"]
77
- ["werkzeug", "Member[_reloader].Member[run_with_reloader]", "Argument[0,main_func:]", "environment"]
@@ -49,8 +49,8 @@ extensions:
4949
- ["werkzeug", "Member[utils].Member[send_from_directory]", "Argument[2,environ:]", "file"]
5050
- ["werkzeug", "Member[utils].Member[send_from_directory]", "ReturnValue", "file"]
5151
- addsTo:
52-
pack: codeql/python-all
53-
extensible: sinkModel
52+
pack: codeql/python-all
53+
extensible: sinkModel
5454
data:
5555
- ["werkzeug", "Member[datastructures].Member[file_storage].Member[FileMultiDict].Instance.Member[add_file]", "Argument[2,file:]", "path-injection"]
5656
- ["werkzeug", "Member[datastructures].Member[file_storage].Member[FileStorage].Instance.Member[save]", "Argument[1,dst:]", "path-injection"]
@@ -64,8 +64,8 @@ extensions:
6464
- ["werkzeug", "Member[utils].Member[send_file]", "Argument[0,path_or_file:]", "path-injection"]
6565
- ["werkzeug", "Member[utils].Member[send_file]", "Argument[11,_root_path:]", "path-injection"]
6666
- addsTo:
67-
pack: codeql/python-all
68-
extensible: summaryModel
67+
pack: codeql/python-all
68+
extensible: summaryModel
6969
data:
7070
- ["werkzeug", "Member[datastructures].Member[accept].Member[Accept].Instance.Member[best_match]", "Argument[1,matches:]", "ReturnValue", "taint"]
7171
- ["werkzeug", "Member[datastructures].Member[accept].Member[Accept].Instance.Member[best_match]", "Argument[2,default:]", "ReturnValue", "taint"]

0 commit comments

Comments
 (0)