mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-21 20:45:33 +03:00
c139287787
Merge in DNS/adguard-home from 4927-ddr-ip-san to master
Updates #4927.
Squashed commit of the following:
commit 92e7498a7a9101648c4cfdf719adf4eb135fc903
Merge: f4770abf fa0fd90d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 2 14:29:08 2022 +0300
Merge branch 'master' into 4927-ddr-ip-san
commit f4770abf98ea2c0db2f0c2ddb9509a29a06c9509
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Nov 2 13:50:40 2022 +0300
dnsforward: imp logs
commit 8d71371365070e221e104ae20acc8312e840eff9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 20:57:43 2022 +0300
all: imp code, docs
commit 9793820f2c581e0ffcb28a59677be5c8df0c43f3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 19:37:39 2022 +0300
all: remember the cert props
89 lines
2.2 KiB
Go
89 lines
2.2 KiB
Go
// Package aghtls contains utilities for work with TLS.
|
|
package aghtls
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"crypto/x509"
|
|
"fmt"
|
|
"net/netip"
|
|
|
|
"github.com/AdguardTeam/golibs/log"
|
|
)
|
|
|
|
// init makes sure that the cipher name map is filled.
|
|
//
|
|
// TODO(a.garipov): Propose a similar API to crypto/tls.
|
|
func init() {
|
|
suites := tls.CipherSuites()
|
|
cipherSuites = make(map[string]uint16, len(suites))
|
|
for _, s := range suites {
|
|
cipherSuites[s.Name] = s.ID
|
|
}
|
|
|
|
log.Debug("tls: known ciphers: %q", cipherSuites)
|
|
}
|
|
|
|
// cipherSuites are a name-to-ID mapping of cipher suites from crypto/tls. It
|
|
// is filled by init. It must not be modified.
|
|
var cipherSuites map[string]uint16
|
|
|
|
// ParseCiphers parses a slice of cipher suites from cipher names.
|
|
func ParseCiphers(cipherNames []string) (cipherIDs []uint16, err error) {
|
|
if cipherNames == nil {
|
|
return nil, nil
|
|
}
|
|
|
|
cipherIDs = make([]uint16, 0, len(cipherNames))
|
|
for _, name := range cipherNames {
|
|
id, ok := cipherSuites[name]
|
|
if !ok {
|
|
return nil, fmt.Errorf("unknown cipher %q", name)
|
|
}
|
|
|
|
cipherIDs = append(cipherIDs, id)
|
|
}
|
|
|
|
return cipherIDs, nil
|
|
}
|
|
|
|
// SaferCipherSuites returns a set of default cipher suites with vulnerable and
|
|
// weak cipher suites removed.
|
|
func SaferCipherSuites() (safe []uint16) {
|
|
for _, s := range tls.CipherSuites() {
|
|
switch s.ID {
|
|
case
|
|
tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
|
|
tls.TLS_RSA_WITH_AES_128_CBC_SHA,
|
|
tls.TLS_RSA_WITH_AES_256_CBC_SHA,
|
|
tls.TLS_RSA_WITH_AES_128_CBC_SHA256,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
|
|
tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
|
|
tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
|
|
tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
|
|
tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
|
|
// Less safe 3DES and CBC suites, go on.
|
|
default:
|
|
safe = append(safe, s.ID)
|
|
}
|
|
}
|
|
|
|
return safe
|
|
}
|
|
|
|
// CertificateHasIP returns true if cert has at least a single IP address among
|
|
// its subjectAltNames.
|
|
func CertificateHasIP(cert *x509.Certificate) (ok bool) {
|
|
if len(cert.IPAddresses) > 0 {
|
|
return true
|
|
}
|
|
|
|
for _, name := range cert.DNSNames {
|
|
if _, err := netip.ParseAddr(name); err == nil {
|
|
return true
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|