github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

only try issuing new certificate when user provide custom CA

pull/1059/head
Darien Raymond 2018-04-14 13:12:50 +02:00
parent 048f0ee56e
commit abee8bddf3
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
transport/internet/tls/config.go
View File

@ -58,6 +58,15 @@ func issueCertificate(rawCA *Certificate, domain string) (*tls.Certificate, erro
return &cert, err return &cert, err
} }
func (c *Config) hasCustomCA() bool {
for _, certificate := range c.Certificate {
if certificate.Usage == Certificate_AUTHORITY_ISSUE {
return true
}
}
return false
}
func (c *Config) GetTLSConfig(opts ...Option) *tls.Config { func (c *Config) GetTLSConfig(opts ...Option) *tls.Config {
config := &tls.Config{ config := &tls.Config{
ClientSessionCache: globalSessionCache, ClientSessionCache: globalSessionCache,
@ -74,53 +83,56 @@ func (c *Config) GetTLSConfig(opts ...Option) *tls.Config {
config.InsecureSkipVerify = c.AllowInsecure config.InsecureSkipVerify = c.AllowInsecure
config.Certificates = c.BuildCertificates() config.Certificates = c.BuildCertificates()
config.BuildNameToCertificate() config.BuildNameToCertificate()
config.GetCertificate = func(hello *tls.ClientHelloInfo) (*tls.Certificate, error) { if c.hasCustomCA() {
domain := hello.ServerName config.GetCertificate = func(hello *tls.ClientHelloInfo) (*tls.Certificate, error) {
certExpired := false domain := hello.ServerName
if certificate, found := config.NameToCertificate[domain]; found { certExpired := false
if !isCertificateExpired(certificate) { if certificate, found := config.NameToCertificate[domain]; found {
return certificate, nil if !isCertificateExpired(certificate) {
return certificate, nil
}
certExpired = true
} }
certExpired = true
}
if certExpired { if certExpired {
newCerts := make([]tls.Certificate, 0, len(config.Certificates)) newCerts := make([]tls.Certificate, 0, len(config.Certificates))
for _, certificate := range config.Certificates { for _, certificate := range config.Certificates {
if !isCertificateExpired(&certificate) { if !isCertificateExpired(&certificate) {
newCerts = append(newCerts, certificate) newCerts = append(newCerts, certificate)
}
}
config.Certificates = newCerts
}
var issuedCertificate *tls.Certificate
// Create a new certificate from existing CA if possible
for _, rawCert := range c.Certificate {
if rawCert.Usage == Certificate_AUTHORITY_ISSUE {
newCert, err := issueCertificate(rawCert, domain)
if err != nil {
newError("failed to issue new certificate for ", domain).Base(err).WriteToLog()
continue
}
config.Certificates = append(config.Certificates, *newCert)
issuedCertificate = &config.Certificates[len(config.Certificates)-1]
break
} }
} }
config.Certificates = newCerts if issuedCertificate == nil {
} return nil, newError("failed to create a new certificate for ", domain)
var issuedCertificate *tls.Certificate
// Create a new certificate from existing CA if possible
for _, rawCert := range c.Certificate {
if rawCert.Usage == Certificate_AUTHORITY_ISSUE {
newCert, err := issueCertificate(rawCert, domain)
if err != nil {
newError("failed to issue new certificate for ", domain).Base(err).WriteToLog()
continue
}
config.Certificates = append(config.Certificates, *newCert)
issuedCertificate = &config.Certificates[len(config.Certificates)-1]
break
} }
config.BuildNameToCertificate()
return issuedCertificate, nil
} }
if issuedCertificate == nil {
return nil, newError("failed to create a new certificate for ", domain)
}
config.BuildNameToCertificate()
return issuedCertificate, nil
} }
if len(c.ServerName) > 0 { if len(c.ServerName) > 0 {
config.ServerName = c.ServerName config.ServerName = c.ServerName
} }