mirror of
https://github.com/octoleo/syncthing.git
synced 2024-11-09 14:50:56 +00:00
8519a24ba6
This changes the TLS and certificate handling in a few ways: - We always use TLS 1.2, both for sync connections (as previously) and the GUI/REST/discovery stuff. This is a tightening of the requirements on the GUI. AS far as I can tell from caniusethis.com every browser from 2013 and forward supports TLS 1.2, so I think we should be fine. - We always greate ECDSA certificates. Previously we'd create ECDSA-with-RSA certificates for sync connections and pure RSA certificates for the web stuff. The new default is more modern and the same everywhere. These certificates are OK in TLS 1.2. - We use the Go CPU detection stuff to choose the cipher suites to use, indirectly. The TLS package uses CPU capabilities probing to select either AES-GCM (fast if we have AES-NI) or ChaCha20 (faster if we don't). These CPU detection things aren't exported though, so the tlsutil package now does a quick TLS handshake with itself as part of init(). If the chosen cipher suite was AES-GCM we prioritize that, otherwise we prefer ChaCha20. Some might call this ugly. I think it's awesome.
321 lines
9.2 KiB
Go
321 lines
9.2 KiB
Go
// Copyright (C) 2014 The Syncthing Authors.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
// You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
package tlsutil
|
|
|
|
import (
|
|
"crypto/ecdsa"
|
|
"crypto/elliptic"
|
|
"crypto/rsa"
|
|
"crypto/tls"
|
|
"crypto/x509"
|
|
"crypto/x509/pkix"
|
|
"encoding/pem"
|
|
"fmt"
|
|
"math/big"
|
|
"net"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/syncthing/syncthing/lib/rand"
|
|
)
|
|
|
|
var (
|
|
ErrIdentificationFailed = fmt.Errorf("failed to identify socket type")
|
|
)
|
|
|
|
var (
|
|
// The list of cipher suites we will use / suggest for TLS connections.
|
|
// This is built based on the component slices below, depending on what
|
|
// the hardware prefers.
|
|
cipherSuites []uint16
|
|
|
|
// Suites that are good and fast on hardware with AES-NI. These are
|
|
// reordered from the Go default to put the 256 bit ciphers above the
|
|
// 128 bit ones - because that looks cooler, even though there is
|
|
// probably no relevant difference in strength yet.
|
|
gcmSuites = []uint16{
|
|
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
|
|
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
|
|
}
|
|
|
|
// Suites that are good and fast on hardware *without* AES-NI.
|
|
chaChaSuites = []uint16{
|
|
tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
|
|
tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
|
|
}
|
|
|
|
// The rest of the suites, minus DES stuff.
|
|
otherSuites = []uint16{
|
|
tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
|
|
tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
|
|
tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
|
|
tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
|
|
tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
|
|
tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
|
|
tls.TLS_RSA_WITH_AES_128_CBC_SHA256,
|
|
tls.TLS_RSA_WITH_AES_128_CBC_SHA,
|
|
tls.TLS_RSA_WITH_AES_256_CBC_SHA,
|
|
}
|
|
)
|
|
|
|
func init() {
|
|
// Creates the list of ciper suites that SecureDefault uses.
|
|
cipherSuites = buildCipherSuites()
|
|
}
|
|
|
|
// SecureDefault returns a tls.Config with reasonable, secure defaults set.
|
|
func SecureDefault() *tls.Config {
|
|
// paranoia
|
|
cs := make([]uint16, len(cipherSuites))
|
|
copy(cs, cipherSuites)
|
|
|
|
return &tls.Config{
|
|
// TLS 1.2 is the minimum we accept
|
|
MinVersion: tls.VersionTLS12,
|
|
// We want the longer curves at the front, because that's more
|
|
// secure (so the web tells me, don't ask me to explain the
|
|
// details).
|
|
CurvePreferences: []tls.CurveID{tls.CurveP521, tls.CurveP384, tls.CurveP256},
|
|
// The cipher suite lists built above.
|
|
CipherSuites: cs,
|
|
// We've put some thought into this choice and would like it to
|
|
// matter.
|
|
PreferServerCipherSuites: true,
|
|
}
|
|
}
|
|
|
|
// NewCertificate generates and returns a new TLS certificate.
|
|
func NewCertificate(certFile, keyFile, commonName string) (tls.Certificate, error) {
|
|
priv, err := ecdsa.GenerateKey(elliptic.P384(), rand.Reader)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("generate key: %s", err)
|
|
}
|
|
|
|
notBefore := time.Now()
|
|
notAfter := time.Date(2049, 12, 31, 23, 59, 59, 0, time.UTC)
|
|
|
|
template := x509.Certificate{
|
|
SerialNumber: new(big.Int).SetInt64(rand.Int63()),
|
|
Subject: pkix.Name{
|
|
CommonName: commonName,
|
|
},
|
|
NotBefore: notBefore,
|
|
NotAfter: notAfter,
|
|
SignatureAlgorithm: x509.ECDSAWithSHA256,
|
|
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
|
|
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
|
|
BasicConstraintsValid: true,
|
|
}
|
|
|
|
derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, publicKey(priv), priv)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("create cert: %s", err)
|
|
}
|
|
|
|
certOut, err := os.Create(certFile)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("save cert: %s", err)
|
|
}
|
|
err = pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("save cert: %s", err)
|
|
}
|
|
err = certOut.Close()
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("save cert: %s", err)
|
|
}
|
|
|
|
keyOut, err := os.OpenFile(keyFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("save key: %s", err)
|
|
}
|
|
|
|
block, err := pemBlockForKey(priv)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("save key: %s", err)
|
|
}
|
|
|
|
err = pem.Encode(keyOut, block)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("save key: %s", err)
|
|
}
|
|
err = keyOut.Close()
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("save key: %s", err)
|
|
}
|
|
|
|
return tls.LoadX509KeyPair(certFile, keyFile)
|
|
}
|
|
|
|
type DowngradingListener struct {
|
|
net.Listener
|
|
TLSConfig *tls.Config
|
|
}
|
|
|
|
func (l *DowngradingListener) Accept() (net.Conn, error) {
|
|
conn, isTLS, err := l.AcceptNoWrapTLS()
|
|
|
|
// We failed to identify the socket type, pretend that everything is fine,
|
|
// and pass it to the underlying handler, and let them deal with it.
|
|
if err == ErrIdentificationFailed {
|
|
return conn, nil
|
|
}
|
|
|
|
if err != nil {
|
|
return conn, err
|
|
}
|
|
|
|
if isTLS {
|
|
return tls.Server(conn, l.TLSConfig), nil
|
|
}
|
|
return conn, nil
|
|
}
|
|
|
|
func (l *DowngradingListener) AcceptNoWrapTLS() (net.Conn, bool, error) {
|
|
conn, err := l.Listener.Accept()
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
|
|
var first [1]byte
|
|
conn.SetReadDeadline(time.Now().Add(1 * time.Second))
|
|
n, err := conn.Read(first[:])
|
|
conn.SetReadDeadline(time.Time{})
|
|
if err != nil || n == 0 {
|
|
// We hit a read error here, but the Accept() call succeeded so we must not return an error.
|
|
// We return the connection as is with a special error which handles this
|
|
// special case in Accept().
|
|
return conn, false, ErrIdentificationFailed
|
|
}
|
|
|
|
return &UnionedConnection{&first, conn}, first[0] == 0x16, nil
|
|
}
|
|
|
|
type UnionedConnection struct {
|
|
first *[1]byte
|
|
net.Conn
|
|
}
|
|
|
|
func (c *UnionedConnection) Read(b []byte) (n int, err error) {
|
|
if c.first != nil {
|
|
if len(b) == 0 {
|
|
// this probably doesn't happen, but handle it anyway
|
|
return 0, nil
|
|
}
|
|
b[0] = c.first[0]
|
|
c.first = nil
|
|
return 1, nil
|
|
}
|
|
return c.Conn.Read(b)
|
|
}
|
|
|
|
func publicKey(priv interface{}) interface{} {
|
|
switch k := priv.(type) {
|
|
case *rsa.PrivateKey:
|
|
return &k.PublicKey
|
|
case *ecdsa.PrivateKey:
|
|
return &k.PublicKey
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func pemBlockForKey(priv interface{}) (*pem.Block, error) {
|
|
switch k := priv.(type) {
|
|
case *rsa.PrivateKey:
|
|
return &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(k)}, nil
|
|
case *ecdsa.PrivateKey:
|
|
b, err := x509.MarshalECPrivateKey(k)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &pem.Block{Type: "EC PRIVATE KEY", Bytes: b}, nil
|
|
default:
|
|
return nil, fmt.Errorf("unknown key type")
|
|
}
|
|
}
|
|
|
|
// buildCipherSuites returns a list of cipher suites with either AES-GCM or
|
|
// ChaCha20 at the top. This takes advantage of the CPU detection that the
|
|
// TLS package does to create an optimal cipher suite list for the current
|
|
// hardware.
|
|
func buildCipherSuites() []uint16 {
|
|
pref := preferredCipherSuite()
|
|
for _, suite := range gcmSuites {
|
|
if suite == pref {
|
|
// Go preferred an AES-GCM suite. Use those first.
|
|
return append(gcmSuites, append(chaChaSuites, otherSuites...)...)
|
|
}
|
|
}
|
|
// Use ChaCha20 at the top, then AES-GCM etc.
|
|
return append(chaChaSuites, append(gcmSuites, otherSuites...)...)
|
|
}
|
|
|
|
// preferredCipherSuite returns the cipher suite that is selected for a TLS
|
|
// connection made with the Go defaults to ourselves. This is (currently,
|
|
// probably) either a ChaCha20 suite or an AES-GCM suite, depending on what
|
|
// the CPU detection has decided is fastest on this hardware.
|
|
//
|
|
// The function will return zero if something odd happens, and there's no
|
|
// guarantee what cipher suite would be chosen anyway, so the return value
|
|
// should be taken with a grain of salt.
|
|
func preferredCipherSuite() uint16 {
|
|
// This is one of our certs from NewCertificate above, to avoid having
|
|
// to generate one at init time just for this function.
|
|
crtBs := []byte(`-----BEGIN CERTIFICATE-----
|
|
MIIBXDCCAQOgAwIBAgIIQUODl2/bE4owCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ
|
|
c3luY3RoaW5nMB4XDTE4MTAxNDA2MjU0M1oXDTQ5MTIzMTIzNTk1OVowFDESMBAG
|
|
A1UEAxMJc3luY3RoaW5nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEMqP+1lL4
|
|
0s/xtI3ygExzYc/GvLHr0qetpBrUVHaDwS/cR1yXDsYaJpJcUNtrf1XK49IlpWW1
|
|
Ds8seQsSg7/9BaM/MD0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
|
|
BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMAoGCCqGSM49BAMCA0cAMEQCIFxY
|
|
MDBA92FKqZYSZjmfdIbT1OI6S9CnAFvL/pJZJwNuAiAV7osre2NiCHtXABOvsGrH
|
|
vKWqDvXcHr6Tlo+LmTAdyg==
|
|
-----END CERTIFICATE-----
|
|
`)
|
|
keyBs := []byte(`-----BEGIN EC PRIVATE KEY-----
|
|
MHcCAQEEIHtPxVHlj6Bhi9RgSR2/lAtIQ7APM9wmpaJAcds6TD2CoAoGCCqGSM49
|
|
AwEHoUQDQgAEMqP+1lL40s/xtI3ygExzYc/GvLHr0qetpBrUVHaDwS/cR1yXDsYa
|
|
JpJcUNtrf1XK49IlpWW1Ds8seQsSg7/9BQ==
|
|
-----END EC PRIVATE KEY-----
|
|
`)
|
|
|
|
cert, err := tls.X509KeyPair(crtBs, keyBs)
|
|
if err != nil {
|
|
return 0
|
|
}
|
|
|
|
serverCfg := &tls.Config{
|
|
MinVersion: tls.VersionTLS12,
|
|
PreferServerCipherSuites: true,
|
|
Certificates: []tls.Certificate{cert},
|
|
}
|
|
|
|
clientCfg := &tls.Config{
|
|
MinVersion: tls.VersionTLS12,
|
|
InsecureSkipVerify: true,
|
|
}
|
|
|
|
c0, c1 := net.Pipe()
|
|
|
|
c := tls.Client(c0, clientCfg)
|
|
go func() {
|
|
c.Handshake()
|
|
}()
|
|
|
|
s := tls.Server(c1, serverCfg)
|
|
if err := s.Handshake(); err != nil {
|
|
return 0
|
|
}
|
|
|
|
return c.ConnectionState().CipherSuite
|
|
}
|