Allow hsm to use relative paths

main
Jan Dittberner 2 years ago committed by Jan Dittberner
parent 0d69a9013d
commit c2b987fd31

@ -69,21 +69,18 @@ func NewAccess(infoLog *log.Logger, options ...ConfigOption) (*Access, error) {
return access, nil return access, nil
} }
func (c *caFile) buildCertificatePath(caDirectory string) (string, error) { func (c *caFile) buildCertificatePath(caDirectory string) string {
fileName := c.sc.CertificateFileName(c.label) fileName := c.sc.CertificateFileName(c.label)
if caDirectory == "" { if caDirectory == "" {
return "", errors.New("CA directory is not set") return fileName
} }
return path.Join(caDirectory, fileName), nil return path.Join(caDirectory, fileName)
} }
func (c *caFile) loadCertificate(caDirectory string) (*x509.Certificate, error) { func (c *caFile) loadCertificate(caDirectory string) (*x509.Certificate, error) {
certFile, err := c.buildCertificatePath(caDirectory) certFile := c.buildCertificatePath(caDirectory)
if err != nil {
return nil, err
}
certFileInfo, err := os.Stat(certFile) certFileInfo, err := os.Stat(certFile)
if err != nil { if err != nil {
@ -121,12 +118,9 @@ func (c *caFile) loadCertificate(caDirectory string) (*x509.Certificate, error)
} }
func (c *caFile) storeCertificate(caDirectory string, certificate []byte) error { func (c *caFile) storeCertificate(caDirectory string, certificate []byte) error {
certFile, err := c.buildCertificatePath(caDirectory) certFile := c.buildCertificatePath(caDirectory)
if err != nil {
return err
}
err = os.WriteFile(certFile, certificate, 0o600) err := os.WriteFile(certFile, certificate, 0o600)
if err != nil { if err != nil {
return fmt.Errorf("could not write certificate file %s: %w", certFile, err) return fmt.Errorf("could not write certificate file %s: %w", certFile, err)
} }

Loading…
Cancel
Save