forked from TrueCloudLab/lego
lauch go fmt to format the change
This commit is contained in:
parent
4f6c1d470f
commit
cc40650b80
3 changed files with 30 additions and 42 deletions
|
@ -18,10 +18,10 @@ import (
|
||||||
"github.com/xenolf/lego/providers/dns/gandi"
|
"github.com/xenolf/lego/providers/dns/gandi"
|
||||||
"github.com/xenolf/lego/providers/dns/googlecloud"
|
"github.com/xenolf/lego/providers/dns/googlecloud"
|
||||||
"github.com/xenolf/lego/providers/dns/namecheap"
|
"github.com/xenolf/lego/providers/dns/namecheap"
|
||||||
|
"github.com/xenolf/lego/providers/dns/ovh"
|
||||||
"github.com/xenolf/lego/providers/dns/rfc2136"
|
"github.com/xenolf/lego/providers/dns/rfc2136"
|
||||||
"github.com/xenolf/lego/providers/dns/route53"
|
"github.com/xenolf/lego/providers/dns/route53"
|
||||||
"github.com/xenolf/lego/providers/dns/vultr"
|
"github.com/xenolf/lego/providers/dns/vultr"
|
||||||
"github.com/xenolf/lego/providers/dns/ovh"
|
|
||||||
"github.com/xenolf/lego/providers/http/webroot"
|
"github.com/xenolf/lego/providers/http/webroot"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -5,26 +5,24 @@ package ovh
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"github.com/xenolf/lego/acme"
|
|
||||||
"github.com/ovh/go-ovh/ovh"
|
"github.com/ovh/go-ovh/ovh"
|
||||||
|
"github.com/xenolf/lego/acme"
|
||||||
)
|
)
|
||||||
|
|
||||||
// OVH API reference: https://eu.api.ovh.com/
|
// OVH API reference: https://eu.api.ovh.com/
|
||||||
// Create a Token: https://eu.api.ovh.com/createToken/
|
// Create a Token: https://eu.api.ovh.com/createToken/
|
||||||
|
|
||||||
|
|
||||||
// DNSProvider is an implementation of the acme.ChallengeProvider interface
|
// DNSProvider is an implementation of the acme.ChallengeProvider interface
|
||||||
// that uses OVH's REST API to manage TXT records for a domain.
|
// that uses OVH's REST API to manage TXT records for a domain.
|
||||||
type DNSProvider struct {
|
type DNSProvider struct {
|
||||||
client *ovh.Client
|
client *ovh.Client
|
||||||
recordIDs map[string]int
|
recordIDs map[string]int
|
||||||
recordIDsMu sync.Mutex
|
recordIDsMu sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// NewDNSProvider returns a DNSProvider instance configured for OVH
|
// NewDNSProvider returns a DNSProvider instance configured for OVH
|
||||||
// Credentials must be passed in the environment variable:
|
// Credentials must be passed in the environment variable:
|
||||||
// OVH_ENDPOINT : it must be ovh-eu or ovh-ca
|
// OVH_ENDPOINT : it must be ovh-eu or ovh-ca
|
||||||
|
@ -39,7 +37,6 @@ func NewDNSProvider() (*DNSProvider, error) {
|
||||||
return NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, consumerKey)
|
return NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, consumerKey)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// NewDNSProviderCredentials uses the supplied credentials to return a
|
// NewDNSProviderCredentials uses the supplied credentials to return a
|
||||||
// DNSProvider instance configured for OVH.
|
// DNSProvider instance configured for OVH.
|
||||||
func NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, consumerKey string) (*DNSProvider, error) {
|
func NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, consumerKey string) (*DNSProvider, error) {
|
||||||
|
@ -48,38 +45,37 @@ func NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, c
|
||||||
}
|
}
|
||||||
|
|
||||||
ovhClient, _ := ovh.NewClient(
|
ovhClient, _ := ovh.NewClient(
|
||||||
apiEndpoint,
|
apiEndpoint,
|
||||||
applicationKey,
|
applicationKey,
|
||||||
applicationSecret,
|
applicationSecret,
|
||||||
consumerKey,
|
consumerKey,
|
||||||
)
|
)
|
||||||
|
|
||||||
return &DNSProvider{
|
return &DNSProvider{
|
||||||
client: ovhClient,
|
client: ovhClient,
|
||||||
recordIDs: make(map[string]int),
|
recordIDs: make(map[string]int),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Present creates a TXT record to fulfil the dns-01 challenge.
|
// Present creates a TXT record to fulfil the dns-01 challenge.
|
||||||
func (d *DNSProvider) Present(domain, token, keyAuth string) error {
|
func (d *DNSProvider) Present(domain, token, keyAuth string) error {
|
||||||
|
|
||||||
// txtRecordRequest represents the request body to DO's API to make a TXT record
|
// txtRecordRequest represents the request body to DO's API to make a TXT record
|
||||||
type txtRecordRequest struct {
|
type txtRecordRequest struct {
|
||||||
FieldType string `json:"fieldType"`
|
FieldType string `json:"fieldType"`
|
||||||
SubDomain string `json:"subDomain"`
|
SubDomain string `json:"subDomain"`
|
||||||
Target string `json:"target"`
|
Target string `json:"target"`
|
||||||
TTL int `json:"ttl"`
|
TTL int `json:"ttl"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// txtRecordResponse represents a response from DO's API after making a TXT record
|
// txtRecordResponse represents a response from DO's API after making a TXT record
|
||||||
type txtRecordResponse struct {
|
type txtRecordResponse struct {
|
||||||
ID int `json:"id"`
|
ID int `json:"id"`
|
||||||
FieldType string `json:"fieldType"`
|
FieldType string `json:"fieldType"`
|
||||||
SubDomain string `json:"subDomain"`
|
SubDomain string `json:"subDomain"`
|
||||||
Target string `json:"target"`
|
Target string `json:"target"`
|
||||||
TTL int `json:"ttl"`
|
TTL int `json:"ttl"`
|
||||||
Zone string `json:"zone"`
|
Zone string `json:"zone"`
|
||||||
}
|
}
|
||||||
|
|
||||||
fqdn, value, ttl := acme.DNS01Record(domain, keyAuth)
|
fqdn, value, ttl := acme.DNS01Record(domain, keyAuth)
|
||||||
|
@ -93,7 +89,6 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
|
||||||
authZone = acme.UnFqdn(authZone)
|
authZone = acme.UnFqdn(authZone)
|
||||||
subDomain := d.extractRecordName(fqdn, authZone)
|
subDomain := d.extractRecordName(fqdn, authZone)
|
||||||
|
|
||||||
|
|
||||||
reqURL := fmt.Sprintf("/domain/zone/%s/record", authZone)
|
reqURL := fmt.Sprintf("/domain/zone/%s/record", authZone)
|
||||||
reqData := txtRecordRequest{FieldType: "TXT", SubDomain: subDomain, Target: value, TTL: ttl}
|
reqData := txtRecordRequest{FieldType: "TXT", SubDomain: subDomain, Target: value, TTL: ttl}
|
||||||
var respData txtRecordResponse
|
var respData txtRecordResponse
|
||||||
|
@ -117,12 +112,9 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
|
||||||
d.recordIDs[fqdn] = respData.ID
|
d.recordIDs[fqdn] = respData.ID
|
||||||
d.recordIDsMu.Unlock()
|
d.recordIDsMu.Unlock()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// CleanUp removes the TXT record matching the specified parameters
|
// CleanUp removes the TXT record matching the specified parameters
|
||||||
func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
|
func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
|
||||||
fqdn, _, _ := acme.DNS01Record(domain, keyAuth)
|
fqdn, _, _ := acme.DNS01Record(domain, keyAuth)
|
||||||
|
@ -135,7 +127,6 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
|
||||||
return fmt.Errorf("unknown record ID for '%s'", fqdn)
|
return fmt.Errorf("unknown record ID for '%s'", fqdn)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
authZone, err := acme.FindZoneByFqdn(acme.ToFqdn(domain), acme.RecursiveNameservers)
|
authZone, err := acme.FindZoneByFqdn(acme.ToFqdn(domain), acme.RecursiveNameservers)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Could not determine zone for domain: '%s'. %s", domain, err)
|
return fmt.Errorf("Could not determine zone for domain: '%s'. %s", domain, err)
|
||||||
|
@ -143,7 +134,7 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
|
||||||
|
|
||||||
authZone = acme.UnFqdn(authZone)
|
authZone = acme.UnFqdn(authZone)
|
||||||
|
|
||||||
reqURL := fmt.Sprintf("/domain/zone/%s/record/%d",authZone, recordID)
|
reqURL := fmt.Sprintf("/domain/zone/%s/record/%d", authZone, recordID)
|
||||||
|
|
||||||
err = d.client.Delete(reqURL, nil)
|
err = d.client.Delete(reqURL, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -151,7 +142,6 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Delete record ID from map
|
// Delete record ID from map
|
||||||
d.recordIDsMu.Lock()
|
d.recordIDsMu.Lock()
|
||||||
delete(d.recordIDs, fqdn)
|
delete(d.recordIDs, fqdn)
|
||||||
|
|
|
@ -9,12 +9,12 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
liveTest bool
|
liveTest bool
|
||||||
apiEndpoint string
|
apiEndpoint string
|
||||||
applicationKey string
|
applicationKey string
|
||||||
applicationSecret string
|
applicationSecret string
|
||||||
consumerKey string
|
consumerKey string
|
||||||
domain string
|
domain string
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -51,7 +51,6 @@ func TestNewDNSProviderMissingCredErr(t *testing.T) {
|
||||||
_, err := NewDNSProvider()
|
_, err := NewDNSProvider()
|
||||||
assert.EqualError(t, err, "OVH credentials missing")
|
assert.EqualError(t, err, "OVH credentials missing")
|
||||||
|
|
||||||
|
|
||||||
os.Setenv("OVH_ENDPOINT", "ovh-eu")
|
os.Setenv("OVH_ENDPOINT", "ovh-eu")
|
||||||
os.Setenv("OVH_APPLICATION_KEY", "")
|
os.Setenv("OVH_APPLICATION_KEY", "")
|
||||||
os.Setenv("OVH_APPLICATION_SECRET", "5678")
|
os.Setenv("OVH_APPLICATION_SECRET", "5678")
|
||||||
|
@ -60,7 +59,6 @@ func TestNewDNSProviderMissingCredErr(t *testing.T) {
|
||||||
_, err = NewDNSProvider()
|
_, err = NewDNSProvider()
|
||||||
assert.EqualError(t, err, "OVH credentials missing")
|
assert.EqualError(t, err, "OVH credentials missing")
|
||||||
|
|
||||||
|
|
||||||
os.Setenv("OVH_ENDPOINT", "ovh-eu")
|
os.Setenv("OVH_ENDPOINT", "ovh-eu")
|
||||||
os.Setenv("OVH_APPLICATION_KEY", "1234")
|
os.Setenv("OVH_APPLICATION_KEY", "1234")
|
||||||
os.Setenv("OVH_APPLICATION_SECRET", "")
|
os.Setenv("OVH_APPLICATION_SECRET", "")
|
||||||
|
|
Loading…
Reference in a new issue