feat(provider): makes the provider API non stupid
This commit is contained in:
parent
2ae8c6cca8
commit
86df61986e
GPG key ID:
1D577F50583032A6
7 changed files with 288 additions and 176 deletions
|
|
@ -8,8 +8,7 @@ import (
|
|||
"git.maurice.fr/thomas/mailout/pkg/crypto"
|
||||
"git.maurice.fr/thomas/mailout/pkg/database"
|
||||
"git.maurice.fr/thomas/mailout/pkg/models"
|
||||
"git.maurice.fr/thomas/mailout/pkg/providers/ovh"
|
||||
"git.maurice.fr/thomas/mailout/pkg/utils"
|
||||
provider "git.maurice.fr/thomas/mailout/pkg/providers"
|
||||
"github.com/google/uuid"
|
||||
"github.com/pterm/pterm"
|
||||
"github.com/sirupsen/logrus"
|
||||
|
|
@ -20,11 +19,22 @@ var (
|
|||
flagDKIMKeyActive bool
|
||||
flagSelector string
|
||||
flagKeyBits int
|
||||
flagProvider string
|
||||
)
|
||||
|
||||
var DKIMKeyCmd = &cobra.Command{
|
||||
Use: "dkimkey",
|
||||
Short: "manages DKIM keys",
|
||||
PreRunE: func(cmd *cobra.Command, args []string) error {
|
||||
if flagProvider == "" {
|
||||
if cfg.DefaultProvider == "" {
|
||||
logrus.Fatal("no provider specified and no default provider in config, aborting")
|
||||
}
|
||||
flagProvider = cfg.DefaultProvider
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
}
|
||||
|
||||
var DKIMKeyAddCmd = &cobra.Command{
|
||||
|
|
@ -228,93 +238,30 @@ var DKIMKeyPublishCmd = &cobra.Command{
|
|||
"selector": dkimkey.Selector,
|
||||
})
|
||||
|
||||
ovhClient, err := ovh.NewOVHProvider(cfg)
|
||||
pv := flagProvider
|
||||
if flagProvider == "" {
|
||||
pv = cfg.DefaultProvider
|
||||
if pv == "" {
|
||||
logrus.Fatal("no provider specified")
|
||||
}
|
||||
}
|
||||
|
||||
pGen, ok := provider.Providers[pv]
|
||||
if !ok {
|
||||
logger.Fatalf("no such provider: %s", flagProvider)
|
||||
}
|
||||
|
||||
p, err := pGen(cfg)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not get OVH DNS provider")
|
||||
logger.WithError(err).Fatal("could not create provider")
|
||||
}
|
||||
|
||||
zone, err := utils.GetZone(dkimkey.DomainName)
|
||||
err = p.AddDKIMRecord(&dkimkey)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not determine zone")
|
||||
}
|
||||
subdomain, err := utils.GetSubdomain(dkimkey.DomainName)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not determine subdomain")
|
||||
logger.WithError(err).Fatal("could not publish dkim key")
|
||||
}
|
||||
|
||||
if subdomain == "" {
|
||||
subdomain = zone
|
||||
}
|
||||
|
||||
logger = logger.WithFields(logrus.Fields{
|
||||
"zone": zone,
|
||||
"subdomain": subdomain,
|
||||
})
|
||||
|
||||
dkimSub := fmt.Sprintf("%s._domainkey.%s", dkimkey.Selector, subdomain)
|
||||
result := make([]int, 0)
|
||||
|
||||
err = ovhClient.Client.Get(fmt.Sprintf("/domain/zone/%s/record?fieldType=TXT&subDomain=%s", zone, dkimSub), &result)
|
||||
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not lookup records")
|
||||
}
|
||||
|
||||
type createParams struct {
|
||||
FieldType string `json:"fieldType"`
|
||||
SubDomain string `json:"subDomain"`
|
||||
Target string `json:"target"`
|
||||
TTL int `json:"ttl"`
|
||||
}
|
||||
|
||||
type updateParams struct {
|
||||
SubDomain string `json:"subDomain"`
|
||||
Target string `json:"target"`
|
||||
TTL int `json:"ttl"`
|
||||
}
|
||||
|
||||
if len(result) == 0 {
|
||||
logger.Info("no DKIM records found, creating a new one")
|
||||
|
||||
c := createParams{
|
||||
FieldType: "TXT",
|
||||
SubDomain: fmt.Sprintf("%s._domainkey.%s", dkimkey.Selector, subdomain),
|
||||
Target: fmt.Sprintf("\"v=DKIM1; k=rsa; p=%s\"", dkimkey.PublicKey),
|
||||
TTL: 60,
|
||||
}
|
||||
|
||||
err = ovhClient.Client.Post(fmt.Sprintf("/domain/zone/%s/record", zone), &c, nil)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not create new record")
|
||||
}
|
||||
logger.Info("created new DKIM record")
|
||||
|
||||
err = ovhClient.Client.Post(fmt.Sprintf("/domain/zone/%s/refresh", zone), nil, nil)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not refresh the zone")
|
||||
}
|
||||
logger.Info("refreshed zone")
|
||||
} else if len(result) == 1 {
|
||||
logger.Info("found one record, updating it")
|
||||
|
||||
u := updateParams{
|
||||
SubDomain: fmt.Sprintf("%s._domainkey.%s", dkimkey.Selector, subdomain),
|
||||
Target: fmt.Sprintf("\"v=DKIM1; k=foo; p=%s\"", dkimkey.PublicKey),
|
||||
TTL: 60,
|
||||
}
|
||||
|
||||
err = ovhClient.Client.Put(fmt.Sprintf("/domain/zone/%s/record/%d", zone, result[0]), &u, nil)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not update record")
|
||||
}
|
||||
logger.Info("updated existing record")
|
||||
|
||||
err = ovhClient.Client.Post(fmt.Sprintf("/domain/zone/%s/refresh", zone), nil, nil)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not refresh the zone")
|
||||
}
|
||||
logger.Info("refreshed zone")
|
||||
}
|
||||
logger.Info("successfully published record")
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -344,60 +291,36 @@ var DKIMKeyUnpublishCmd = &cobra.Command{
|
|||
}
|
||||
|
||||
dkimkey := qRes[0]
|
||||
|
||||
logger := logrus.WithFields(logrus.Fields{
|
||||
"dkimkey": dkimkey.ID,
|
||||
"selector": dkimkey.Selector,
|
||||
})
|
||||
|
||||
ovhClient, err := ovh.NewOVHProvider(cfg)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not get OVH DNS provider")
|
||||
}
|
||||
|
||||
zone, err := utils.GetZone(dkimkey.DomainName)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not determine zone")
|
||||
}
|
||||
subdomain, err := utils.GetSubdomain(dkimkey.DomainName)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not determine subdomain")
|
||||
}
|
||||
|
||||
if subdomain == "" {
|
||||
subdomain = zone
|
||||
}
|
||||
|
||||
logger = logger.WithFields(logrus.Fields{
|
||||
"zone": zone,
|
||||
"subdomain": subdomain,
|
||||
})
|
||||
|
||||
dkimSub := fmt.Sprintf("%s._domainkey.%s", dkimkey.Selector, subdomain)
|
||||
result := make([]int, 0)
|
||||
|
||||
err = ovhClient.Client.Get(fmt.Sprintf("/domain/zone/%s/record?fieldType=TXT&subDomain=%s", zone, dkimSub), &result)
|
||||
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not lookup records")
|
||||
}
|
||||
|
||||
if len(result) == 0 {
|
||||
logger.Info("no DKIM records found, no need to do anything")
|
||||
} else if len(result) == 1 {
|
||||
logger.Info("found one record, deleting it")
|
||||
|
||||
err = ovhClient.Client.Delete(fmt.Sprintf("/domain/zone/%s/record/%d", zone, result[0]), nil)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not delete record")
|
||||
pv := flagProvider
|
||||
if flagProvider == "" {
|
||||
pv = cfg.DefaultProvider
|
||||
if pv == "" {
|
||||
logrus.Fatal("no provider specified")
|
||||
}
|
||||
logger.Info("deleted existing record")
|
||||
|
||||
err = ovhClient.Client.Post(fmt.Sprintf("/domain/zone/%s/refresh", zone), nil, nil)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not refresh the zone")
|
||||
}
|
||||
logger.Info("refreshed zone")
|
||||
}
|
||||
|
||||
pGen, ok := provider.Providers[pv]
|
||||
if !ok {
|
||||
logger.Fatalf("no such provider: %s", flagProvider)
|
||||
}
|
||||
|
||||
p, err := pGen(cfg)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not create provider")
|
||||
}
|
||||
|
||||
err = p.DeleteDKIMRecord(&dkimkey)
|
||||
if err != nil {
|
||||
logger.WithError(err).Fatal("could not unpublish dkim key")
|
||||
}
|
||||
|
||||
logger.Info("successfully unpublished record")
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -414,4 +337,8 @@ func InitDKIMKeyCmd() {
|
|||
DKIMKeyAddCmd.PersistentFlags().BoolVarP(&flagDKIMKeyActive, "active", "a", true, "whether or not the created key is active")
|
||||
DKIMKeyAddCmd.PersistentFlags().StringVarP(&flagSelector, "selector", "s", "", "force a selector for the key")
|
||||
DKIMKeyAddCmd.PersistentFlags().IntVarP(&flagKeyBits, "key-bits", "k", 2048, "force a size for the key")
|
||||
|
||||
DKIMKeyPublishCmd.PersistentFlags().StringVarP(&flagProvider, "provider", "p", "", "provider to which publish the change to")
|
||||
|
||||
DKIMKeyUnpublishCmd.PersistentFlags().StringVarP(&flagProvider, "provider", "p", "", "provider to which unpublish the change from")
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue