penguin/webhook-freedns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wrong way to trimsuffix not trimright

Browse Source
This commit is contained in:
斟酌 鵬兄 2022-03-14 07:23:54 +09:00
parent b7247e2055
commit db39682318
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freedns/freedns.go
View File

@ -35,7 +35,7 @@ const URI_DELETE_RECORD = "https://freedns.afraid.org/subdomain/delete2.php?data
// const URI_LOGIN string = "http://127.0.0.1:1234/" // const URI_LOGIN string = "http://127.0.0.1:1234/"
func GetDomainFromZone(Zone string) string { func GetDomainFromZone(Zone string) string {
_segs := strings.Split(strings.TrimRight(Zone, "."), ".") _segs := strings.Split(strings.TrimSuffix(Zone, "."), ".")
_segs = _segs[len(_segs)-2:] _segs = _segs[len(_segs)-2:]
return strings.Join(_segs, ".") return strings.Join(_segs, ".")
} }
@ -299,7 +299,7 @@ loop:
if CurrRecordType == RecordType && CurrRecordAddr == Subdomain { if CurrRecordType == RecordType && CurrRecordAddr == Subdomain {
if _Addr == Address { if _Addr == Address {
return CurrRecordId, nil return CurrRecordId, nil
} else if strings.HasSuffix(_Addr, "...") && strings.HasPrefix(Address, strings.TrimRight(_Addr, "...")) { } else if strings.HasSuffix(_Addr, "...") && strings.HasPrefix(Address, strings.TrimSuffix(_Addr, "...")) {
DeepSearchCandidates = append(DeepSearchCandidates, CurrRecordId) DeepSearchCandidates = append(DeepSearchCandidates, CurrRecordId)
} }
} }

5
main.go
View File

@ -116,10 +116,9 @@ func (c *customDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error {
return err return err
} }
_zone := strings.TrimRight(ch.ResolvedFQDN, "."+ch.ResolvedZone) _zone := strings.TrimSuffix(ch.ResolvedFQDN, "."+ch.ResolvedZone)
_key := "\"" + ch.Key + "\"" _key := "\"" + ch.Key + "\""
fmt.Println("ADD - "+_zone, _key)
err = dnsObj.AddRecord("TXT", _zone, _key, false, "") err = dnsObj.AddRecord("TXT", _zone, _key, false, "")
if err != nil { if err != nil {
return err return err
@ -138,7 +137,7 @@ func (c *customDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error {
func (c *customDNSProviderSolver) CleanUp(ch *v1alpha1.ChallengeRequest) error { func (c *customDNSProviderSolver) CleanUp(ch *v1alpha1.ChallengeRequest) error {
_key := "\"" + ch.Key + "\"" _key := "\"" + ch.Key + "\""
_id, err := c.freedns.FindRecord(strings.TrimRight(ch.ResolvedZone, "."), "TXT", _key) _id, err := c.freedns.FindRecord(strings.TrimSuffix(ch.ResolvedZone, "."), "TXT", _key)
if _id != "" { if _id != "" {
err = c.freedns.DeleteRecord(_id) err = c.freedns.DeleteRecord(_id)