mokhtar/local-ip.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make CLI configurable

Browse Source
This commit is contained in:
m5r
2024-07-26 12:16:23 +02:00
parent c3220327e1
commit c7989fa736
15 changed files with 468 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
certs/account.go
View File

@ -36,7 +36,8 @@ func (u *Account) GetPrivateKey() crypto.PrivateKey {
}
func LoadAccount() *Account {
jsonBytes, err := os.ReadFile(accountFilePath)
config := utils.GetConfig()
jsonBytes, err := os.ReadFile(config.AccountFilePath)
if err != nil {
if strings.Contains(err.Error(), "no such file or directory") {
RegisterAccount()
@ -51,7 +52,7 @@ func LoadAccount() *Account {
utils.Logger.Fatal().Err(err).Msg("Failed to unmarshal account JSON file")
}
privKey, err := os.ReadFile(keyFilePath)
privKey, err := os.ReadFile(config.KeyFilePath)
if err != nil {
utils.Logger.Fatal().Err(err).Msg("Failed to read account's private key file")
}
@ -61,41 +62,42 @@ func LoadAccount() *Account {
}
func RegisterAccount() {
config := utils.GetConfig()
privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
if err != nil {
utils.Logger.Fatal().Err(err).Msg("Failed to generate account key")
}
account := &Account{
Email: email,
Email: config.Email,
key: privateKey,
}
config := lego.NewConfig(account)
config.CADirURL = caDirUrl
legoClient, err := lego.NewClient(config)
legoConfig := lego.NewConfig(account)
legoConfig.CADirURL = config.CADirURL
legoClient, err := lego.NewClient(legoConfig)
if err != nil {
utils.Logger.Fatal().Err(err).Str("CA Directory URL", config.CADirURL).Msg("Failed to initialize lego client")
utils.Logger.Fatal().Err(err).Str("CA Directory URL", legoConfig.CADirURL).Msg("Failed to initialize lego client")
}
reg, err := legoClient.Registration.Register(registration.RegisterOptions{TermsOfServiceAgreed: true})
if err != nil {
utils.Logger.Fatal().Err(err).Str("CA Directory URL", config.CADirURL).Msg("Failed to register account to ACME server")
utils.Logger.Fatal().Err(err).Str("CA Directory URL", legoConfig.CADirURL).Msg("Failed to register account to ACME server")
}
if reg.Body.Status != "valid" {
utils.Logger.Fatal().Err(err).Str("CA Directory URL", config.CADirURL).Msgf("Registration failed with status %s", reg.Body.Status)
utils.Logger.Fatal().Err(err).Str("CA Directory URL", legoConfig.CADirURL).Msgf("Registration failed with status %s", reg.Body.Status)
}
utils.Logger.Debug().
Str("CA Directory URL", config.CADirURL).
Str("CA Directory URL", legoConfig.CADirURL).
Bool("TermsOfServiceAgreed", reg.Body.TermsOfServiceAgreed).
Msg("Successfully registered account to ACME server")
account.Registration = reg
os.MkdirAll(filepath.Dir(keyFilePath), os.ModePerm)
os.MkdirAll(filepath.Dir(config.KeyFilePath), os.ModePerm)
privKey := encode(privateKey)
err = os.WriteFile(keyFilePath, []byte(privKey), 0o644)
err = os.WriteFile(config.KeyFilePath, []byte(privKey), 0o644)
if err != nil {
utils.Logger.Fatal().Err(err).Str("path", keyFilePath).Msg("Failed to write account's private key file")
utils.Logger.Fatal().Err(err).Str("path", config.KeyFilePath).Msg("Failed to write account's private key file")
}
jsonBytes, err := json.MarshalIndent(account, "", "\t")
@ -103,10 +105,10 @@ func RegisterAccount() {
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)
os.MkdirAll(filepath.Dir(config.AccountFilePath), os.ModePerm)
err = os.WriteFile(config.AccountFilePath, jsonBytes, 0o600)
if err != nil {
utils.Logger.Fatal().Err(err).Str("path", accountFilePath).Msg("Failed to write account's JSON file")
utils.Logger.Fatal().Err(err).Str("path", config.AccountFilePath).Msg("Failed to write account's JSON file")
}
}

12
certs/certs.go
View File

@ -27,14 +27,15 @@ func (c *certsClient) RequestCertificates() {
}
func (c *certsClient) requestCertificate(certType string) {
config := utils.GetConfig()
var lastCertificate *certificate.Resource
var domains []string
if certType == "wildcard" {
lastCertificate = c.lastWildcardCertificate
domains = []string{"*.local-ip.sh"}
domains = []string{fmt.Sprintf("*.%s", config.Domain)}
} else if certType == "root" {
lastCertificate = c.lastRootCertificate
domains = []string{"local-ip.sh"}
domains = []string{config.Domain}
} else {
utils.Logger.Fatal().Msgf("Unexpected certType %s. Only \"wildcard\" and \"root\" are supported", certType)
}
@ -119,9 +120,10 @@ func persistFiles(certificates *certificate.Resource, certType string) {
}
func NewCertsClient(xip *xip.Xip, user *Account) *certsClient {
config := lego.NewConfig(user)
config.CADirURL = caDirUrl
legoClient, err := lego.NewClient(config)
config := utils.GetConfig()
legoConfig := lego.NewConfig(user)
legoConfig.CADirURL = config.CADirURL
legoClient, err := lego.NewClient(legoConfig)
if err != nil {
utils.Logger.Fatal().Err(err).Msg("Failed to initialize lego client")
}

21
certs/config.go
View File

@ -1,21 +0,0 @@
package certs
import (
"fmt"
"net/url"
"github.com/go-acme/lego/v4/lego"
)
const (
email = "admin@local-ip.sh"
caDirUrl = lego.LEDirectoryProduction
// caDirUrl = lego.LEDirectoryStaging
)
var (
parsedCaDirUrl, _ = url.Parse(caDirUrl)
caDirHostname = parsedCaDirUrl.Hostname()
accountFilePath = fmt.Sprintf("./.lego/accounts/%s/%s/account.json", caDirHostname, email)
keyFilePath = fmt.Sprintf("./.lego/accounts/%s/%s/keys/%s.key", caDirHostname, email, email)
)