OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

caddypki: Prefer user-configured root instead of generating new one (#5189) 

instead of generating a new root certificate at the default location
load the certificate from the configuration.
fixes: #5181
This commit is contained in:
Jonathan Garcia 2022-11-08 20:13:46 +01:00 committed by GitHub
parent 6efd1b3bb1
commit 33fdea8f26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/caddypki/ca.go
View File

@ -240,6 +240,9 @@ func (ca *CA) NewAuthority(authorityConfig AuthorityConfig) (*authority.Authorit
}
func (ca CA) loadOrGenRoot() (rootCert *x509.Certificate, rootKey any, err error) {
if ca.Root != nil {
return ca.Root.Load()
}
rootCertPEM, err := ca.storage.Load(ca.ctx, ca.storageKeyRootCert())
if err != nil {
if !errors.Is(err, fs.ErrNotExist) {