Emit discovered certs

certs/certificate_manager.go

@@ -1,99 +0,0 @@
-package certs
-
-import (
-	"go.uber.org/zap"
-	"io/ioutil"
-	"path"
-	"strings"
-	"time"
-)
-
-// CertificateManager handles scanning for new/updated certificates and deploying them to a destination.
-type CertificateManager struct {
-	logger      *zap.SugaredLogger
-	directories []string
-	certs       map[string]*foundCertificate
-}
-
-type foundCertificate struct {
-	cert       string
-	chain      string
-	fullChain  string
-	privateKey string
-	modTime    time.Time
-}
-
-// NewCertificateManager creates a new CertificateManager.
-func NewCertificateManager(logger *zap.SugaredLogger) *CertificateManager {
-	return &CertificateManager{
-		logger: logger,
-	}
-}
-
-// AddDirectory adds a new directory to monitor
-func (c *CertificateManager) AddDirectory(directory string) {
-	c.directories = append(c.directories, directory)
-	go c.scanForFolders(directory)
-}
-
-func (c *CertificateManager) scanForFolders(dir string) {
-	dirs, err := ioutil.ReadDir(dir)
-	if err != nil {
-		c.logger.Errorf("Unable to read directory %s - %s", dir, err.Error())
-		return
-	}
-
-	for _, d := range dirs {
-		if d.IsDir() {
-			c.scanForCerts(d.Name(), path.Join(dir, d.Name()))
-		}
-	}
-}
-
-func (c *CertificateManager) scanForCerts(vhost string, dir string) {
-	files, err := ioutil.ReadDir(dir)
-	if err != nil {
-		c.logger.Errorf("Unable to read directory %s - %s", dir, err.Error())
-		return
-	}
-
-	cert := foundCertificate{}
-	for _, f := range files {
-		ext := path.Ext(f.Name())
-		base := path.Base(f.Name())
-		if ext == "" && strings.Contains(base, "-") {
-			switch parts := strings.Split(base, "-"); parts[0] {
-			case "cert":
-				cert.cert = path.Join(dir, f.Name())
-			case "chain":
-				cert.chain = path.Join(dir, f.Name())
-			case "fullchain":
-				cert.fullChain = path.Join(dir, f.Name())
-			case "privkey":
-				cert.privateKey = path.Join(dir, f.Name())
-			default:
-				continue
-			}
-
-			if f.ModTime().After(cert.modTime) {
-				cert.modTime = f.ModTime()
-			}
-		}
-	}
-
-	c.maybeAddCert(vhost, cert)
-}
-
-func (c *CertificateManager) maybeAddCert(vhost string, cert foundCertificate) {
-	if len(cert.cert) > 0 && len(cert.chain) > 0 && len(cert.fullChain) > 0 && len(cert.privateKey) > 0 {
-		if existing, ok := c.certs[vhost]; ok {
-			if cert.modTime.After(existing.modTime) {
-				c.logger.Debugf("Found newer certificate files for %s in %s", vhost, path.Dir(cert.cert))
-				c.certs[vhost] = &cert
-			}
-		} else {
-			c.logger.Debugf("Found new certificate files for %s in %s", vhost, path.Dir(cert.cert))
-			c.certs[vhost] = &cert
-		}
-	}
-}

certs/monitor.go

