Skip to content

Commit a219774

Browse files
authored
Merge pull request #23060 from github/nickrolfe/json-data-extensions-shared
Shared: convert data extensions to JSON
2 parents c6be2b8 + e674f44 commit a219774

8 files changed

Lines changed: 76 additions & 53 deletions
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"extensions": [
3+
{
4+
"addsTo": {
5+
"pack": "codeql/threat-models",
6+
"extensible": "threatModelConfiguration"
7+
},
8+
"data": [
9+
["default", true, -2147483648] // The "default" threat model is included by default
10+
]
11+
}
12+
]
13+
}

‎shared/threat-models/ext/supported-threat-models.model.yml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"extensions": [
3+
{
4+
"addsTo": {
5+
"pack": "codeql/threat-models",
6+
"extensible": "threatModelGrouping"
7+
},
8+
"data": [
9+
// Default threat model
10+
["remote", "default"],
11+
12+
// Remote threat models
13+
["request", "remote"],
14+
["response", "remote"],
15+
16+
// Local threat models
17+
["database", "local"],
18+
["commandargs", "local"],
19+
["environment", "local"],
20+
["stdin", "local"],
21+
["file", "local"],
22+
["windows-registry", "local"],
23+
24+
// Android threat models
25+
["android-external-storage-dir", "android"],
26+
["contentprovider", "android"],
27+
28+
// Threat models that are not grouped with any other threat models.
29+
// (Note that all threat models are a child of "all" implicitly, and we
30+
// make it explicit here just to make sure all threat models are listed.)
31+
["database-access-result", "all"],
32+
["file-write", "all"],
33+
["reverse-dns", "all"],
34+
["view-component-input", "all"],
35+
36+
// AI threat models
37+
["ai", "all"]
38+
]
39+
}
40+
]
41+
}

‎shared/threat-models/ext/threat-model-grouping.model.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎shared/threat-models/qlpack.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ library: true
44
groups: shared
55
dataExtensions:
66
- ext/*.model.yml
7+
- ext/*.model.json
78
warnOnImplicitThis: true
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"extensions": [
3+
{
4+
"addsTo": {
5+
"pack": "codeql/util",
6+
"extensible": "restrictAlertsTo"
7+
},
8+
// Empty predicate means no restrictions on alert locations
9+
"data": []
10+
},
11+
{
12+
"addsTo": {
13+
"pack": "codeql/util",
14+
"extensible": "restrictAlertsToExactLocation"
15+
},
16+
// Empty predicate means no restrictions on alert locations
17+
"data": []
18+
}
19+
]
20+
}

‎shared/util/ext/default-alert-filter.yml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎shared/util/qlpack.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ library: true
55
dependencies: null
66
dataExtensions:
77
- ext/*.yml
8+
- ext/*.json
89
warnOnImplicitThis: true

0 commit comments

Comments
 (0)