Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve root zone detect #13

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve root zone detect #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package main

import (
"errors"
"fmt"
"strings"
)

// getDomainFromZone returns second-level domain name from ResolvedZone without last dot.
// reg.ru api requires to specify the second-level domain in the request
func getDomainFromZone(domains ...string) (string, error) {
for _, domain := range domains {
parts := strings.Split(domain[0:len(domain)-1], ".")
if len(parts) > 1 {
return parts[len(parts)-2] + "." + parts[len(parts)-1], nil
}
}
return "", errors.New(fmt.Sprintf("not enouth parts in domains to find root zone: %v", domains))
}
29 changes: 17 additions & 12 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package main
import (
"fmt"
"os"
"strings"

"github.com/cert-manager/cert-manager/pkg/acme/webhook/apis/acme/v1alpha1"
"github.com/cert-manager/cert-manager/pkg/acme/webhook/cmd"
Expand Down Expand Up @@ -52,10 +51,16 @@ func (c *regruDNSProviderSolver) Present(challengeRequest *v1alpha1.ChallengeReq
//
//klog.Infof("decoded configuration %v", cfg)

regruClient := NewRegruClient(regru.username, regru.password, getDomainFromZone(challengeRequest.ResolvedZone))
zone, err := getDomainFromZone(challengeRequest.ResolvedZone, challengeRequest.ResolvedFQDN)
if err != nil {
return fmt.Errorf("unable to initialize reg.ru client, because unable to get root zone from domains: %w", err)
}

klog.Infof("Using reg.ru client with username %s and zone %s", regru.username, zone)

klog.Infof("present for entry=%s, domain=%s, key=%s", challengeRequest.ResolvedFQDN, getDomainFromZone(challengeRequest.ResolvedZone), challengeRequest.Key)
regruClient := NewRegruClient(regru.username, regru.password, zone)

klog.Infof("present for entry=%s, domain=%s, key=%s", challengeRequest.ResolvedFQDN, zone, challengeRequest.Key)
if err := regruClient.createTXT(challengeRequest.ResolvedFQDN, challengeRequest.Key); err != nil {
return fmt.Errorf("unable to create TXT record: %v", err)
}
Expand All @@ -73,8 +78,15 @@ func (c *regruDNSProviderSolver) CleanUp(challengeRequest *v1alpha1.ChallengeReq
//
//klog.Infof("decoded configuration %v", cfg)

regruClient := NewRegruClient(regru.username, regru.password, getDomainFromZone(challengeRequest.ResolvedZone))
klog.Infof("delete entry=%s, domain=%s, key=%s", challengeRequest.ResolvedFQDN, getDomainFromZone(challengeRequest.ResolvedZone), challengeRequest.Key)
zone, err := getDomainFromZone(challengeRequest.ResolvedZone, challengeRequest.ResolvedFQDN)
if err != nil {
return fmt.Errorf("unable to initialize reg.ru client, because unable to get root zone from domains: %w", err)
}

klog.Infof("Using reg.ru client with username %s and zone %s", regru.username, zone)

regruClient := NewRegruClient(regru.username, regru.password, zone)
klog.Infof("delete entry=%s, domain=%s, key=%s", challengeRequest.ResolvedFQDN, zone, challengeRequest.Key)

if err := regruClient.deleteTXT(challengeRequest.ResolvedFQDN, challengeRequest.Key); err != nil {
return fmt.Errorf("unable to delete TXT record: %v", err)
Expand Down Expand Up @@ -105,10 +117,3 @@ func (c *regruDNSProviderSolver) Initialize(kubeClientConfig *rest.Config, _ <-c
// }
// return cfg, nil
//}

// getDomainFromZone returns second-level domain name from ResolvedZone without last dot.
// reg.ru api requires to specify the second-level domain in the request
func getDomainFromZone(zone string) string {
parts := strings.Split(zone[0:len(zone)-1], ".")
return parts[len(parts)-2] + "." + parts[len(parts)-1]
}