@@ -0,0 +1,100 @@
+package certs
+
+import (
+	"github.com/csmith/dotege/model"
+	"go.uber.org/zap"
+	"io/ioutil"
+	"path"
+	"strings"
+)
+
+// CertificateMonitor handles scanning for new/updated certificates
+type CertificateMonitor struct {
+	logger      *zap.SugaredLogger
+	channel     chan<- model.FoundCertificate
+	directories []string
+	certs       map[string]*model.FoundCertificate
+}
+
+// NewCertificateManager creates a new CertificateMonitor.
+func NewCertificateManager(logger *zap.SugaredLogger, channel chan<- model.FoundCertificate) *CertificateMonitor {
+	return &CertificateMonitor{
+		logger:  logger,
+		channel: channel,
+	}
+}
+
+// AddDirectory adds a new directory to monitor
+func (c *CertificateMonitor) AddDirectory(directory string) {
+	c.directories = append(c.directories, directory)
+	go c.scanForFolders(directory)
+}
+
+func (c *CertificateMonitor) scanForFolders(dir string) {
+	dirs, err := ioutil.ReadDir(dir)
+	if err != nil {
+		c.logger.Errorf("Unable to read directory %s - %s", dir, err.Error())
+		return
+	}
+
+	for _, d := range dirs {
+		if d.IsDir() {
+			c.scanForCerts(d.Name(), path.Join(dir, d.Name()))
+		}
+	}
+}
+
+func (c *CertificateMonitor) scanForCerts(vhost string, dir string) {
+	files, err := ioutil.ReadDir(dir)
+	if err != nil {
+		c.logger.Errorf("Unable to read directory %s - %s", dir, err.Error())
+		return
+	}
+
+	cert := model.FoundCertificate{}
+	for _, f := range files {
+		ext := path.Ext(f.Name())
+		base := path.Base(f.Name())
+		if ext == "pem" {
+			prefix := strings.Split(base, "-")[0]
+			added := maybeAddPart(&cert, prefix, path.Join(dir, f.Name()))
+			if added && f.ModTime().After(cert.ModTime) {
+				cert.ModTime = f.ModTime()
+			}
+		}
+	}
+
+	c.maybeAddCert(vhost, cert)
+}
+
+func maybeAddPart(cert *model.FoundCertificate, part string, path string) bool {
+	switch part {
+	case "cert":
+		cert.Cert = path
+	case "chain":
+		cert.Chain = path
+	case "fullchain":
+		cert.FullChain = path
+	case "privkey":
+		cert.PrivateKey = path
+	default:
+		return false
+	}
+	return true
+}
+
+func (c *CertificateMonitor) maybeAddCert(vhost string, cert model.FoundCertificate) {
+	if len(cert.Cert) > 0 && len(cert.Chain) > 0 && len(cert.FullChain) > 0 && len(cert.PrivateKey) > 0 {
+		if existing, ok := c.certs[vhost]; ok {
+			if cert.ModTime.After(existing.ModTime) {
+				c.logger.Debugf("Found newer certificate files for %s in %s", vhost, path.Dir(cert.Cert))
+				c.certs[vhost] = &cert
+				c.channel <- cert
+			}
+		} else {
+			c.logger.Debugf("Found new certificate files for %s in %s", vhost, path.Dir(cert.Cert))
+			c.certs[vhost] = &cert
+			c.channel <- cert
+		}
+	}
+}

dotege.go

@@ -41,9 +41,11 @@ func main() {
 	sugar := logger.Sugar()
 	sugar.Info("Dotege is starting")
 
-	done := monitorSignals()
+	doneChan := monitorSignals()
 	containerChan := make(chan model.Container, 1)
 	expiryChan := make(chan string, 1)
+	certChan := make(chan model.FoundCertificate, 1)
+
 	config := model.Config{
 		Labels: model.LabelConfig{
 			Hostnames: "com.chameth.vhost",
@@ -57,7 +59,7 @@ func main() {
 		panic(err)
 	}
 
-	certMonitor := certs.NewCertificateManager(sugar)
+	certMonitor := certs.NewCertificateManager(sugar, certChan)
 	certMonitor.AddDirectory("/data/certrequests/certs")
 
 	templateGenerator := NewTemplateGenerator(sugar)
@@ -95,7 +97,7 @@ func main() {
 		}
 	}()
 
-	<-done
+	<-doneChan
 
 	err = cli.Close()
 	if err != nil {

model/model.go

@@ -1,5 +1,7 @@
 package model
 
+import "time"
+
 // CertActions define what will be done with a certificate
 type CertActions uint8
 
@@ -47,3 +49,12 @@ type TemplateConfig struct {
 	Source      string
 	Destination string
 }
+
+// FoundCertificate describes a certificate we've located on disk.
+type FoundCertificate struct {
+	Cert       string
+	Chain      string
+	FullChain  string
+	PrivateKey string
+	ModTime    time.Time
+}