pogpp/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

infomaniak: fix subzone support (#1497)

Browse source
This commit is contained in:
Léopold Jacquot 2021-09-30 21:06:22 +02:00 committed by GitHub
parent 17f62b8a13
commit 1bd663882a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/content/dns/zz_gen_infomaniak.md
View file

@ -55,7 +55,6 @@ More information [here](/lego/dns/#configuration-and-credentials).
Access token can be created at the url https://manager.infomaniak.com/v3/infomaniak-api. Access token can be created at the url https://manager.infomaniak.com/v3/infomaniak-api.
You will need domain scope. You will need domain scope.
```

25
providers/dns/infomaniak/infomaniak.go
View file

@ -5,7 +5,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"net/http" "net/http"
"strings"
"sync" "sync"
"time" "time"
@ -113,11 +112,6 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
func (d *DNSProvider) Present(domain, token, keyAuth string) error { func (d *DNSProvider) Present(domain, token, keyAuth string) error {
fqdn, value := dns01.GetRecord(domain, keyAuth) fqdn, value := dns01.GetRecord(domain, keyAuth)
authZone, err := getZone(fqdn)
if err != nil {
return fmt.Errorf("infomaniak: %w", err)
}
ikDomain, err := d.client.GetDomainByName(domain) ikDomain, err := d.client.GetDomainByName(domain)
if err != nil { if err != nil {
return fmt.Errorf("infomaniak: could not get domain %q: %w", domain, err) return fmt.Errorf("infomaniak: could not get domain %q: %w", domain, err)
@ -128,7 +122,7 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
d.domainIDsMu.Unlock() d.domainIDsMu.Unlock()
record := internal.Record{ record := internal.Record{
Source: extractRecordName(fqdn, authZone), Source: extractRecordName(fqdn, ikDomain.CustomerName),
Target: value, Target: value,
Type: "TXT", Type: "TXT",
TTL: d.config.TTL, TTL: d.config.TTL,
@ -190,19 +184,8 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
return d.config.PropagationTimeout, d.config.PollingInterval return d.config.PropagationTimeout, d.config.PollingInterval
} }
func getZone(fqdn string) (string, error) { func extractRecordName(fqdn, domain string) string {
authZone, err := dns01.FindZoneByFqdn(fqdn)
if err != nil {
return "", err
}
return dns01.UnFqdn(authZone), nil
}
func extractRecordName(fqdn, zone string) string {
name := dns01.UnFqdn(fqdn) name := dns01.UnFqdn(fqdn)
if idx := strings.Index(name, "."+zone); idx != -1 {
return name[:idx] return name[:len(name)-len(domain)-1]
}
return name
} }

1
providers/dns/infomaniak/infomaniak.toml
View file

@ -14,7 +14,6 @@ Additional = '''
Access token can be created at the url https://manager.infomaniak.com/v3/infomaniak-api. Access token can be created at the url https://manager.infomaniak.com/v3/infomaniak-api.
You will need domain scope. You will need domain scope.
```
''' '''
[Configuration] [Configuration]