Validate root rotations against trust pinning where appropriate #800
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| // At this point, we assume that we have already trusted previous root data and so will not perform any | ||
| // additional trust pinning checks on this new certificate | ||
| if !firstBootstrap { | ||
| logrus.Debug("TOFU is disabled but previous root data exists, skipping disable TOFU restriction") |
There was a problem hiding this comment.
Nit: I'm wondering if this log message might be confusing, since it's not exactly doing a TOFU check, since it's not first use. It's just that no other trust pinning has been specified. In which case maybe this check can just be combined with the previous conditional?
There was a problem hiding this comment.
Sounds good, I'll combine them into a !trustPinConfig.DisableTOFU || !firstBootstrap case
|
LGTM after nits! Thanks for making sure the new roots conform to trust pinning too! |
endophage
added
pr/general-review
and removed
group/distribution
status/0-triage
labels
riyazdf
force-pushed
the
trust-pinning-rotation
branch
3 times, most recently
from
12529db
to
1f6f68d
Compare
riyazdf
force-pushed
the
trust-pinning-rotation
branch
from
1f6f68d
to
a05717f
Compare
riyazdf
force-pushed
the
trust-pinning-rotation
branch
from
a05717f
to
7ebb93b
Compare
riyazdf
force-pushed
the
trust-pinning-rotation
branch
from
7ebb93b
to
9794f17
Compare
| // If TOFUs is not disabled or we already have previous trusted root data for this GUN (even with TOFUs disabled), | ||
| // use TOFUs. It's ok if we have previous root data with TOFUs disabled because we've already | ||
| // bootstrapped the first use of trust | ||
| if !trustPinConfig.DisableTOFU || !firstBootstrap { |
There was a problem hiding this comment.
Let's apply De Morgan's and invert the check so we have:
if DisableTOFU && firstBootstrap {
return error
}
return tofusCheck
|
After one comment, looks great! First person to check in after CI passes should merge 👍 |
Signed-off-by: Riyaz Faizullabhoy <[email protected]>
Signed-off-by: Riyaz Faizullabhoy <[email protected]>
Signed-off-by: Riyaz Faizullabhoy <[email protected]>
Signed-off-by: Riyaz Faizullabhoy <[email protected]>
Signed-off-by: Riyaz Faizullabhoy <[email protected]>
riyazdf
force-pushed
the
trust-pinning-rotation
branch
from
a29e483
to
30752d9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check new roots against the trust pinning when performing validation, but do not reject the new root if TOFUs is disabled because we've already trusted a previous root.
Closes #735.
Signed-off-by: Riyaz Faizullabhoy [email protected]