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

Add support for SSPPolicy, depricate --set-sbat-policy delete #65

Closed
wants to merge 3 commits into from

Conversation

jsetje
Copy link
Contributor

@jsetje jsetje commented Jun 9, 2023

This unlocks the ability to control bootmgr revocation polity in a similar manner to what we did with sbat levels. There are some subtle differences since we want to be more aggressive with our own policy than with one that could be managed by an external OS. That choice may evolve over time.

Thank you for any and all comments, including any naming discussion.

@lcp
Copy link
Owner

lcp commented Jun 12, 2023

The commit mentions that --set-sbat-policy delete is deprecated but it still sets delete policy for SBAT. If you plan to keep it for the time being and remove the option in the future, I would like to see the commit message to address that.

On the other hand, the help messages for --set-fallback-verbosity and --set-fallback-noreboot have been changed. Those are irrelevant to SSPPolicy and should be in a separate commit.

@jsetje
Copy link
Contributor Author

jsetje commented Jun 12, 2023

Thank you for looking at this!!

I split out the tab spacing fix and added a note that I will delete the actual delete implementation at a future date. If someone is stuck with a newer mokutil and an older shim for some reason, they will really need the delete, so I don't want to take it away suddenly.

 This only removed --set-sbat-policy delete from the documentaion
and help message. Since mokutil and shim may not be updated in
lockstep, it makes sense to continue to allow it to be set for
a while. I will remove it fully in a couple months.

Signed-off-by: Jan Setje-Eilers <[email protected]>
When the term previous was introduced for revocations to be
automatically applied there was a hope that everytime a new
revocation was built into shim, the previous revocation could
be applied automatically. Further experience has shown the
real world to be more complex than that. The automatic payload
will realistically contain a set of revocations governed by
both the cadence at which a distro's customer base updates
as well as the severity of the issue being revoked.

In order to not break compatibility with existing scripts,
the term "previous" will continue to be accepted.

This is not a functional change.

Signed-off-by: Jan Setje-Eilers <[email protected]>
@jsetje jsetje marked this pull request as ready for review January 29, 2024 22:58
src/mokutil.c Outdated
@@ -136,13 +137,16 @@ print_help ()
printf (" --set-fallback-noreboot <true/false>\t\tPrevent fallback from automatically rebooting\n");
printf (" --trust-mok\t\t\t\tTrust MOK keys within the kernel keyring\n");
printf (" --untrust-mok\t\t\t\tDo not trust MOK keys\n");
printf (" --set-sbat-policy <latest/previous/delete>\t\tApply Latest, Previous, or Blank SBAT revocations\n");
printf (" --set-sbat-policy <latest/previous>"
"\tApply Lates or Previous SBAT revocations\n");
Copy link
Owner

Choose a reason for hiding this comment

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

typo: Lates -> Latest

@@ -1,4 +1,4 @@
/**
/*
Copy link
Owner

Choose a reason for hiding this comment

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

This change is not necessary.

@lcp
Copy link
Owner

lcp commented Feb 7, 2024

Those patches look good in general except a couple of minor flaws. I'll fix them and merge this PR.

@lcp
Copy link
Owner

lcp commented Feb 7, 2024

Merged.

@lcp lcp closed this Feb 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants