-
Notifications
You must be signed in to change notification settings - Fork 0
fix: default readonly trust to mozilla and fix export csr subjects #195
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a0db6a5
fix: default readonly trust to mozilla and fix export csr subjects
danielewood c3b60f3
fix: address exporter review feedback
danielewood 1653a80
fix: export exact matched cert for reused ski
danielewood 0d2bd09
fix: fail fast on invalid readonly trust stores
danielewood 57e4342
fix: address remaining PR review comments
danielewood a582e21
fix: address remaining PR review feedback
danielewood File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -347,6 +347,7 @@ type CheckTrustAnchorsInput struct { | |||
| Cert *x509.Certificate | ||||
| Intermediates *x509.CertPool | ||||
| FileRoots *x509.CertPool | ||||
| TrustStore string | ||||
| } | ||||
|
|
||||
| // CheckTrustAnchorsResult reports which trust sources validated a certificate | ||||
|
|
@@ -410,35 +411,55 @@ func verifyChainTrustChains(input VerifyChainTrustInput) ([][]*x509.Certificate, | |||
| } | ||||
|
|
||||
| // CheckTrustAnchors reports which trust sources validate the certificate. | ||||
| // Results are returned in stable order: mozilla, system, file. | ||||
| // Results are returned in stable order: selected trust store, then file. | ||||
| func CheckTrustAnchors(input CheckTrustAnchorsInput) CheckTrustAnchorsResult { | ||||
| if input.Cert == nil { | ||||
| return CheckTrustAnchorsResult{Anchors: []string{}, Warnings: []string{}} | ||||
| } | ||||
|
|
||||
| result := CheckTrustAnchorsResult{ | ||||
| Anchors: make([]string, 0, 3), | ||||
| Anchors: make([]string, 0, 2), | ||||
| Warnings: make([]string, 0, 2), | ||||
| } | ||||
| if mozillaPool, err := MozillaRootPool(); err != nil { | ||||
| result.Warnings = append(result.Warnings, fmt.Sprintf("mozilla trust source unavailable: %v", err)) | ||||
| } else if VerifyChainTrust(VerifyChainTrustInput{ | ||||
| Cert: input.Cert, | ||||
| Roots: mozillaPool, | ||||
| Intermediates: input.Intermediates, | ||||
| TrustStore: "mozilla", | ||||
| }) { | ||||
| result.Anchors = append(result.Anchors, "mozilla") | ||||
| checkRoots := func(name string, roots *x509.CertPool) { | ||||
| if VerifyChainTrust(VerifyChainTrustInput{ | ||||
| Cert: input.Cert, | ||||
| Roots: roots, | ||||
| Intermediates: input.Intermediates, | ||||
| TrustStore: name, | ||||
| }) { | ||||
| result.Anchors = append(result.Anchors, name) | ||||
| } | ||||
| } | ||||
| if systemPool, err := SystemCertPoolCached(); err != nil { | ||||
| result.Warnings = append(result.Warnings, fmt.Sprintf("system trust source unavailable: %v", err)) | ||||
| } else if VerifyChainTrust(VerifyChainTrustInput{ | ||||
| Cert: input.Cert, | ||||
| Roots: systemPool, | ||||
| Intermediates: input.Intermediates, | ||||
| TrustStore: "system", | ||||
| }) { | ||||
| result.Anchors = append(result.Anchors, "system") | ||||
|
|
||||
| trustStore := input.TrustStore | ||||
| if trustStore == "" { | ||||
| trustStore = "mozilla" | ||||
| } | ||||
| switch trustStore { | ||||
| case "mozilla": | ||||
| mozillaPool, err := MozillaRootPool() | ||||
| if err != nil { | ||||
| result.Warnings = append(result.Warnings, fmt.Sprintf("mozilla trust source unavailable: %v", err)) | ||||
| break | ||||
| } | ||||
| checkRoots("mozilla", mozillaPool) | ||||
| case "system": | ||||
| systemPool, err := SystemCertPoolCached() | ||||
| if err != nil { | ||||
| result.Warnings = append(result.Warnings, fmt.Sprintf("system trust source unavailable: %v", err)) | ||||
| break | ||||
| } | ||||
| checkRoots("system", systemPool) | ||||
| case "custom": | ||||
| result.Warnings = append(result.Warnings, "custom trust store cannot be evaluated without an explicit roots pool") | ||||
| case "file": | ||||
| if input.FileRoots == nil { | ||||
| result.Warnings = append(result.Warnings, "file trust store cannot be evaluated without file roots") | ||||
| } | ||||
| default: | ||||
| result.Warnings = append(result.Warnings, fmt.Sprintf("unsupported trust store %q", trustStore)) | ||||
| return result | ||||
|
||||
| return result |
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When
CheckTrustAnchorsis called withTrustStore: "custom"and a non-nilFileRootspool (for example viaVerifyCertwith custom roots), this branch always adds the warning that no explicit roots pool was provided. The same call can still append"file"totrust_anchors, so output becomes self-contradictory (trust_anchorsshows success whiletrust_warningsclaims roots are missing), which can trigger false failures in warning-sensitive tooling.Useful? React with 👍 / 👎.