structured logs

This commit is contained in:
m5r
2024-07-19 02:24:11 +02:00
parent c202885684
commit 61cf3ec24d
8 changed files with 142 additions and 106 deletions

View File

@ -8,13 +8,13 @@ import (
"crypto/x509"
"encoding/json"
"encoding/pem"
"log"
"os"
"path/filepath"
"strings"
"github.com/go-acme/lego/v4/lego"
"github.com/go-acme/lego/v4/registration"
"local-ip.sh/utils"
)
type Account struct {
@ -42,28 +42,28 @@ func LoadAccount() *Account {
RegisterAccount()
return LoadAccount()
}
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to load account from existing file")
}
account := &Account{}
err = json.Unmarshal(jsonBytes, account)
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to unmarshal account JSON file")
}
privKey, err := os.ReadFile(keyFilePath)
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to read account's private key file")
}
privateKey := decode(string(privKey))
account.key = privateKey
account.key = decode(string(privKey))
return account
}
func RegisterAccount() {
privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to generate account key")
}
account := &Account{
@ -74,35 +74,39 @@ func RegisterAccount() {
config.CADirURL = caDirUrl
legoClient, err := lego.NewClient(config)
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Str("CA Directory URL", config.CADirURL).Msg("Failed to initialize lego client")
}
reg, err := legoClient.Registration.Register(registration.RegisterOptions{TermsOfServiceAgreed: true})
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Str("CA Directory URL", config.CADirURL).Msg("Failed to register account to ACME server")
}
if reg.Body.Status != "valid" {
log.Fatalf("registration failed with status %s", reg.Body.Status)
utils.Logger.Fatal().Err(err).Str("CA Directory URL", config.CADirURL).Msgf("Registration failed with status %s", reg.Body.Status)
}
log.Println(reg.Body.TermsOfServiceAgreed)
utils.Logger.Debug().
Str("CA Directory URL", config.CADirURL).
Bool("TermsOfServiceAgreed", reg.Body.TermsOfServiceAgreed).
Msg("Successfully registered account to ACME server")
account.Registration = reg
os.MkdirAll(filepath.Dir(keyFilePath), os.ModePerm)
privKey := encode(privateKey)
err = os.WriteFile(keyFilePath, []byte(privKey), 0o644)
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Str("path", keyFilePath).Msg("Failed to write account's private key file")
}
jsonBytes, err := json.MarshalIndent(account, "", "\t")
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to marshal account JSON file")
}
os.MkdirAll(filepath.Dir(accountFilePath), os.ModePerm)
err = os.WriteFile(accountFilePath, jsonBytes, 0o600)
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Str("path", accountFilePath).Msg("Failed to write account's JSON file")
}
}

View File

@ -3,7 +3,6 @@ package certs
import (
"encoding/json"
"fmt"
"log"
"os"
"strings"
"time"
@ -12,6 +11,7 @@ import (
"github.com/go-acme/lego/v4/certificate"
"github.com/go-acme/lego/v4/challenge/dns01"
"github.com/go-acme/lego/v4/lego"
"local-ip.sh/utils"
"local-ip.sh/xip"
)
@ -36,20 +36,20 @@ func (c *certsClient) requestCertificate(certType string) {
lastCertificate = c.lastRootCertificate
domains = []string{"local-ip.sh"}
} else {
log.Fatalf("Unexpected certType %s. Only \"wildcard\" and \"root\" are supported", certType)
utils.Logger.Fatal().Msgf("Unexpected certType %s. Only \"wildcard\" and \"root\" are supported", certType)
}
log.Printf("requesting %s certificate\n", certType)
utils.Logger.Info().Str("certType", certType).Msg("Requesting certificate")
if lastCertificate != nil {
certificates, err := certcrypto.ParsePEMBundle(c.lastWildcardCertificate.Certificate)
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to parse PEM bundle from last certificate")
}
x509Cert := certificates[0]
timeLeft := x509Cert.NotAfter.Sub(time.Now().UTC())
if timeLeft > time.Hour*24*30 {
log.Printf("%d days left before expiration, will not renew", int(timeLeft.Hours()/24))
utils.Logger.Info().Msgf("%d days left before expiration, skip renewal", int(timeLeft.Hours()/24))
return
}
@ -57,36 +57,34 @@ func (c *certsClient) requestCertificate(certType string) {
return
}
certificates, err := c.legoClient.Certificate.Obtain(certificate.ObtainRequest{
Domains: domains,
Bundle: true,
})
cert, err := c.legoClient.Certificate.Obtain(certificate.ObtainRequest{Domains: domains, Bundle: true})
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to obtain certificate from lego client")
}
if certType == "wildcard" {
c.lastWildcardCertificate = certificates
c.lastWildcardCertificate = cert
} else if certType == "root" {
c.lastRootCertificate = certificates
c.lastRootCertificate = cert
}
persistFiles(certificates, certType)
persistFiles(cert, certType)
}
func (c *certsClient) renewCertificates() {
log.Println("renewing currently existing certificate")
utils.Logger.Info().Msg("Renewing certificates")
wildcardCertificate, err := c.legoClient.Certificate.Renew(*c.lastWildcardCertificate, true, false, "")
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to renew wildcard certificate")
}
c.lastWildcardCertificate = wildcardCertificate
persistFiles(wildcardCertificate, "wildcard")
rootCertificate, err := c.legoClient.Certificate.Renew(*c.lastRootCertificate, true, false, "")
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to renew root certificate")
}
c.lastRootCertificate = rootCertificate
persistFiles(rootCertificate, "root")
@ -94,14 +92,30 @@ func (c *certsClient) renewCertificates() {
}
func persistFiles(certificates *certificate.Resource, certType string) {
os.MkdirAll(fmt.Sprintf("/certs/%s", certType), 0o755)
os.WriteFile(fmt.Sprintf("/certs/%s/server.pem", certType), certificates.Certificate, 0o644)
err := os.MkdirAll(fmt.Sprintf("/certs/%s", certType), 0o755)
if err != nil {
utils.Logger.Fatal().Err(err).Msgf("Failed to mkdir /certs/%s", certType)
}
err = os.WriteFile(fmt.Sprintf("/certs/%s/server.pem", certType), certificates.Certificate, 0o644)
if err != nil {
utils.Logger.Fatal().Err(err).Msgf("Failed to save /certs/%s/server.pem", certType)
}
os.WriteFile(fmt.Sprintf("/certs/%s/server.key", certType), certificates.PrivateKey, 0o644)
if err != nil {
utils.Logger.Fatal().Err(err).Msgf("Failed to save /certs/%s/server.key", certType)
}
jsonBytes, err := json.MarshalIndent(certificates, "", "\t")
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to marshal certificates to JSON")
}
err = os.WriteFile(fmt.Sprintf("/certs/%s/output.json", certType), jsonBytes, 0o644)
if err != nil {
utils.Logger.Fatal().Err(err).Msgf("Failed to save /certs/%s/output.json", certType)
}
os.WriteFile(fmt.Sprintf("/certs/%s/output.json", certType), jsonBytes, 0o644)
}
func NewCertsClient(xip *xip.Xip, user *Account) *certsClient {
@ -109,7 +123,7 @@ func NewCertsClient(xip *xip.Xip, user *Account) *certsClient {
config.CADirURL = caDirUrl
legoClient, err := lego.NewClient(config)
if err != nil {
log.Fatal(err)
utils.Logger.Fatal().Err(err).Msg("Failed to initialize lego client")
}
provider := newProviderLocalIp(xip)
@ -131,23 +145,20 @@ func getLastCertificate(legoClient *lego.Client, certType string) *certificate.R
if strings.Contains(err.Error(), "no such file or directory") {
return nil
}
log.Println(err)
log.Println("falling back to getting a brand new cert")
utils.Logger.Error().Err(err).Msg("Failling back to getting a brand new cert")
return nil
}
lastCertificate := &certificate.Resource{}
err = json.Unmarshal(jsonBytes, lastCertificate)
if err != nil {
log.Println(err)
log.Println("falling back to getting a brand new cert")
utils.Logger.Error().Err(err).Msg("Failling back to getting a brand new cert")
return nil
}
lastCertificate, err = legoClient.Certificate.Get(lastCertificate.CertURL, true)
if err != nil {
log.Println(err)
log.Println("falling back to getting a brand new cert")
utils.Logger.Error().Err(err).Msg("Failling back to getting a brand new cert")
return nil
}

View File

@ -3,6 +3,7 @@ package certs
import (
"github.com/go-acme/lego/v4/challenge/dns01"
"local-ip.sh/utils"
"local-ip.sh/xip"
)
@ -11,12 +12,14 @@ type DNSProviderLocalIp struct {
}
func (d *DNSProviderLocalIp) Present(domain, token, keyAuth string) error {
utils.Logger.Debug().Str("domain", domain).Msg("DNS01 challenge - present")
fqdn, value := dns01.GetRecord(domain, keyAuth)
d.xip.SetTXTRecord(fqdn, value)
return nil
}
func (d *DNSProviderLocalIp) CleanUp(domain, token, keyAuth string) error {
utils.Logger.Debug().Str("domain", domain).Msg("DNS01 challenge - cleanup")
fqdn, _ := dns01.GetRecord(domain, keyAuth)
d.xip.UnsetTXTRecord(fqdn)
return nil