pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-04-25 06:16:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify wildecard logic

Browse source
This commit is contained in:
Jean-Marie 'Histausse' Mineau 2024-03-26 00:45:45 +01:00 • committed by Jean-Marie Mineau
parent 376d4e0b7c
commit 6fc224b359
No known key found for this signature in database
GPG key ID: B66AEEDA9B645AD2
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/certificates/certificates.go
View file

@ -216,9 +216,6 @@ func (c *AcmeClient) retrieveCertFromDB(sni, mainDomainSuffix string, useDnsProv
func (c *AcmeClient) obtainCert(acmeClient *lego.Client, domains []string, renew *certificate.Resource, user string, useDnsProvider bool, mainDomainSuffix string, keyDatabase database.CertDB) (*tls.Certificate, error) { func (c *AcmeClient) obtainCert(acmeClient *lego.Client, domains []string, renew *certificate.Resource, user string, useDnsProvider bool, mainDomainSuffix string, keyDatabase database.CertDB) (*tls.Certificate, error) {
name := strings.TrimPrefix(domains[0], "*") name := strings.TrimPrefix(domains[0], "*")
if useDnsProvider && domains[0] != "" && domains[0][0] == '*' {
domains = domains[1:]
}
// lock to avoid simultaneous requests // lock to avoid simultaneous requests
_, working := c.obtainLocks.LoadOrStore(name, struct{}{}) _, working := c.obtainLocks.LoadOrStore(name, struct{}{})
@ -236,12 +233,9 @@ func (c *AcmeClient) obtainCert(acmeClient *lego.Client, domains []string, renew
defer c.obtainLocks.Delete(name) defer c.obtainLocks.Delete(name)
if acmeClient == nil { if acmeClient == nil {
if useDnsProvider { if useDnsProvider {
mock_domain := domains[0] return mockCert(domains[0], "DNS ACME client is not defined", mainDomainSuffix, keyDatabase)
if name == mainDomainSuffix {
mock_domain = "*" + mainDomainSuffix
}
return mockCert(mock_domain, "DNS ACME client is not defined", mainDomainSuffix, keyDatabase)
} else { } else {
return mockCert(domains[0], "ACME client uninitialized. This is a server error, please report!", mainDomainSuffix, keyDatabase) return mockCert(domains[0], "ACME client uninitialized. This is a server error, please report!", mainDomainSuffix, keyDatabase)
} }