Skip to content
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.

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

Java: Threat model implementation with priorities. #14582

Merged
merged 14 commits into from
Oct 27, 2023
Merged

Conversation

dbartol
Copy link
Contributor

@dbartol dbartol commented Oct 24, 2023

This is an alternate implementation of threat models that depends on a new CLI option (--threat-model) that generates a temporary extension pack to configure the supported threat models. Compare to #14548, which does not require a new CLI option.

This implementation has a few advantages over the other:

  • It allows disabling of a threat model that was enabled earlier in the configuration. This is useful for multi-level configuration scenarios where the org-level configuration specifies a particular threat model, but the repo-level configuration wants to disable it. It also helps within a single configuration when trying to enable all of the threat models in a group except for one particular one (e.g., all local sources except environment).
  • It allows disabling of the default threat model via the same mechanism as disabling any other threat model.
  • The all threat model works as originally intended.

The downside is that we have to add a new configuration setting to half a dozen places.

Implementation details

codeql database analyze will accept a new --threat-model option that can be specified multiple times. Each instance of the option accepts a string argument with the name of a threat model, optionally preceded by !. Without a !, the option enables the specified threat model, or, if the specified model is a group, all of its descendants. With a !, the option disables the specified threat model or its descendants. The options are processed in order.

Before running the analysis, the CLI will generate a temporary extension pack that extends the threatModelConfiguration predicate with one row for each instance of the --threat-model option. The row will contain the following columns:

  • kind - The name of the threat model, without any ! prefix.
  • enabled - A boolean value set to false if the argument had a ! prefix, and true, otherwise.
  • priority - An int value specifying the order in which the option was processed. The first instance gets priority 0, the next gets priority 1, and so on.

At evaluation time, the codeql/threat-models library processes the threatModelConfiguration table to determine which threat models are actually enabled.

@github-actions github-actions bot added the Java label Oct 24, 2023
@michaelnebel
Copy link
Contributor

This looks really nice @dbartol!
I have taken the liberty to update existing tests and add an extra one for the "subtraction".

@dbartol
Copy link
Contributor Author

dbartol commented Oct 26, 2023

I have taken the liberty to update existing tests and add an extra one for the "subtraction".

Oh, cool, I was going to ask if we had a way for QL tests to specify data extensions, but I guess the answer is "yes".

@dbartol dbartol marked this pull request as ready for review October 26, 2023 21:49
@dbartol dbartol requested a review from a team as a code owner October 26, 2023 21:49
@michaelnebel michaelnebel added the no-change-note-required This PR does not need a change note label Oct 27, 2023
michaelnebel
michaelnebel previously approved these changes Oct 27, 2023
Copy link
Contributor

@michaelnebel michaelnebel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really good! 👍
Lets also
(1) Get a review from someone on the java team.
(2) Run DCA (I will trigger an execution).

@michaelnebel michaelnebel changed the title Alternate threat model implementation Java: Threat model implementation with priorities. Oct 27, 2023
@aschackmull
Copy link
Contributor

Some minor comments, otherwise LGTM!

Co-authored-by: Anders Schack-Mulligen <[email protected]>
Copy link
Contributor

@michaelnebel michaelnebel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍
Will re-run DCA.

@michaelnebel
Copy link
Contributor

DCA also looks good
(1) There are no changes to alerts
(2) There doesn't appear to be any performance regressions.

@dbartol : This PR can be merged now.

@dbartol dbartol merged commit b18a6d5 into main Oct 27, 2023
47 checks passed
@dbartol dbartol deleted the dbartol/threat-models-2 branch October 27, 2023 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Java no-change-note-required This PR does not need a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants