Skip to content

customizable in hashicorp vault field #6

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

Open
metanovii wants to merge 1 commit into
base: master
Choose a base branch
from
Open

customizable in hashicorp vault field #6

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/certificator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func main() {
if needsReissuing {
logger.Infof("obtaining certificate for %s", mainDomain)
err := certificate.ObtainCertificate(acmeClient, vaultClient, allDomains,
cfg.DNSAddress, cfg.Acme.DNSChallengeProvider, cfg.Acme.DNSPropagationRequirement)
cfg.DNSAddress, cfg.Acme.DNSChallengeProvider, cfg.Acme.DNSPropagationRequirement, &cfg)
if err != nil {
failedDomains = append(failedDomains, mainDomain)
logger.Error(err)
Expand Down
16 changes: 9 additions & 7 deletions pkg/certificate/certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ import (
"github.com/go-acme/lego/v4/lego"
"github.com/go-acme/lego/v4/providers/dns"
"github.com/sirupsen/logrus"
"github.com/vinted/certificator/pkg/config"
"github.com/vinted/certificator/pkg/vault"
)

// ObtainCertificate gets certificate and stores it in Vault KV store
func ObtainCertificate(client *lego.Client, vault *vault.VaultClient, domains []string,
dnsAddr, challengeProvider string, propagationReq bool) error {
dnsAddr, challengeProvider string, propagationReq bool, cfg *config.Config) error {
provider, err := dns.NewDNSChallengeProviderByName(challengeProvider)
if err != nil {
return err
Expand All @@ -43,7 +44,7 @@ func ObtainCertificate(client *lego.Client, vault *vault.VaultClient, domains []
return err
}

return storeCertificateInVault(domains[0], certificate, vault)
return storeCertificateInVault(domains[0], certificate, vault, cfg)
}

// GetCertificate reads certificate from Vault KV store and parses it
Expand Down Expand Up @@ -120,10 +121,11 @@ func vaultCertLocation(domain string) string {
return "certificates/" + domain
}

func storeCertificateInVault(domain string, certs *certificate.Resource, vault *vault.VaultClient) error {
payload := map[string]string{"certificate": string(certs.Certificate),
"private_key": string(certs.PrivateKey),
"issuer_certificate": string(certs.IssuerCertificate)}

func storeCertificateInVault(domain string, certs *certificate.Resource, vault *vault.VaultClient, cfg *config.Config) error {
payload := map[string]string{
cfg.CertificateFieldName: string(certs.Certificate),
cfg.PrivateKeyFieldName: string(certs.PrivateKey),
cfg.IssuerCertificateFieldName: string(certs.IssuerCertificate),
}
return vault.KVWrite(vaultCertLocation(domain), payload)
}
19 changes: 11 additions & 8 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,17 @@ type Log struct {

// Config contains all configuration parameters
type Config struct {
Acme Acme
Vault Vault
Log Log
DNSAddress string `envconfig:"DNS_ADDRESS" default:"127.0.0.1:53"`
Environment string `envconfig:"ENVIRONMENT" default:"prod"`
DomainsFile string `envconfig:"CERTIFICATOR_DOMAINS_FILE" default:"/code/domains.yml"`
RenewBeforeDays int `envconfig:"CERTIFICATOR_RENEW_BEFORE_DAYS" default:"30"`
Domains []string `yaml:"domains"`
Acme Acme
Vault Vault
Log Log
DNSAddress string `envconfig:"DNS_ADDRESS" default:"127.0.0.1:53"`
Environment string `envconfig:"ENVIRONMENT" default:"prod"`
DomainsFile string `envconfig:"CERTIFICATOR_DOMAINS_FILE" default:"/code/domains.yml"`
RenewBeforeDays int `envconfig:"CERTIFICATOR_RENEW_BEFORE_DAYS" default:"30"`
CertificateFieldName string `envconfig:"CERTIFICATE_FIELD_NAME" default:"certificate"`
PrivateKeyFieldName string `envconfig:"PRIVATE_KEY_FIELD_NAME" default:"private_key"`
IssuerCertificateFieldName string `envconfig:"ISSUER_CERTIFICATE_FIELD_NAME" default:"issuer_certificate"`
Domains []string `yaml:"domains"`
}

// LoadConfig loads configuration options to variable
Expand Down