Cleaned implementation of leaf cert loader modules

caddyserver · Feb 28, 2024 · 37eb0cb · 37eb0cb
1 parent 3e60ec5
commit 37eb0cb
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 95 deletions.
diff --git a/modules/caddytls/leafderloader.go b/modules/caddytls/leafderloader.go
@@ -29,23 +29,17 @@ func init() {
 // decoding their DER blocks directly. This has the advantage
 // of not needing to store them on disk at all.
 type LeafDERLoader struct {
-	Ders []LeafCertDER `json:"ders,omitempty"`
+	Certificates []string `json:"certs,omitempty"`
 }
 
 // Provision implements caddy.Provisioner.
-func (pl LeafDERLoader) Provision(ctx caddy.Context) error {
+func (pl *LeafDERLoader) Provision(ctx caddy.Context) error {
 	repl, ok := ctx.Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
 	if !ok {
 		repl = caddy.NewReplacer()
 	}
-	for k, pair := range pl.Ders {
-		for i, tag := range pair.Tags {
-			pair.Tags[i] = repl.ReplaceKnown(tag, "")
-		}
-		pl.Ders[k] = LeafCertDER{
-			CertificateDER: repl.ReplaceKnown(pair.CertificateDER, ""),
-			Tags:           pair.Tags,
-		}
+	for i, cert := range pl.Certificates {
+		pl.Certificates[i] = repl.ReplaceKnown(cert, "")
 	}
 	return nil
 }
@@ -58,22 +52,11 @@ func (LeafDERLoader) CaddyModule() caddy.ModuleInfo {
 	}
 }
 
-// LeafCertDER contains DER-encoded Leaf certificate.
-type LeafCertDER struct {
-	// The leaf certificate in DER format.
-	CertificateDER string `json:"certificate"`
-
-	// Arbitrary values to associate with this certificate.
-	// Can be useful when you want to select a particular
-	// certificate when there may be multiple valid candidates.
-	Tags []string `json:"tags,omitempty"`
-}
-
 // LoadLeafCertificates returns the certificates contained in pl.
 func (pl LeafDERLoader) LoadLeafCertificates() ([]*x509.Certificate, error) {
-	certs := make([]*x509.Certificate, 0, len(pl.Ders))
-	for i, pair := range pl.Ders {
-		cert, err := x509.ParseCertificate([]byte(pair.CertificateDER))
+	certs := make([]*x509.Certificate, 0, len(pl.Certificates))
+	for i, cert := range pl.Certificates {
+		cert, err := x509.ParseCertificate([]byte(cert))
 		if err != nil {
 			return nil, fmt.Errorf("DER cert %d: %v", i, err)
 		}

diff --git a/modules/caddytls/leaffileloader.go b/modules/caddytls/leaffileloader.go
@@ -29,24 +29,17 @@ func init() {
 
 // LeafFileLoader loads leaf certificates from disk.
 type LeafFileLoader struct {
-	Files []LeafCertFile `json:"files,omitempty"`
+	Files []string `json:"files,omitempty"`
 }
 
 // Provision implements caddy.Provisioner.
-func (fl LeafFileLoader) Provision(ctx caddy.Context) error {
+func (fl *LeafFileLoader) Provision(ctx caddy.Context) error {
 	repl, ok := ctx.Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
 	if !ok {
 		repl = caddy.NewReplacer()
 	}
-	for k, pair := range fl.Files {
-		for i, tag := range pair.Tags {
-			pair.Tags[i] = repl.ReplaceKnown(tag, "")
-		}
-		fl.Files[k] = LeafCertFile{
-			LeafCertificate: repl.ReplaceKnown(pair.LeafCertificate, ""),
-			Format:          repl.ReplaceKnown(pair.Format, ""),
-			Tags:            pair.Tags,
-		}
+	for k, path := range fl.Files {
+		fl.Files[k] = repl.ReplaceKnown(path, "")
 	}
 	return nil
 }
@@ -59,41 +52,19 @@ func (LeafFileLoader) CaddyModule() caddy.ModuleInfo {
 	}
 }
 
-// LeafCertFile associates leaf certificate file name along with its
-// encoding format so that they can be loaded from disk.
-type LeafCertFile struct {
-	// Path to the certificate file.
-	LeafCertificate string `json:"certificate"`
-
-	// The format of the cert. Can be "pem". Default: "pem"
-	Format string `json:"format,omitempty"`
-
-	// Arbitrary values to associate with this certificate.
-	// Can be useful when you want to select a particular
-	// certificate when there may be multiple valid candidates.
-	Tags []string `json:"tags,omitempty"`
-}
-
 // LoadLEafCertificates returns the certificates to be loaded by fl.
 func (fl LeafFileLoader) LoadLeafCertificates() ([]*x509.Certificate, error) {
 	certificates := make([]*x509.Certificate, 0, len(fl.Files))
-	for _, pair := range fl.Files {
-		switch pair.Format {
-		case "":
-			fallthrough
-		case "pem":
-			ders, err := convertPEMFilesToDERBytes(pair.LeafCertificate)
-			if err != nil {
-				return nil, err
-			}
-			certs, err := x509.ParseCertificates(ders)
-			if err != nil {
-				return nil, err
-			}
-			certificates = append(certificates, certs...)
-		default:
-			return nil, fmt.Errorf("unrecognized certificate/key encoding format: %s", pair.Format)
+	for _, path := range fl.Files {
+		ders, err := convertPEMFilesToDERBytes(path)
+		if err != nil {
+			return nil, err
+		}
+		certs, err := x509.ParseCertificates(ders)
+		if err != nil {
+			return nil, err
 		}
+		certificates = append(certificates, certs...)
 	}
 	return certificates, nil
 }

diff --git a/modules/caddytls/leaffolderloader.go b/modules/caddytls/leaffolderloader.go
@@ -44,7 +44,7 @@ func (LeafFolderLoader) CaddyModule() caddy.ModuleInfo {
 }
 
 // Provision implements caddy.Provisioner.
-func (fl LeafFolderLoader) Provision(ctx caddy.Context) error {
+func (fl *LeafFolderLoader) Provision(ctx caddy.Context) error {
 	repl, ok := ctx.Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
 	if !ok {
 		repl = caddy.NewReplacer()
@@ -71,7 +71,7 @@ func (fl LeafFolderLoader) LoadLeafCertificates() ([]*x509.Certificate, error) {
 				return nil
 			}
 
-			certData, err := os.ReadFile(fpath)
+			certData, err := convertPEMFilesToDERBytes(fpath)
 			if err != nil {
 				return err
 			}

diff --git a/modules/caddytls/leafstorageloader.go b/modules/caddytls/leafstorageloader.go
@@ -34,7 +34,7 @@ func init() {
 type LeafStorageLoader struct {
 	// A list of pairs of certificate file names along with their
 	// encoding format so that they can be loaded from storage.
-	Certs []LeafCertFile `json:"certs,omitempty"`
+	Certs []string `json:"certs,omitempty"`
 
 	// The storage module where the trusted leaf certificates are stored. Absent
 	// explicit storage implies the use of Caddy default storage.
@@ -76,47 +76,30 @@ func (sl *LeafStorageLoader) Provision(ctx caddy.Context) error {
 	if !ok {
 		repl = caddy.NewReplacer()
 	}
-	for k, pair := range sl.Certs {
-		for i, tag := range pair.Tags {
-			pair.Tags[i] = repl.ReplaceKnown(tag, "")
-		}
-		sl.Certs[k] = LeafCertFile{
-			LeafCertificate: repl.ReplaceKnown(pair.LeafCertificate, ""),
-			Format:          repl.ReplaceKnown(pair.Format, ""),
-			Tags:            pair.Tags,
-		}
+	for k, path := range sl.Certs {
+		sl.Certs[k] = repl.ReplaceKnown(path, "")
 	}
 	return nil
 }
 
 // LoadLeafCertificates returns the certificates to be loaded by sl.
 func (sl LeafStorageLoader) LoadLeafCertificates() ([]*x509.Certificate, error) {
 	certificates := make([]*x509.Certificate, 0, len(sl.Certs))
-	for _, pair := range sl.Certs {
-		certData, err := sl.storage.Load(sl.ctx, pair.LeafCertificate)
+	for _, path := range sl.Certs {
+		certData, err := sl.storage.Load(sl.ctx, path)
 		if err != nil {
 			return nil, err
 		}
 
-		switch pair.Format {
-		case "":
-			fallthrough
-		case "pem":
-			ders, err := convertPEMToDER(certData)
-			if err != nil {
-				return nil, err
-			}
-			certs, err := x509.ParseCertificates(ders)
-			if err != nil {
-				return nil, err
-			}
-			certificates = append(certificates, certs...)
-		default:
-			return nil, fmt.Errorf("unrecognized certificate/key encoding format: %s", pair.Format)
+		ders, err := convertPEMToDER(certData)
+		if err != nil {
+			return nil, err
 		}
+		certs, err := x509.ParseCertificates(ders)
 		if err != nil {
 			return nil, err
 		}
+		certificates = append(certificates, certs...)
 	}
 	return certificates, nil
 }