mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

notifications for get-certs command (#451)

Browse Source
This commit is contained in:
Craig Peterson
2019-02-21 19:58:50 -05:00
committed by GitHub
parent 9a6af836dc
commit 5c03761fa6
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
commands/getCerts.go
View File

@ -40,6 +40,8 @@ type GetCertsArgs struct {
Vault bool
VaultPath string
Notify bool
IgnoredProviders string
}
@ -104,6 +106,11 @@ func (args *GetCertsArgs) flags() []cli.Flag {
Destination: &args.Verbose,
Usage: "Enable detailed logging (deprecated: use the global -v flag)",
})
flags = append(flags, cli.BoolFlag{
Name: "notify",
Destination: &args.Notify,
Usage: `set to true to send notifications to configured destinations`,
})
return flags
}
@ -126,7 +133,7 @@ func GetCerts(args GetCertsArgs) error {
if PrintValidationErrors(errs) {
return fmt.Errorf("Exiting due to validation errors")
}
_, err = InitializeProviders(args.CredsFile, cfg, false)
notifier, err := InitializeProviders(args.CredsFile, cfg, args.Notify)
if err != nil {
return err
}
@ -164,20 +171,24 @@ func GetCerts(args GetCertsArgs) error {
var client acme.Client
if args.Vault {
client, err = acme.NewVault(cfg, args.VaultPath, args.Email, acmeServer)
client, err = acme.NewVault(cfg, args.VaultPath, args.Email, acmeServer, notifier)
} else {
client, err = acme.New(cfg, args.CertDirectory, args.Email, acmeServer)
client, err = acme.New(cfg, args.CertDirectory, args.Email, acmeServer, notifier)
}
if err != nil {
return err
}
for _, cert := range certList {
v := args.Verbose || printer.DefaultPrinter.Verbose
_, err := client.IssueOrRenewCert(cert, args.RenewUnderDays, v)
issued, err := client.IssueOrRenewCert(cert, args.RenewUnderDays, v)
if issued || err != nil {
notifier.Notify(cert.CertName, "certificate", "Issued new certificate", err, false)
}
if err != nil {
return err
}
}
notifier.Done()
return nil
}

33
pkg/acme/acme.go
View File

@ -14,6 +14,7 @@ import (
"github.com/StackExchange/dnscontrol/models"
"github.com/StackExchange/dnscontrol/pkg/nameservers"
"github.com/StackExchange/dnscontrol/pkg/notifications"
"github.com/xenolf/lego/acme"
acmelog "github.com/xenolf/lego/log"
)
@ -38,6 +39,8 @@ type certManager struct {
domains map[string]*models.DomainConfig
originalDomains []*models.DomainConfig
notifier notifications.Notifier
account *Account
waitedOnce bool
}
@ -47,11 +50,11 @@ const (
LetsEncryptStage = "https://acme-staging-v02.api.letsencrypt.org/directory"
)
func New(cfg *models.DNSConfig, directory string, email string, server string) (Client, error) {
return commonNew(cfg, directoryStorage(directory), email, server)
func New(cfg *models.DNSConfig, directory string, email string, server string, notify notifications.Notifier) (Client, error) {
return commonNew(cfg, directoryStorage(directory), email, server, notify)
}
func commonNew(cfg *models.DNSConfig, storage Storage, email string, server string) (Client, error) {
func commonNew(cfg *models.DNSConfig, storage Storage, email string, server string, notify notifications.Notifier) (Client, error) {
u, err := url.Parse(server)
if err != nil || u.Host == "" {
return nil, fmt.Errorf("ACME directory '%s' is not a valid URL", server)
@ -63,6 +66,7 @@ func commonNew(cfg *models.DNSConfig, storage Storage, email string, server stri
acmeHost: u.Host,
cfg: cfg,
domains: map[string]*models.DomainConfig{},
notifier: notify,
}
acct, err := c.getOrCreateAccount()
@ -73,12 +77,12 @@ func commonNew(cfg *models.DNSConfig, storage Storage, email string, server stri
return c, nil
}
func NewVault(cfg *models.DNSConfig, vaultPath string, email string, server string) (Client, error) {
func NewVault(cfg *models.DNSConfig, vaultPath string, email string, server string, notify notifications.Notifier) (Client, error) {
storage, err := makeVaultStorage(vaultPath)
if err != nil {
return nil, err
}
return commonNew(cfg, storage, email, server)
return commonNew(cfg, storage, email, server, notify)
}
// IssueOrRenewCert will obtain a certificate with the given name if it does not exist,
@ -219,11 +223,11 @@ func (c *certManager) Present(domain, token, keyAuth string) (e error) {
txt.SetTargetTXT(val)
txt.SetLabelFromFQDN(fqdn, d.Name)
d.Records = append(d.Records, txt)
return getAndRunCorrections(d)
return c.getAndRunCorrections(d)
}
func (c *certManager) ensureNoPendingCorrections(d *models.DomainConfig) error {
corrections, err := getCorrections(d)
corrections, err := c.getCorrections(d)
if err != nil {
return err
}
@ -240,7 +244,7 @@ func (c *certManager) ensureNoPendingCorrections(d *models.DomainConfig) error {
// IgnoredProviders is a lit of provider names that should not be used to fill challenges.
var IgnoredProviders = map[string]bool{}
func getCorrections(d *models.DomainConfig) ([]*models.Correction, error) {
func (c *certManager) getCorrections(d *models.DomainConfig) ([]*models.Correction, error) {
cs := []*models.Correction{}
for _, p := range d.DNSProviderInstances {
if IgnoredProviders[p.Name] {
@ -262,15 +266,16 @@ func getCorrections(d *models.DomainConfig) ([]*models.Correction, error) {
return cs, nil
}
func getAndRunCorrections(d *models.DomainConfig) error {
cs, err := getCorrections(d)
func (c *certManager) getAndRunCorrections(d *models.DomainConfig) error {
cs, err := c.getCorrections(d)
if err != nil {
return err
}
fmt.Printf("%d corrections\n", len(cs))
for _, c := range cs {
fmt.Printf("Running [%s]\n", c.Msg)
err = c.F()
for _, corr := range cs {
fmt.Printf("Running [%s]\n", corr.Msg)
err = corr.F()
c.notifier.Notify(d.Name, "certs", corr.Msg, err, false)
if err != nil {
return err
}
@ -287,7 +292,7 @@ func (c *certManager) finalCleanUp() error {
log.Println("Cleaning up all records we made")
var lastError error
for _, d := range c.originalDomains {
if err := getAndRunCorrections(d); err != nil {
if err := c.getAndRunCorrections(d); err != nil {
log.Printf("ERROR cleaning up: %s", err)
lastError = err
}