Maintain context for key usage mismatch errors #337
+111
−22
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
djc
force-pushed
the
eku-not-found-context
branch
from
88559a5 to
ff5f073
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #337 +/- ##
==========================================
- Coverage 97.76% 97.55% -0.22%
==========================================
Files 20 20
Lines 4343 4369 +26
==========================================
+ Hits 4246 4262 +16
- Misses 97 107 +10 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
djc
commented
Mar 27, 2025
| /// | ||
| /// The contents of this type depend on whether the `alloc` feature is enabled. | ||
| #[derive(Clone, Debug, PartialEq, Eq)] | ||
| pub struct RequiredEkuNotFoundContext { |
There was a problem hiding this comment.
I've fiddled with this a fair bunch. The challenge here is that most of the internals of KeyUsage are private API.
KeyUsage(the public API surface) also represents theRequiredvsRequiredIfPresentdichotomy, which is relevant forrequiredbut not forpresentso much.- Internally we currently use
KeyPurposeIdwhich uses an internalInput(which means the only way to make it'staticis with a '&static [u8]which isn't feasible here). - We might want to represent
EKU_CLIENT_AUTHandEKU_SERVER_AUTHin a way that are actually usable with the public API, which isKeyUsage::client_auth()andKeyUsage::server_auth(), and represent other OIDs in a somewhat readable representation.
cpu
approved these changes
Mar 28, 2025
Comment on lines
+67
to
+79
| let err = check_cert(ee, ca).unwrap_err(); | ||
| assert_eq!( | ||
| err, | ||
| webpki::Error::RequiredEkuNotFoundContext(RequiredEkuNotFoundContext { | ||
| required: KeyUsage::client_auth(), | ||
| present: vec![vec![43, 6, 1, 5, 5, 7, 3, 1]], | ||
| }) | ||
| ); | ||
|
|
||
| assert_eq!( | ||
| format!("{err}"), | ||
| "RequiredEkuNotFoundContext(RequiredEkuNotFoundContext { required: KeyUsage { inner: RequiredIfPresent(KeyPurposeId { oid_value: Input }) }, present: [[43, 6, 1, 5, 5, 7, 3, 1]] })" | ||
| ) |
There was a problem hiding this comment.
These changes need to be made in the Python test generator code. Right now CI is flagging the diff that results from regenerating.
| @@ -141,8 +143,13 @@ pub enum Error { | |||
|
|
|||
| /// The certificate is not valid for the Extended Key Usage for which it is | |||
| /// being validated. | |||
| #[deprecated(since = "0.103.2", note = "use RequiredEkuNotFoundContext instead")] | |||
There was a problem hiding this comment.
Can you add a Cargo.toml commit to the branch that bumps the version to 0.103.2 ?
| @@ -485,18 +501,38 @@ impl ExtendedKeyUsage { | |||
| let input = match (input, self) { | |||
| (Some(input), _) => input, | |||
| (None, Self::RequiredIfPresent(_)) => return Ok(()), | |||
| (None, Self::Required(_)) => return Err(Error::RequiredEkuNotFound), | |||
| (None, Self::Required(_)) => { | |||
There was a problem hiding this comment.
codecov is flagging missing coverage for L505..512 - that seems worth having IMO.
|
I think we should probably figure out the rustls part of this before we merge/release it. |
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.
No description provided.