marcel/zoraxy
1
0
Fork 0
mirror of https://github.com/tobychui/zoraxy.git synced 2025-06-06 23:57:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

added downward compality and spaces are cut from the json

Browse Source
This commit is contained in:
sickjuicy 2024-12-01 16:01:23 +01:00
parent b653b805b8
commit 12358d3522
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mod/acme/acme.go
View File

@ -177,12 +177,18 @@ func (a *ACMEHandler) ObtainCert(domains []string, certificateName string, email
certInfo, err := LoadCertInfoJSON(fmt.Sprintf("./conf/certs/%s.json", certificateName)) certInfo, err := LoadCertInfoJSON(fmt.Sprintf("./conf/certs/%s.json", certificateName))
if err == nil { if err == nil {
useDNS = certInfo.UseDNS useDNS = certInfo.UseDNS
if dnsServers == "" && len(certInfo.DNSServers) > 0 { if dnsServers == "" && certInfo.DNSServers != nil && len(certInfo.DNSServers) > 0 {
dnsServers = strings.Join(certInfo.DNSServers, ",") dnsServers = strings.Join(certInfo.DNSServers, ",")
} }
propagationTimeout = certInfo.PropTimeout propagationTimeout = certInfo.PropTimeout
} }
// Clean DNS servers
dnsNameservers := strings.Split(dnsServers, ",")
for i := range dnsNameservers {
dnsNameservers[i] = strings.TrimSpace(dnsNameservers[i])
}
// setup how to receive challenge // setup how to receive challenge
if useDNS { if useDNS {
if !a.Database.TableExists("acme") { if !a.Database.TableExists("acme") {
@ -214,13 +220,9 @@ func (a *ACMEHandler) ObtainCert(domains []string, certificateName string, email
return false, err return false, err
} }
if dnsServers != "" { if len(dnsNameservers) > 0 && dnsNameservers[0] != "" {
dnsServersList := strings.Split(dnsServers, ",") a.Logf("Using DNS servers: "+strings.Join(dnsNameservers, ", "), nil)
for i := range dnsServersList { err = client.Challenge.SetDNS01Provider(provider, dns01.AddRecursiveNameservers(dnsNameservers))
dnsServersList[i] = strings.TrimSpace(dnsServersList[i])
}
a.Logf("Using DNS servers: "+strings.Join(dnsServersList, ", "), nil)
err = client.Challenge.SetDNS01Provider(provider, dns01.AddRecursiveNameservers(dnsServersList))
} else { } else {
// Use default DNS-01 nameservers if dnsServers is empty // Use default DNS-01 nameservers if dnsServers is empty
err = client.Challenge.SetDNS01Provider(provider, dns01.AddRecursiveNameservers(defaultNameservers)) err = client.Challenge.SetDNS01Provider(provider, dns01.AddRecursiveNameservers(defaultNameservers))
@ -327,7 +329,7 @@ func (a *ACMEHandler) ObtainCert(domains []string, certificateName string, email
SkipTLS: skipTLS, SkipTLS: skipTLS,
UseDNS: useDNS, UseDNS: useDNS,
PropTimeout: propagationTimeout, PropTimeout: propagationTimeout,
DNSServers: strings.Split(dnsServers, ","), DNSServers: dnsNameservers,
} }
certInfoBytes, err := json.Marshal(certInfo) certInfoBytes, err := json.Marshal(certInfo)
@ -571,5 +573,10 @@ func LoadCertInfoJSON(filename string) (*CertificateInfoJSON, error) {
return nil, err return nil, err
} }
// Clean DNS servers
for i := range certInfo.DNSServers {
certInfo.DNSServers[i] = strings.TrimSpace(certInfo.DNSServers[i])
}
return certInfo, nil return certInfo, nil
} }