pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-04-19 11:36:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix xorm regressions by handle wildcard certs correctly (#177)

Browse source 
close #176

Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/177
This commit is contained in:
6543 2023-02-11 01:26:21 +00:00
parent d8d119b0b3
commit 272c7ca76f
7 changed files with 162 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/database/interface.go
View file

@ -54,10 +54,14 @@ func toCert(name string, c *certificate.Resource) (*Cert, error) {
}
validTill := tlsCertificates[0].NotAfter.Unix()
// TODO: do we need this or can we just go with domain name for wildcard cert
// default *.mock cert is prefixed with '.'
if name != c.Domain && name[1:] != c.Domain && name[0] != '.' {
return nil, fmt.Errorf("domain key and cert domain not equal")
// handle wildcard certs
if name[:1] == "." {
name = "*" + name
}
if name != c.Domain {
err := fmt.Errorf("domain key '%s' and cert domain '%s' not equal", name, c.Domain)
log.Error().Err(err).Msg("toCert conversion did discover mismatch")
// TODO: fail hard: return nil, err
}
return &Cert{