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.

Sign up for GitHub

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

Jump to bottom

Remove viper from pkg/. #257

Merged
merged 1 commit into from
Dec 2, 2021
Merged

Remove viper from pkg/. #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 42 additions & 3 deletions cmd/app/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,23 @@ package app

import (
"flag"
"fmt"
"net/http"

"github.com/go-openapi/loads"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/sigstore/fulcio/pkg/api"
certauth "github.com/sigstore/fulcio/pkg/ca"
"github.com/sigstore/fulcio/pkg/ca/ephemeralca"
googlecav1 "github.com/sigstore/fulcio/pkg/ca/googleca/v1"
googlecav1beta1 "github.com/sigstore/fulcio/pkg/ca/googleca/v1beta1"
"github.com/sigstore/fulcio/pkg/ca/x509ca"
"github.com/sigstore/fulcio/pkg/config"
"github.com/sigstore/fulcio/pkg/generated/restapi"
"github.com/sigstore/fulcio/pkg/generated/restapi/operations"
"github.com/sigstore/fulcio/pkg/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)

// serveCmd represents the serve command
Expand Down Expand Up @@ -73,6 +79,37 @@ var serveCmd = &cobra.Command{
log.Logger.Fatalf("error loading config: %v", err)
}

var baseca certauth.CertificateAuthority
switch viper.GetString("ca") {
case "googleca":
version := viper.GetString("gcp_private_ca_version")
switch version {
case "v1":
baseca, err = googlecav1.NewCertAuthorityService(viper.GetString("gcp_private_ca_parent"))
case "v1beta1":
baseca, err = googlecav1beta1.NewCertAuthorityService(viper.GetString("gcp_private_ca_parent"))
default:
err = fmt.Errorf("invalid value for gcp_private_ca_version: %v", version)
}
case "pkcs11ca":
params := x509ca.Params{
ConfigPath: viper.GetString("pkcs11-config-path"),
RootID: viper.GetString("hsm-caroot-id"),
}
if viper.IsSet("aws-hsm-root-ca-path") {
path := viper.GetString("aws-hsm-root-ca-path")
params.CAPath = &path
}
baseca, err = x509ca.NewX509CA(params)
case "ephemeralca":
baseca, err = ephemeralca.NewEphemeralCA()
default:
err = fmt.Errorf("invalid value for configured CA: %v", baseca)
}
if err != nil {
log.Logger.Fatal(err)
}

server.EnabledListeners = []string{"http"}

server.ConfigureAPI()
Expand All @@ -86,6 +123,8 @@ var serveCmd = &cobra.Command{
// from disk, so that we don't need to cycle pods to pick up config updates.
// Alternately we could take advantage of Knative's configmap watcher.
ctx = config.With(ctx, cfg)
ctx = api.WithCA(ctx, baseca)
ctx = api.WithCTLogURL(ctx, viper.GetString("ct-log-url"))

h.ServeHTTP(rw, r.WithContext(ctx))
}))
Expand Down
86 changes: 36 additions & 50 deletions pkg/api/ca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,66 +24,18 @@ import (
"fmt"
"net/http"
"strings"
"sync"

"github.com/coreos/go-oidc/v3/oidc"
"github.com/go-openapi/runtime/middleware"
certauth "github.com/sigstore/fulcio/pkg/ca"
"github.com/sigstore/fulcio/pkg/ca/ephemeralca"
googlecav1 "github.com/sigstore/fulcio/pkg/ca/googleca/v1"
googlecav1beta1 "github.com/sigstore/fulcio/pkg/ca/googleca/v1beta1"
"github.com/sigstore/fulcio/pkg/ca/x509ca"
"github.com/sigstore/fulcio/pkg/challenges"
"github.com/sigstore/fulcio/pkg/config"
"github.com/sigstore/fulcio/pkg/ctl"
"github.com/sigstore/fulcio/pkg/generated/restapi/operations"
"github.com/sigstore/fulcio/pkg/log"
"github.com/sigstore/sigstore/pkg/cryptoutils"
"github.com/spf13/viper"
)

var (
once sync.Once
ca certauth.CertificateAuthority
)

func CA() certauth.CertificateAuthority {
// Use a once block to avoid reading config every time.
once.Do(func() {
var err error
switch viper.GetString("ca") {
case "googleca":
version := viper.GetString("gcp_private_ca_version")
switch version {
case "v1":
ca, err = googlecav1.NewCertAuthorityService(viper.GetString("gcp_private_ca_parent"))
case "v1beta1":
ca, err = googlecav1beta1.NewCertAuthorityService(viper.GetString("gcp_private_ca_parent"))
default:
err = fmt.Errorf("invalid value for gcp_private_ca_version: %v", version)
}
case "pkcs11ca":
params := x509ca.Params{
ConfigPath: viper.GetString("pkcs11-config-path"),
RootID: viper.GetString("hsm-caroot-id"),
}
if viper.IsSet("aws-hsm-root-ca-path") {
path := viper.GetString("aws-hsm-root-ca-path")
params.CAPath = &path
}
ca, err = x509ca.NewX509CA(params)
case "ephemeralca":
ca, err = ephemeralca.NewEphemeralCA()
default:
err = fmt.Errorf("invalid value for configured CA: %v", ca)
}
if err != nil {
log.Logger.Fatal(err)
}
})
return ca
}

func SigningCertHandler(params operations.SigningCertParams, principal *oidc.IDToken) middleware.Responder {
ctx := params.HTTPRequest.Context()
logger := log.ContextLogger(ctx)
Expand All @@ -110,7 +62,7 @@ func SigningCertHandler(params operations.SigningCertParams, principal *oidc.IDT
return handleFulcioAPIError(params, http.StatusBadRequest, err, invalidSignature)
}

ca := CA()
ca := GetCA(ctx)

var csc *certauth.CodeSigningCertificate
var sctBytes []byte
Expand All @@ -130,7 +82,7 @@ func SigningCertHandler(params operations.SigningCertParams, principal *oidc.IDT
// TODO: initialize CTL client once
// Submit to CTL
logger.Info("Submitting CTL inclusion for OIDC grant: ", subject.Value)
ctURL := viper.GetString("ct-log-url")
ctURL := GetCTLogURL(ctx)
if ctURL != "" {
c := ctl.New(ctURL)
sct, err := c.AddChain(csc)
Expand Down Expand Up @@ -185,3 +137,37 @@ func ExtractSubject(ctx context.Context, tok *oidc.IDToken, publicKey crypto.Pub
return nil, fmt.Errorf("unsupported issuer: %s", iss.Type)
}
}

type caKey struct{}

// WithCA associates the provided certificate authority with the provided context.
func WithCA(ctx context.Context, ca certauth.CertificateAuthority) context.Context {
return context.WithValue(ctx, caKey{}, ca)
}

// GetCA accesses the certificate authority associated with the provided context.
func GetCA(ctx context.Context) certauth.CertificateAuthority {
untyped := ctx.Value(caKey{})
if untyped == nil {
return nil
}
return untyped.(certauth.CertificateAuthority)
}

type ctKey struct{}

// WithCTLogURL associates the provided certificate transparency log URL with
// the provided context.
func WithCTLogURL(ctx context.Context, ct string) context.Context {
return context.WithValue(ctx, ctKey{}, ct)
}

// GetCTLogURL accesses the certificate transparency log URL associated with
// the provided context.
func GetCTLogURL(ctx context.Context) string {
untyped := ctx.Value(ctKey{})
if untyped == nil {
return ""
}
return untyped.(string)
}