fix per-host scope
This commit is contained in:
6
vendor/github.com/cloudflare/cfssl/csr/csr.go
generated
vendored
6
vendor/github.com/cloudflare/cfssl/csr/csr.go
generated
vendored
@ -14,6 +14,7 @@ import (
|
||||
"errors"
|
||||
"net"
|
||||
"net/mail"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
cferr "github.com/cloudflare/cfssl/errors"
|
||||
@ -268,6 +269,9 @@ func getHosts(cert *x509.Certificate) []string {
|
||||
for _, email := range cert.EmailAddresses {
|
||||
hosts = append(hosts, email)
|
||||
}
|
||||
for _, uri := range cert.URIs {
|
||||
hosts = append(hosts, uri.String())
|
||||
}
|
||||
|
||||
return hosts
|
||||
}
|
||||
@ -379,6 +383,8 @@ func Generate(priv crypto.Signer, req *CertificateRequest) (csr []byte, err erro
|
||||
tpl.IPAddresses = append(tpl.IPAddresses, ip)
|
||||
} else if email, err := mail.ParseAddress(req.Hosts[i]); err == nil && email != nil {
|
||||
tpl.EmailAddresses = append(tpl.EmailAddresses, email.Address)
|
||||
} else if uri, err := url.ParseRequestURI(req.Hosts[i]); err == nil && uri != nil {
|
||||
tpl.URIs = append(tpl.URIs, uri)
|
||||
} else {
|
||||
tpl.DNSNames = append(tpl.DNSNames, req.Hosts[i])
|
||||
}
|
||||
|
Reference in New Issue
Block a user