Skip to content

Commit 5790329

Browse files
committed
Address review comments
1 parent cdffef8 commit 5790329

6 files changed

Lines changed: 5 additions & 34 deletions

File tree

actions/ql/lib/actions.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
import codeql.actions.Ast
2-
3-
abstract class CustomEnvEnable extends Environment { }

actions/ql/lib/codeql/actions/config/Config.qll

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,3 @@ predicate actionsPermissionsDataModel(string action, string permission) {
173173
predicate enabledDeploymentEnvironmentDataModel(string name) {
174174
Extensions::enabledDeploymentEnvironmentDataModel(name)
175175
}
176-
177-
/**
178-
* `EnvironmentCheck` implementation model.
179-
*/
180-
predicate selectDeploymentEnvironmentDataModel(string selected) {
181-
Extensions::selectDeploymentEnvironmentDataModel(selected)
182-
}

actions/ql/lib/codeql/actions/config/ConfigExtensions.qll

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,3 @@ extensible predicate actionsPermissionsDataModel(string action, string permissio
9595
* toggle precision of whether that suffices or not as a control check.
9696
*/
9797
extensible predicate enabledDeploymentEnvironmentDataModel(string name);
98-
99-
/**
100-
* Selects which deployment environments model to use to implement `EnvironmentCheck`.
101-
*/
102-
extensible predicate selectDeploymentEnvironmentDataModel(string mechanism);

actions/ql/lib/codeql/actions/security/ControlChecks.qll

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,10 @@ abstract class LabelCheck extends ControlCheck {
278278

279279
class EnvironmentCheck extends ControlCheck instanceof Environment {
280280
EnvironmentCheck() {
281-
exists(string selected |
282-
selectDeploymentEnvironmentDataModel(selected) and
283-
if selected = "EnvironmentCheckMaD"
284-
then enabledDeploymentEnvironmentDataModel(this.(Environment).getName())
285-
else
286-
if selected = "EnvironmentCheckCustomQL"
287-
then this instanceof CustomEnvEnable
288-
else this instanceof Environment
289-
)
281+
// if there are any custom tuples use those
282+
if enabledDeploymentEnvironmentDataModel(_)
283+
then enabledDeploymentEnvironmentDataModel(this.(Environment).getName())
284+
else this instanceof Environment
290285
}
291286

292287
// Environment checks are not effective against any mutable attacks

actions/ql/lib/ext/config/customize_checks.yml

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

actions/ql/lib/ext/config/deployment_environment.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ extensions:
22
- addsTo:
33
pack: codeql/actions-all
44
extensible: enabledDeploymentEnvironmentDataModel
5-
data:
6-
- [""]
5+
data: []

0 commit comments

Comments
 (0)