Refactor the way we access Config
#222
Merged
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
|
Blah, I hoisted the verifier creation above the place we augment the system's TLS certs 🤔 I'll sort this out in a bit. |
This change starts to refactor the way we interact with theh Fulcio `Config` to support a forthcoming change to support what I've taken to calling "meta URLs". I want to allow the public Fulcio instance to support the following *classes* of Issuer URL, which are exposed for EKS and GKE clusters: * https://oidc.eks.us-west-2.amazonaws.com/id/B02C93B6A2D30341AD01E1B6D48164CB * https://container.googleapis.com/v1/projects/mattmoor-credit/locations/us-west1-b/clusters/tenant-cluster To this end, I want to support adding to the Fulcio configuration "meta URLs" of the form (still a strawman): ``` https://oidc.eks.*.amazonaws.com/id/* https://container.googleapis.com/v1/projects/*/locations/*/clusters/* ``` However, in this change, I'm still just consolidating how we access the OIDC issuer information in `FulcioConfig` so that lookups are performed via a new `GetIssuer` method, and verifiers are instantiated via `GetVerifier()`. The only remaining place I see iterating over `cfg.OIDCIssuers` is for the `realm` in the `WWW-Authenticate` header of `401` responses (seems right to not include the meta URLs here). There are also still a handful of places handling OIDCIssuers directly, but most are in `config.go`, or associated validation logic (e.g. `federation/main.go`). Related: sigstore#212 Signed-off-by: Matt Moore <[email protected]>
mattmoor
force-pushed
the
meta-refactor
branch
from
91b7c50
to
bbd4c56
Compare
dlorenc
reviewed
Oct 28, 2021
pkg/config/config.go
Outdated
| return nil, err | ||
| } | ||
|
|
||
| if _, ok := cfg.OIDCIssuers["https://kubernetes.default.svc"]; ok { |
There was a problem hiding this comment.
maybe one nit: it's a bit surprising for a ParseConfig function to do things other than Parse the input config. Could we split this out into a separate function after the Parsing?
There was a problem hiding this comment.
I was putting it here because it was public, but it isn't called elsewhere, so I made it private and moved the logic back into it's one callsite.
Signed-off-by: Matt Moore <[email protected]>
dlorenc
approved these changes
Oct 28, 2021
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.
This change starts to refactor the way we interact with theh Fulcio
Configto support a forthcoming change to support what I've taken to calling "meta URLs".
I want to allow the public Fulcio instance to support the following classes
of Issuer URL, which are exposed for EKS and GKE clusters:
To this end, I want to support adding to the Fulcio configuration "meta URLs"
of the form (still a strawman):
However, in this change, I'm still just consolidating how we access the OIDC
issuer information in
FulcioConfigso that lookups are performed via a newGetIssuermethod, and verifiers are instantiated viaGetVerifier().The only remaining place I see iterating over
cfg.OIDCIssuersis for therealmin theWWW-Authenticateheader of401responses (seems right tonot include the meta URLs here). There are also still a handful of places
handling OIDCIssuers directly, but most are in
config.go, or associatedvalidation logic (e.g.
federation/main.go).Signed-off-by: Matt Moore [email protected]
Ticket Link
Related: #212
Release Note