-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cloudflare: handle restricted API tokens (#985)
- Loading branch information
Showing
6 changed files
with
319 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| package cloudflare | ||
|
|
||
| import ( | ||
| "sync" | ||
|
|
||
| "github.com/cloudflare/cloudflare-go" | ||
| "github.com/go-acme/lego/v3/challenge/dns01" | ||
| ) | ||
|
|
||
| type metaClient struct { | ||
| clientEdit *cloudflare.API // needs Zone/DNS/Edit permissions | ||
| clientRead *cloudflare.API // needs Zone/Zone/Read permissions | ||
|
|
||
| zones map[string]string // caches calls to ZoneIDByName, see lookupZoneID() | ||
| zonesMu *sync.RWMutex | ||
| } | ||
|
|
||
| func newClient(config *Config) (*metaClient, error) { | ||
| // with AuthKey/AuthEmail we can access all available APIs | ||
| if config.AuthToken == "" { | ||
| client, err := cloudflare.New(config.AuthKey, config.AuthEmail, cloudflare.HTTPClient(config.HTTPClient)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &metaClient{ | ||
| clientEdit: client, | ||
| clientRead: client, | ||
| zones: make(map[string]string), | ||
| zonesMu: &sync.RWMutex{}, | ||
| }, nil | ||
| } | ||
|
|
||
| dns, err := cloudflare.NewWithAPIToken(config.AuthToken, cloudflare.HTTPClient(config.HTTPClient)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if config.ZoneToken == "" || config.ZoneToken == config.AuthToken { | ||
| return &metaClient{ | ||
| clientEdit: dns, | ||
| clientRead: dns, | ||
| zones: make(map[string]string), | ||
| zonesMu: &sync.RWMutex{}, | ||
| }, nil | ||
| } | ||
|
|
||
| zone, err := cloudflare.NewWithAPIToken(config.ZoneToken, cloudflare.HTTPClient(config.HTTPClient)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &metaClient{ | ||
| clientEdit: dns, | ||
| clientRead: zone, | ||
| zones: make(map[string]string), | ||
| zonesMu: &sync.RWMutex{}, | ||
| }, nil | ||
| } | ||
|
|
||
| func (m *metaClient) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) { | ||
| return m.clientEdit.CreateDNSRecord(zoneID, rr) | ||
| } | ||
|
|
||
| func (m *metaClient) DNSRecords(zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) { | ||
| return m.clientEdit.DNSRecords(zoneID, rr) | ||
| } | ||
|
|
||
| func (m *metaClient) DeleteDNSRecord(zoneID, recordID string) error { | ||
| return m.clientEdit.DeleteDNSRecord(zoneID, recordID) | ||
| } | ||
|
|
||
| func (m *metaClient) ZoneIDByName(fdqn string) (string, error) { | ||
| m.zonesMu.RLock() | ||
| id := m.zones[fdqn] | ||
| m.zonesMu.RUnlock() | ||
|
|
||
| if id != "" { | ||
| return id, nil | ||
| } | ||
|
|
||
| id, err := m.clientRead.ZoneIDByName(dns01.UnFqdn(fdqn)) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| m.zonesMu.Lock() | ||
| m.zones[fdqn] = id | ||
| m.zonesMu.Unlock() | ||
| return id, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.