FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Use extension packs for threat models · github/codeql@bd7de83 · GitHub

/ codeql Public

Commit bd7de83

Browse files
Dave Bartolomeo
committed
Use extension packs for threat models
1 parent da44b13 commit bd7de83

13 files changed

Lines changed: 50 additions & 12 deletions

File tree

‎codeql-workspace.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ provide:
66
- "*/ql/consistency-queries/qlpack.yml"
77
- "*/ql/automodel/src/qlpack.yml"
88
- "*/ql/automodel/test/qlpack.yml"
9-
- "shared/*/qlpack.yml"
9+
- "shared/**/qlpack.yml"
1010
- "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml"
1111
- "go/ql/config/legacy-support/qlpack.yml"
1212
- "go/build/codeql-extractor-go/codeql-extractor.yml"

‎java/ql/lib/qlpack.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ dependencies:
99
codeql/dataflow: ${workspace}
1010
codeql/mad: ${workspace}
1111
codeql/regex: ${workspace}
12+
codeql/threat-models: ${workspace}
1213
codeql/tutorial: ${workspace}
1314
codeql/typetracking: ${workspace}
1415
codeql/util: ${workspace}
1516
dataExtensions:
1617
- ext/*.model.yml
1718
- ext/generated/*.model.yml
1819
- ext/experimental/*.model.yml
19-
- ext/threatmodels/*.model.yml
2020
warnOnImplicitThis: true

‎java/ql/lib/semmle/code/java/dataflow/FlowSources.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import semmle.code.java.frameworks.struts.StrutsActions
2929
import semmle.code.java.frameworks.Thrift
3030
import semmle.code.java.frameworks.javaee.jsf.JSFRenderer
3131
private import semmle.code.java.dataflow.ExternalFlow
32-
private import semmle.code.java.dataflow.ExternalFlowConfiguration
32+
private import codeql.threatmodels.ThreatModels
3333

3434
/**
3535
* A data flow source.

‎java/ql/test/library-tests/dataflow/threat-models/threat-models1.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import semmle.code.java.dataflow.ExternalFlowConfiguration as ExternalFlowConfiguration
1+
import codeql.threatmodels.ThreatModels as ThreatModels
22

33
query predicate supportedThreatModels(string kind) {
4-
ExternalFlowConfiguration::currentThreatModel(kind)
4+
ThreatModels::currentThreatModel(kind)
55
}

‎java/ql/test/library-tests/dataflow/threat-models/threat-models2.ql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import semmle.code.java.dataflow.ExternalFlowConfiguration as ExternalFlowConfiguration
1+
import codeql.threatmodels.ThreatModels as ThreatModels
22

33
query predicate supportedThreatModels(string kind) {
4-
ExternalFlowConfiguration::currentThreatModel(kind)
4+
ThreatModels::currentThreatModel(kind)
55
}

‎shared/threat-models-ext/android/qlpack.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: codeql/threat-android
2+
version: 0.0.0-dev
3+
groups:
4+
- shared
5+
- threat-models
6+
library: true
7+
dataExtensions:
8+
- "*.model.yml"
9+
extensionTargets:
10+
codeql/threat-models: ${workspace}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extensions:
2+
3+
- addsTo:
4+
pack: codeql/threat-models
5+
extensible: supportedThreatModels
6+
data:
7+
- ["android"]

‎shared/threat-models-ext/local/qlpack.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: codeql/threat-local
2+
version: 0.0.0-dev
3+
groups:
4+
- shared
5+
- threat-models
6+
library: true
7+
dataExtensions:
8+
- "*.model.yml"
9+
extensionTargets:
10+
codeql/threat-models: ${workspace}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extensions:
2+
3+
- addsTo:
4+
pack: codeql/threat-models
5+
extensible: supportedThreatModels
6+
data:
7+
- ["local"]

java/ql/lib/semmle/code/java/dataflow/ExternalFlowConfiguration.qll renamed to shared/threat-models/codeql/threatmodels/ThreatModels.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
* are applicable to generic queries.
66
*/
77

8-
private import ExternalFlowExtensions
9-
108
/**
119
* Holds if the specified kind of source model is supported for the current query.
1210
*/
13-
extensible private predicate supportedThreatModels(string kind);
11+
extensible predicate supportedThreatModels(string kind);
1412

1513
/**
1614
* Holds if the specified kind of source model is containted within the specified group.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL