Refactor: HTTP clients, unified HTTP2/QUIC options, Apple engines
This commit is contained in:
@@ -0,0 +1,218 @@
|
||||
//go:build darwin && cgo
|
||||
|
||||
package tls
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/sagernet/sing-box/adapter"
|
||||
boxConstant "github.com/sagernet/sing-box/constant"
|
||||
"github.com/sagernet/sing-box/option"
|
||||
E "github.com/sagernet/sing/common/exceptions"
|
||||
"github.com/sagernet/sing/common/logger"
|
||||
"github.com/sagernet/sing/common/ntp"
|
||||
"github.com/sagernet/sing/service"
|
||||
)
|
||||
|
||||
type appleCertificateStore interface {
|
||||
StoreKind() string
|
||||
CurrentPEM() []string
|
||||
}
|
||||
|
||||
type appleClientConfig struct {
|
||||
serverName string
|
||||
nextProtos []string
|
||||
handshakeTimeout time.Duration
|
||||
minVersion uint16
|
||||
maxVersion uint16
|
||||
insecure bool
|
||||
anchorPEM string
|
||||
anchorOnly bool
|
||||
certificatePublicKeySHA256 [][]byte
|
||||
timeFunc func() time.Time
|
||||
}
|
||||
|
||||
func (c *appleClientConfig) ServerName() string {
|
||||
return c.serverName
|
||||
}
|
||||
|
||||
func (c *appleClientConfig) SetServerName(serverName string) {
|
||||
c.serverName = serverName
|
||||
}
|
||||
|
||||
func (c *appleClientConfig) NextProtos() []string {
|
||||
return c.nextProtos
|
||||
}
|
||||
|
||||
func (c *appleClientConfig) SetNextProtos(nextProto []string) {
|
||||
c.nextProtos = append(c.nextProtos[:0], nextProto...)
|
||||
}
|
||||
|
||||
func (c *appleClientConfig) HandshakeTimeout() time.Duration {
|
||||
return c.handshakeTimeout
|
||||
}
|
||||
|
||||
func (c *appleClientConfig) SetHandshakeTimeout(timeout time.Duration) {
|
||||
c.handshakeTimeout = timeout
|
||||
}
|
||||
|
||||
func (c *appleClientConfig) STDConfig() (*STDConfig, error) {
|
||||
return nil, E.New("unsupported usage for Apple TLS engine")
|
||||
}
|
||||
|
||||
func (c *appleClientConfig) Client(conn net.Conn) (Conn, error) {
|
||||
return nil, os.ErrInvalid
|
||||
}
|
||||
|
||||
func (c *appleClientConfig) Clone() Config {
|
||||
return &appleClientConfig{
|
||||
serverName: c.serverName,
|
||||
nextProtos: append([]string(nil), c.nextProtos...),
|
||||
handshakeTimeout: c.handshakeTimeout,
|
||||
minVersion: c.minVersion,
|
||||
maxVersion: c.maxVersion,
|
||||
insecure: c.insecure,
|
||||
anchorPEM: c.anchorPEM,
|
||||
anchorOnly: c.anchorOnly,
|
||||
certificatePublicKeySHA256: append([][]byte(nil), c.certificatePublicKeySHA256...),
|
||||
timeFunc: c.timeFunc,
|
||||
}
|
||||
}
|
||||
|
||||
func newAppleClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions, allowEmptyServerName bool) (Config, error) {
|
||||
validated, err := ValidateAppleTLSOptions(ctx, options, "Apple TLS engine")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var serverName string
|
||||
if options.ServerName != "" {
|
||||
serverName = options.ServerName
|
||||
} else if serverAddress != "" {
|
||||
serverName = serverAddress
|
||||
}
|
||||
if serverName == "" && !options.Insecure && !allowEmptyServerName {
|
||||
return nil, errMissingServerName
|
||||
}
|
||||
|
||||
var handshakeTimeout time.Duration
|
||||
if options.HandshakeTimeout > 0 {
|
||||
handshakeTimeout = options.HandshakeTimeout.Build()
|
||||
} else {
|
||||
handshakeTimeout = boxConstant.TCPTimeout
|
||||
}
|
||||
|
||||
return &appleClientConfig{
|
||||
serverName: serverName,
|
||||
nextProtos: append([]string(nil), options.ALPN...),
|
||||
handshakeTimeout: handshakeTimeout,
|
||||
minVersion: validated.MinVersion,
|
||||
maxVersion: validated.MaxVersion,
|
||||
insecure: options.Insecure || len(options.CertificatePublicKeySHA256) > 0,
|
||||
anchorPEM: validated.AnchorPEM,
|
||||
anchorOnly: validated.AnchorOnly,
|
||||
certificatePublicKeySHA256: append([][]byte(nil), options.CertificatePublicKeySHA256...),
|
||||
timeFunc: ntp.TimeFuncFromContext(ctx),
|
||||
}, nil
|
||||
}
|
||||
|
||||
type AppleTLSValidated struct {
|
||||
MinVersion uint16
|
||||
MaxVersion uint16
|
||||
AnchorPEM string
|
||||
AnchorOnly bool
|
||||
}
|
||||
|
||||
func ValidateAppleTLSOptions(ctx context.Context, options option.OutboundTLSOptions, engineName string) (AppleTLSValidated, error) {
|
||||
if options.Reality != nil && options.Reality.Enabled {
|
||||
return AppleTLSValidated{}, E.New("reality is unsupported in ", engineName)
|
||||
}
|
||||
if options.UTLS != nil && options.UTLS.Enabled {
|
||||
return AppleTLSValidated{}, E.New("utls is unsupported in ", engineName)
|
||||
}
|
||||
if options.ECH != nil && options.ECH.Enabled {
|
||||
return AppleTLSValidated{}, E.New("ech is unsupported in ", engineName)
|
||||
}
|
||||
if options.DisableSNI {
|
||||
return AppleTLSValidated{}, E.New("disable_sni is unsupported in ", engineName)
|
||||
}
|
||||
if len(options.CipherSuites) > 0 {
|
||||
return AppleTLSValidated{}, E.New("cipher_suites is unsupported in ", engineName)
|
||||
}
|
||||
if len(options.CurvePreferences) > 0 {
|
||||
return AppleTLSValidated{}, E.New("curve_preferences is unsupported in ", engineName)
|
||||
}
|
||||
if len(options.ClientCertificate) > 0 || options.ClientCertificatePath != "" || len(options.ClientKey) > 0 || options.ClientKeyPath != "" {
|
||||
return AppleTLSValidated{}, E.New("client certificate is unsupported in ", engineName)
|
||||
}
|
||||
if options.Fragment || options.RecordFragment {
|
||||
return AppleTLSValidated{}, E.New("tls fragment is unsupported in ", engineName)
|
||||
}
|
||||
if options.KernelTx || options.KernelRx {
|
||||
return AppleTLSValidated{}, E.New("ktls is unsupported in ", engineName)
|
||||
}
|
||||
if len(options.CertificatePublicKeySHA256) > 0 && (len(options.Certificate) > 0 || options.CertificatePath != "") {
|
||||
return AppleTLSValidated{}, E.New("certificate_public_key_sha256 is conflict with certificate or certificate_path")
|
||||
}
|
||||
var minVersion uint16
|
||||
if options.MinVersion != "" {
|
||||
var err error
|
||||
minVersion, err = ParseTLSVersion(options.MinVersion)
|
||||
if err != nil {
|
||||
return AppleTLSValidated{}, E.Cause(err, "parse min_version")
|
||||
}
|
||||
}
|
||||
var maxVersion uint16
|
||||
if options.MaxVersion != "" {
|
||||
var err error
|
||||
maxVersion, err = ParseTLSVersion(options.MaxVersion)
|
||||
if err != nil {
|
||||
return AppleTLSValidated{}, E.Cause(err, "parse max_version")
|
||||
}
|
||||
}
|
||||
anchorPEM, anchorOnly, err := AppleAnchorPEM(ctx, options)
|
||||
if err != nil {
|
||||
return AppleTLSValidated{}, err
|
||||
}
|
||||
return AppleTLSValidated{
|
||||
MinVersion: minVersion,
|
||||
MaxVersion: maxVersion,
|
||||
AnchorPEM: anchorPEM,
|
||||
AnchorOnly: anchorOnly,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func AppleAnchorPEM(ctx context.Context, options option.OutboundTLSOptions) (string, bool, error) {
|
||||
if len(options.Certificate) > 0 {
|
||||
return strings.Join(options.Certificate, "\n"), true, nil
|
||||
}
|
||||
if options.CertificatePath != "" {
|
||||
content, err := os.ReadFile(options.CertificatePath)
|
||||
if err != nil {
|
||||
return "", false, E.Cause(err, "read certificate")
|
||||
}
|
||||
return string(content), true, nil
|
||||
}
|
||||
|
||||
certificateStore := service.FromContext[adapter.CertificateStore](ctx)
|
||||
if certificateStore == nil {
|
||||
return "", false, nil
|
||||
}
|
||||
store, ok := certificateStore.(appleCertificateStore)
|
||||
if !ok {
|
||||
return "", false, nil
|
||||
}
|
||||
|
||||
switch store.StoreKind() {
|
||||
case boxConstant.CertificateStoreSystem, "":
|
||||
return strings.Join(store.CurrentPEM(), "\n"), false, nil
|
||||
case boxConstant.CertificateStoreMozilla, boxConstant.CertificateStoreChrome, boxConstant.CertificateStoreNone:
|
||||
return strings.Join(store.CurrentPEM(), "\n"), true, nil
|
||||
default:
|
||||
return "", false, E.New("unsupported certificate store for Apple TLS engine: ", store.StoreKind())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,517 @@
|
||||
//go:build darwin && cgo
|
||||
|
||||
package tls
|
||||
|
||||
/*
|
||||
#cgo CFLAGS: -x objective-c -fobjc-arc
|
||||
#cgo LDFLAGS: -framework Foundation -framework Network -framework Security
|
||||
|
||||
#include <stdlib.h>
|
||||
#include "apple_client_platform_darwin.h"
|
||||
*/
|
||||
import "C"
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"encoding/binary"
|
||||
"io"
|
||||
"math"
|
||||
"net"
|
||||
"os"
|
||||
"strings"
|
||||
"sync"
|
||||
"syscall"
|
||||
"time"
|
||||
"unsafe"
|
||||
|
||||
"github.com/sagernet/sing/common"
|
||||
E "github.com/sagernet/sing/common/exceptions"
|
||||
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
func (c *appleClientConfig) ClientHandshake(ctx context.Context, conn net.Conn) (Conn, error) {
|
||||
rawSyscallConn, ok := common.Cast[syscall.Conn](conn)
|
||||
if !ok {
|
||||
return nil, E.New("apple TLS: requires fd-backed TCP connection")
|
||||
}
|
||||
syscallConn, err := rawSyscallConn.SyscallConn()
|
||||
if err != nil {
|
||||
return nil, E.Cause(err, "access raw connection")
|
||||
}
|
||||
|
||||
var dupFD int
|
||||
controlErr := syscallConn.Control(func(fd uintptr) {
|
||||
dupFD, err = unix.Dup(int(fd))
|
||||
})
|
||||
if controlErr != nil {
|
||||
return nil, E.Cause(controlErr, "access raw connection")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, E.Cause(err, "duplicate raw connection")
|
||||
}
|
||||
|
||||
serverName := c.serverName
|
||||
serverNamePtr := cStringOrNil(serverName)
|
||||
defer cFree(serverNamePtr)
|
||||
|
||||
alpn := strings.Join(c.nextProtos, "\n")
|
||||
alpnPtr := cStringOrNil(alpn)
|
||||
defer cFree(alpnPtr)
|
||||
|
||||
anchorPEMPtr := cStringOrNil(c.anchorPEM)
|
||||
defer cFree(anchorPEMPtr)
|
||||
|
||||
var (
|
||||
hasVerifyTime bool
|
||||
verifyTimeUnixMilli int64
|
||||
)
|
||||
if c.timeFunc != nil {
|
||||
hasVerifyTime = true
|
||||
verifyTimeUnixMilli = c.timeFunc().UnixMilli()
|
||||
}
|
||||
|
||||
var errorPtr *C.char
|
||||
client := C.box_apple_tls_client_create(
|
||||
C.int(dupFD),
|
||||
serverNamePtr,
|
||||
alpnPtr,
|
||||
C.size_t(len(alpn)),
|
||||
C.uint16_t(c.minVersion),
|
||||
C.uint16_t(c.maxVersion),
|
||||
C.bool(c.insecure),
|
||||
anchorPEMPtr,
|
||||
C.size_t(len(c.anchorPEM)),
|
||||
C.bool(c.anchorOnly),
|
||||
C.bool(hasVerifyTime),
|
||||
C.int64_t(verifyTimeUnixMilli),
|
||||
&errorPtr,
|
||||
)
|
||||
if client == nil {
|
||||
if errorPtr != nil {
|
||||
defer C.free(unsafe.Pointer(errorPtr))
|
||||
return nil, E.New(C.GoString(errorPtr))
|
||||
}
|
||||
return nil, E.New("apple TLS: create connection")
|
||||
}
|
||||
if err = waitAppleTLSClientReady(ctx, client); err != nil {
|
||||
C.box_apple_tls_client_cancel(client)
|
||||
C.box_apple_tls_client_free(client)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var state C.box_apple_tls_state_t
|
||||
stateOK := C.box_apple_tls_client_copy_state(client, &state, &errorPtr)
|
||||
if !bool(stateOK) {
|
||||
C.box_apple_tls_client_cancel(client)
|
||||
C.box_apple_tls_client_free(client)
|
||||
if errorPtr != nil {
|
||||
defer C.free(unsafe.Pointer(errorPtr))
|
||||
return nil, E.New(C.GoString(errorPtr))
|
||||
}
|
||||
return nil, E.New("apple TLS: read metadata")
|
||||
}
|
||||
defer C.box_apple_tls_state_free(&state)
|
||||
|
||||
connectionState, rawCerts, err := parseAppleTLSState(&state)
|
||||
if err != nil {
|
||||
C.box_apple_tls_client_cancel(client)
|
||||
C.box_apple_tls_client_free(client)
|
||||
return nil, err
|
||||
}
|
||||
if len(c.certificatePublicKeySHA256) > 0 {
|
||||
err = VerifyPublicKeySHA256(c.certificatePublicKeySHA256, rawCerts)
|
||||
if err != nil {
|
||||
C.box_apple_tls_client_cancel(client)
|
||||
C.box_apple_tls_client_free(client)
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
return &appleTLSConn{
|
||||
rawConn: conn,
|
||||
client: client,
|
||||
state: connectionState,
|
||||
closed: make(chan struct{}),
|
||||
}, nil
|
||||
}
|
||||
|
||||
const appleTLSHandshakePollInterval = 100 * time.Millisecond
|
||||
|
||||
func waitAppleTLSClientReady(ctx context.Context, client *C.box_apple_tls_client_t) error {
|
||||
for {
|
||||
if err := ctx.Err(); err != nil {
|
||||
C.box_apple_tls_client_cancel(client)
|
||||
return err
|
||||
}
|
||||
|
||||
waitTimeout := appleTLSHandshakePollInterval
|
||||
if deadline, loaded := ctx.Deadline(); loaded {
|
||||
remaining := time.Until(deadline)
|
||||
if remaining <= 0 {
|
||||
C.box_apple_tls_client_cancel(client)
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
return context.DeadlineExceeded
|
||||
}
|
||||
if remaining < waitTimeout {
|
||||
waitTimeout = remaining
|
||||
}
|
||||
}
|
||||
|
||||
var errorPtr *C.char
|
||||
waitResult := C.box_apple_tls_client_wait_ready(client, C.int(timeoutFromDuration(waitTimeout)), &errorPtr)
|
||||
switch waitResult {
|
||||
case 1:
|
||||
return nil
|
||||
case -2:
|
||||
continue
|
||||
case 0:
|
||||
if errorPtr != nil {
|
||||
defer C.free(unsafe.Pointer(errorPtr))
|
||||
return E.New(C.GoString(errorPtr))
|
||||
}
|
||||
return E.New("apple TLS: handshake failed")
|
||||
default:
|
||||
return E.New("apple TLS: invalid handshake state")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type appleTLSConn struct {
|
||||
rawConn net.Conn
|
||||
client *C.box_apple_tls_client_t
|
||||
state tls.ConnectionState
|
||||
|
||||
readAccess sync.Mutex
|
||||
writeAccess sync.Mutex
|
||||
stateAccess sync.RWMutex
|
||||
closeOnce sync.Once
|
||||
ioAccess sync.Mutex
|
||||
ioGroup sync.WaitGroup
|
||||
closed chan struct{}
|
||||
readEOF bool
|
||||
deadlineAccess sync.Mutex
|
||||
readDeadline time.Time
|
||||
writeDeadline time.Time
|
||||
readTimedOut bool
|
||||
writeTimedOut bool
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) Read(p []byte) (int, error) {
|
||||
c.readAccess.Lock()
|
||||
defer c.readAccess.Unlock()
|
||||
if c.readEOF {
|
||||
return 0, io.EOF
|
||||
}
|
||||
if len(p) == 0 {
|
||||
return 0, nil
|
||||
}
|
||||
|
||||
timeoutMs, err := c.prepareReadTimeout()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
client, err := c.acquireClient()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
defer c.releaseClient()
|
||||
|
||||
var eof C.bool
|
||||
var errorPtr *C.char
|
||||
n := C.box_apple_tls_client_read(client, unsafe.Pointer(&p[0]), C.size_t(len(p)), C.int(timeoutMs), &eof, &errorPtr)
|
||||
switch {
|
||||
case n == -2:
|
||||
c.markReadTimedOut()
|
||||
return 0, os.ErrDeadlineExceeded
|
||||
case n >= 0:
|
||||
if bool(eof) {
|
||||
c.readEOF = true
|
||||
if n == 0 {
|
||||
return 0, io.EOF
|
||||
}
|
||||
}
|
||||
return int(n), nil
|
||||
default:
|
||||
if errorPtr != nil {
|
||||
defer C.free(unsafe.Pointer(errorPtr))
|
||||
if c.isClosed() {
|
||||
return 0, net.ErrClosed
|
||||
}
|
||||
return 0, E.New(C.GoString(errorPtr))
|
||||
}
|
||||
return 0, net.ErrClosed
|
||||
}
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) Write(p []byte) (int, error) {
|
||||
c.writeAccess.Lock()
|
||||
defer c.writeAccess.Unlock()
|
||||
if len(p) == 0 {
|
||||
return 0, nil
|
||||
}
|
||||
|
||||
timeoutMs, err := c.prepareWriteTimeout()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
client, err := c.acquireClient()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
defer c.releaseClient()
|
||||
|
||||
var errorPtr *C.char
|
||||
n := C.box_apple_tls_client_write(client, unsafe.Pointer(&p[0]), C.size_t(len(p)), C.int(timeoutMs), &errorPtr)
|
||||
switch {
|
||||
case n == -2:
|
||||
c.markWriteTimedOut()
|
||||
return 0, os.ErrDeadlineExceeded
|
||||
case n >= 0:
|
||||
return int(n), nil
|
||||
}
|
||||
if errorPtr != nil {
|
||||
defer C.free(unsafe.Pointer(errorPtr))
|
||||
if c.isClosed() {
|
||||
return 0, net.ErrClosed
|
||||
}
|
||||
return 0, E.New(C.GoString(errorPtr))
|
||||
}
|
||||
return 0, net.ErrClosed
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) Close() error {
|
||||
var closeErr error
|
||||
c.closeOnce.Do(func() {
|
||||
close(c.closed)
|
||||
C.box_apple_tls_client_cancel(c.client)
|
||||
closeErr = c.rawConn.Close()
|
||||
c.ioAccess.Lock()
|
||||
c.ioGroup.Wait()
|
||||
C.box_apple_tls_client_free(c.client)
|
||||
c.client = nil
|
||||
c.ioAccess.Unlock()
|
||||
})
|
||||
return closeErr
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) LocalAddr() net.Addr {
|
||||
return c.rawConn.LocalAddr()
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) RemoteAddr() net.Addr {
|
||||
return c.rawConn.RemoteAddr()
|
||||
}
|
||||
|
||||
// SetDeadline installs deadlines for subsequent Read and Write calls.
|
||||
//
|
||||
// Deadlines only apply to subsequent Read or Write calls; an in-flight call
|
||||
// does not observe later updates to its deadline. Callers that need to cancel
|
||||
// an in-flight I/O must Close the connection instead.
|
||||
//
|
||||
// Once an active Read or Write trips its deadline, the underlying
|
||||
// nw_connection is cancelled and the conn is no longer usable — callers must
|
||||
// Close after a deadline error.
|
||||
func (c *appleTLSConn) SetDeadline(t time.Time) error {
|
||||
c.deadlineAccess.Lock()
|
||||
c.readDeadline = t
|
||||
c.writeDeadline = t
|
||||
c.readTimedOut = false
|
||||
c.writeTimedOut = false
|
||||
c.deadlineAccess.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) SetReadDeadline(t time.Time) error {
|
||||
c.deadlineAccess.Lock()
|
||||
c.readDeadline = t
|
||||
c.readTimedOut = false
|
||||
c.deadlineAccess.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) SetWriteDeadline(t time.Time) error {
|
||||
c.deadlineAccess.Lock()
|
||||
c.writeDeadline = t
|
||||
c.writeTimedOut = false
|
||||
c.deadlineAccess.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) prepareReadTimeout() (int, error) {
|
||||
c.deadlineAccess.Lock()
|
||||
defer c.deadlineAccess.Unlock()
|
||||
if c.readTimedOut {
|
||||
return 0, os.ErrDeadlineExceeded
|
||||
}
|
||||
timeoutMs, expired := deadlineTimeoutMs(c.readDeadline)
|
||||
if expired {
|
||||
c.readTimedOut = true
|
||||
return 0, os.ErrDeadlineExceeded
|
||||
}
|
||||
return timeoutMs, nil
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) prepareWriteTimeout() (int, error) {
|
||||
c.deadlineAccess.Lock()
|
||||
defer c.deadlineAccess.Unlock()
|
||||
if c.writeTimedOut {
|
||||
return 0, os.ErrDeadlineExceeded
|
||||
}
|
||||
timeoutMs, expired := deadlineTimeoutMs(c.writeDeadline)
|
||||
if expired {
|
||||
c.writeTimedOut = true
|
||||
return 0, os.ErrDeadlineExceeded
|
||||
}
|
||||
return timeoutMs, nil
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) markReadTimedOut() {
|
||||
c.deadlineAccess.Lock()
|
||||
c.readTimedOut = true
|
||||
c.deadlineAccess.Unlock()
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) markWriteTimedOut() {
|
||||
c.deadlineAccess.Lock()
|
||||
c.writeTimedOut = true
|
||||
c.deadlineAccess.Unlock()
|
||||
}
|
||||
|
||||
func deadlineTimeoutMs(deadline time.Time) (int, bool) {
|
||||
if deadline.IsZero() {
|
||||
return -1, false
|
||||
}
|
||||
remaining := time.Until(deadline)
|
||||
if remaining <= 0 {
|
||||
return 0, true
|
||||
}
|
||||
return timeoutFromDuration(remaining), false
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) isClosed() bool {
|
||||
select {
|
||||
case <-c.closed:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) acquireClient() (*C.box_apple_tls_client_t, error) {
|
||||
c.ioAccess.Lock()
|
||||
defer c.ioAccess.Unlock()
|
||||
if c.isClosed() {
|
||||
return nil, net.ErrClosed
|
||||
}
|
||||
client := c.client
|
||||
if client == nil {
|
||||
return nil, net.ErrClosed
|
||||
}
|
||||
c.ioGroup.Add(1)
|
||||
return client, nil
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) releaseClient() {
|
||||
c.ioGroup.Done()
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) NetConn() net.Conn {
|
||||
return c.rawConn
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) HandshakeContext(ctx context.Context) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *appleTLSConn) ConnectionState() ConnectionState {
|
||||
c.stateAccess.RLock()
|
||||
defer c.stateAccess.RUnlock()
|
||||
return c.state
|
||||
}
|
||||
|
||||
func parseAppleTLSState(state *C.box_apple_tls_state_t) (tls.ConnectionState, [][]byte, error) {
|
||||
rawCerts, peerCertificates, err := parseAppleCertChain(state.peer_cert_chain, state.peer_cert_chain_len)
|
||||
if err != nil {
|
||||
return tls.ConnectionState{}, nil, err
|
||||
}
|
||||
var negotiatedProtocol string
|
||||
if state.alpn != nil {
|
||||
negotiatedProtocol = C.GoString(state.alpn)
|
||||
}
|
||||
var serverName string
|
||||
if state.server_name != nil {
|
||||
serverName = C.GoString(state.server_name)
|
||||
}
|
||||
return tls.ConnectionState{
|
||||
Version: uint16(state.version),
|
||||
HandshakeComplete: true,
|
||||
CipherSuite: uint16(state.cipher_suite),
|
||||
NegotiatedProtocol: negotiatedProtocol,
|
||||
ServerName: serverName,
|
||||
PeerCertificates: peerCertificates,
|
||||
}, rawCerts, nil
|
||||
}
|
||||
|
||||
func parseAppleCertChain(chain *C.uint8_t, chainLen C.size_t) ([][]byte, []*x509.Certificate, error) {
|
||||
if chain == nil || chainLen == 0 {
|
||||
return nil, nil, nil
|
||||
}
|
||||
chainBytes := C.GoBytes(unsafe.Pointer(chain), C.int(chainLen))
|
||||
var (
|
||||
rawCerts [][]byte
|
||||
peerCertificates []*x509.Certificate
|
||||
)
|
||||
for len(chainBytes) >= 4 {
|
||||
certificateLen := binary.BigEndian.Uint32(chainBytes[:4])
|
||||
chainBytes = chainBytes[4:]
|
||||
if len(chainBytes) < int(certificateLen) {
|
||||
return nil, nil, E.New("apple TLS: invalid certificate chain")
|
||||
}
|
||||
certificateData := append([]byte(nil), chainBytes[:certificateLen]...)
|
||||
certificate, err := x509.ParseCertificate(certificateData)
|
||||
if err != nil {
|
||||
return nil, nil, E.Cause(err, "parse peer certificate")
|
||||
}
|
||||
rawCerts = append(rawCerts, certificateData)
|
||||
peerCertificates = append(peerCertificates, certificate)
|
||||
chainBytes = chainBytes[certificateLen:]
|
||||
}
|
||||
if len(chainBytes) != 0 {
|
||||
return nil, nil, E.New("apple TLS: invalid certificate chain")
|
||||
}
|
||||
return rawCerts, peerCertificates, nil
|
||||
}
|
||||
|
||||
func timeoutFromDuration(timeout time.Duration) int {
|
||||
if timeout <= 0 {
|
||||
return 0
|
||||
}
|
||||
timeoutMilliseconds := int64(timeout / time.Millisecond)
|
||||
if timeout%time.Millisecond != 0 {
|
||||
timeoutMilliseconds++
|
||||
}
|
||||
if timeoutMilliseconds > math.MaxInt32 {
|
||||
return math.MaxInt32
|
||||
}
|
||||
return int(timeoutMilliseconds)
|
||||
}
|
||||
|
||||
func cStringOrNil(value string) *C.char {
|
||||
if value == "" {
|
||||
return nil
|
||||
}
|
||||
return C.CString(value)
|
||||
}
|
||||
|
||||
func cFree(pointer *C.char) {
|
||||
if pointer != nil {
|
||||
C.free(unsafe.Pointer(pointer))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <unistd.h>
|
||||
|
||||
typedef struct box_apple_tls_client box_apple_tls_client_t;
|
||||
|
||||
typedef struct box_apple_tls_state {
|
||||
uint16_t version;
|
||||
uint16_t cipher_suite;
|
||||
char *alpn;
|
||||
char *server_name;
|
||||
uint8_t *peer_cert_chain;
|
||||
size_t peer_cert_chain_len;
|
||||
} box_apple_tls_state_t;
|
||||
|
||||
box_apple_tls_client_t *box_apple_tls_client_create(
|
||||
int connected_socket,
|
||||
const char *server_name,
|
||||
const char *alpn,
|
||||
size_t alpn_len,
|
||||
uint16_t min_version,
|
||||
uint16_t max_version,
|
||||
bool insecure,
|
||||
const char *anchor_pem,
|
||||
size_t anchor_pem_len,
|
||||
bool anchor_only,
|
||||
bool has_verify_time,
|
||||
int64_t verify_time_unix_millis,
|
||||
char **error_out
|
||||
);
|
||||
|
||||
int box_apple_tls_client_wait_ready(box_apple_tls_client_t *client, int timeout_msec, char **error_out);
|
||||
void box_apple_tls_client_cancel(box_apple_tls_client_t *client);
|
||||
void box_apple_tls_client_free(box_apple_tls_client_t *client);
|
||||
ssize_t box_apple_tls_client_read(box_apple_tls_client_t *client, void *buffer, size_t buffer_len, int timeout_msec, bool *eof_out, char **error_out);
|
||||
ssize_t box_apple_tls_client_write(box_apple_tls_client_t *client, const void *buffer, size_t buffer_len, int timeout_msec, char **error_out);
|
||||
bool box_apple_tls_client_copy_state(box_apple_tls_client_t *client, box_apple_tls_state_t *state, char **error_out);
|
||||
void box_apple_tls_state_free(box_apple_tls_state_t *state);
|
||||
@@ -0,0 +1,667 @@
|
||||
#import "apple_client_platform_darwin.h"
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <Network/Network.h>
|
||||
#import <Security/Security.h>
|
||||
#import <Security/SecProtocolMetadata.h>
|
||||
#import <Security/SecProtocolOptions.h>
|
||||
#import <Security/SecProtocolTypes.h>
|
||||
#import <arpa/inet.h>
|
||||
#import <dlfcn.h>
|
||||
#import <dispatch/dispatch.h>
|
||||
#import <stdatomic.h>
|
||||
#import <stdlib.h>
|
||||
#import <string.h>
|
||||
#import <unistd.h>
|
||||
|
||||
typedef nw_connection_t _Nullable (*box_nw_connection_create_with_connected_socket_and_parameters_f)(int connected_socket, nw_parameters_t parameters);
|
||||
typedef const char * _Nullable (*box_sec_protocol_metadata_string_accessor_f)(sec_protocol_metadata_t metadata);
|
||||
|
||||
typedef struct box_apple_tls_client {
|
||||
void *connection;
|
||||
void *queue;
|
||||
void *ready_semaphore;
|
||||
atomic_int ref_count;
|
||||
atomic_bool ready;
|
||||
atomic_bool ready_done;
|
||||
char *ready_error;
|
||||
box_apple_tls_state_t state;
|
||||
} box_apple_tls_client_t;
|
||||
|
||||
static nw_connection_t box_apple_tls_connection(box_apple_tls_client_t *client) {
|
||||
if (client == NULL || client->connection == NULL) {
|
||||
return nil;
|
||||
}
|
||||
return (__bridge nw_connection_t)client->connection;
|
||||
}
|
||||
|
||||
static dispatch_queue_t box_apple_tls_client_queue(box_apple_tls_client_t *client) {
|
||||
if (client == NULL || client->queue == NULL) {
|
||||
return nil;
|
||||
}
|
||||
return (__bridge dispatch_queue_t)client->queue;
|
||||
}
|
||||
|
||||
static dispatch_semaphore_t box_apple_tls_ready_semaphore(box_apple_tls_client_t *client) {
|
||||
if (client == NULL || client->ready_semaphore == NULL) {
|
||||
return nil;
|
||||
}
|
||||
return (__bridge dispatch_semaphore_t)client->ready_semaphore;
|
||||
}
|
||||
|
||||
static void box_apple_tls_state_reset(box_apple_tls_state_t *state) {
|
||||
if (state == NULL) {
|
||||
return;
|
||||
}
|
||||
free(state->alpn);
|
||||
free(state->server_name);
|
||||
free(state->peer_cert_chain);
|
||||
memset(state, 0, sizeof(box_apple_tls_state_t));
|
||||
}
|
||||
|
||||
static void box_apple_tls_client_destroy(box_apple_tls_client_t *client) {
|
||||
free(client->ready_error);
|
||||
box_apple_tls_state_reset(&client->state);
|
||||
if (client->ready_semaphore != NULL) {
|
||||
CFBridgingRelease(client->ready_semaphore);
|
||||
}
|
||||
if (client->connection != NULL) {
|
||||
CFBridgingRelease(client->connection);
|
||||
}
|
||||
if (client->queue != NULL) {
|
||||
CFBridgingRelease(client->queue);
|
||||
}
|
||||
free(client);
|
||||
}
|
||||
|
||||
static void box_apple_tls_client_release(box_apple_tls_client_t *client) {
|
||||
if (client == NULL) {
|
||||
return;
|
||||
}
|
||||
if (atomic_fetch_sub(&client->ref_count, 1) == 1) {
|
||||
box_apple_tls_client_destroy(client);
|
||||
}
|
||||
}
|
||||
|
||||
static void box_set_error_string(char **error_out, NSString *message) {
|
||||
if (error_out == NULL || *error_out != NULL) {
|
||||
return;
|
||||
}
|
||||
const char *utf8 = [message UTF8String];
|
||||
*error_out = strdup(utf8 != NULL ? utf8 : "unknown error");
|
||||
}
|
||||
|
||||
static void box_set_error_message(char **error_out, const char *message) {
|
||||
if (error_out == NULL || *error_out != NULL) {
|
||||
return;
|
||||
}
|
||||
*error_out = strdup(message != NULL ? message : "unknown error");
|
||||
}
|
||||
|
||||
static void box_set_error_from_nw_error(char **error_out, nw_error_t error) {
|
||||
if (error == NULL) {
|
||||
box_set_error_message(error_out, "unknown network error");
|
||||
return;
|
||||
}
|
||||
CFErrorRef cfError = nw_error_copy_cf_error(error);
|
||||
if (cfError == NULL) {
|
||||
box_set_error_message(error_out, "unknown network error");
|
||||
return;
|
||||
}
|
||||
NSString *description = [(__bridge NSError *)cfError description];
|
||||
box_set_error_string(error_out, description);
|
||||
CFRelease(cfError);
|
||||
}
|
||||
|
||||
static char *box_apple_tls_metadata_copy_negotiated_protocol(sec_protocol_metadata_t metadata) {
|
||||
static box_sec_protocol_metadata_string_accessor_f copy_fn;
|
||||
static box_sec_protocol_metadata_string_accessor_f get_fn;
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^{
|
||||
copy_fn = (box_sec_protocol_metadata_string_accessor_f)dlsym(RTLD_DEFAULT, "sec_protocol_metadata_copy_negotiated_protocol");
|
||||
get_fn = (box_sec_protocol_metadata_string_accessor_f)dlsym(RTLD_DEFAULT, "sec_protocol_metadata_get_negotiated_protocol");
|
||||
});
|
||||
if (copy_fn != NULL) {
|
||||
return (char *)copy_fn(metadata);
|
||||
}
|
||||
if (get_fn != NULL) {
|
||||
const char *protocol = get_fn(metadata);
|
||||
if (protocol != NULL) {
|
||||
return strdup(protocol);
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static char *box_apple_tls_metadata_copy_server_name(sec_protocol_metadata_t metadata) {
|
||||
static box_sec_protocol_metadata_string_accessor_f copy_fn;
|
||||
static box_sec_protocol_metadata_string_accessor_f get_fn;
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^{
|
||||
copy_fn = (box_sec_protocol_metadata_string_accessor_f)dlsym(RTLD_DEFAULT, "sec_protocol_metadata_copy_server_name");
|
||||
get_fn = (box_sec_protocol_metadata_string_accessor_f)dlsym(RTLD_DEFAULT, "sec_protocol_metadata_get_server_name");
|
||||
});
|
||||
if (copy_fn != NULL) {
|
||||
return (char *)copy_fn(metadata);
|
||||
}
|
||||
if (get_fn != NULL) {
|
||||
const char *server_name = get_fn(metadata);
|
||||
if (server_name != NULL) {
|
||||
return strdup(server_name);
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static NSArray<NSString *> *box_split_lines(const char *content, size_t content_len) {
|
||||
if (content == NULL || content_len == 0) {
|
||||
return @[];
|
||||
}
|
||||
NSString *string = [[NSString alloc] initWithBytes:content length:content_len encoding:NSUTF8StringEncoding];
|
||||
if (string == nil) {
|
||||
return @[];
|
||||
}
|
||||
NSMutableArray<NSString *> *lines = [NSMutableArray array];
|
||||
[string enumerateLinesUsingBlock:^(NSString *line, BOOL *stop) {
|
||||
if (line.length > 0) {
|
||||
[lines addObject:line];
|
||||
}
|
||||
}];
|
||||
return lines;
|
||||
}
|
||||
|
||||
static NSArray *box_parse_certificates_from_pem(const char *pem, size_t pem_len) {
|
||||
if (pem == NULL || pem_len == 0) {
|
||||
return @[];
|
||||
}
|
||||
NSString *content = [[NSString alloc] initWithBytes:pem length:pem_len encoding:NSUTF8StringEncoding];
|
||||
if (content == nil) {
|
||||
return @[];
|
||||
}
|
||||
NSString *beginMarker = @"-----BEGIN CERTIFICATE-----";
|
||||
NSString *endMarker = @"-----END CERTIFICATE-----";
|
||||
NSMutableArray *certificates = [NSMutableArray array];
|
||||
NSUInteger searchFrom = 0;
|
||||
while (searchFrom < content.length) {
|
||||
NSRange beginRange = [content rangeOfString:beginMarker options:0 range:NSMakeRange(searchFrom, content.length - searchFrom)];
|
||||
if (beginRange.location == NSNotFound) {
|
||||
break;
|
||||
}
|
||||
NSUInteger bodyStart = beginRange.location + beginRange.length;
|
||||
NSRange endRange = [content rangeOfString:endMarker options:0 range:NSMakeRange(bodyStart, content.length - bodyStart)];
|
||||
if (endRange.location == NSNotFound) {
|
||||
break;
|
||||
}
|
||||
NSString *base64Section = [content substringWithRange:NSMakeRange(bodyStart, endRange.location - bodyStart)];
|
||||
NSArray<NSString *> *components = [base64Section componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
|
||||
NSString *base64Content = [components componentsJoinedByString:@""];
|
||||
NSData *der = [[NSData alloc] initWithBase64EncodedString:base64Content options:0];
|
||||
if (der != nil) {
|
||||
SecCertificateRef certificate = SecCertificateCreateWithData(NULL, (__bridge CFDataRef)der);
|
||||
if (certificate != NULL) {
|
||||
[certificates addObject:(__bridge id)certificate];
|
||||
CFRelease(certificate);
|
||||
}
|
||||
}
|
||||
searchFrom = endRange.location + endRange.length;
|
||||
}
|
||||
return certificates;
|
||||
}
|
||||
|
||||
static bool box_evaluate_trust(sec_trust_t trust, NSArray *anchors, bool anchor_only, NSDate *verify_date) {
|
||||
bool result = false;
|
||||
SecTrustRef trustRef = sec_trust_copy_ref(trust);
|
||||
if (trustRef == NULL) {
|
||||
return false;
|
||||
}
|
||||
if (verify_date != nil && SecTrustSetVerifyDate(trustRef, (__bridge CFDateRef)verify_date) != errSecSuccess) {
|
||||
CFRelease(trustRef);
|
||||
return false;
|
||||
}
|
||||
if (anchors.count > 0 || anchor_only) {
|
||||
CFMutableArrayRef anchorArray = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
|
||||
for (id certificate in anchors) {
|
||||
CFArrayAppendValue(anchorArray, (__bridge const void *)certificate);
|
||||
}
|
||||
SecTrustSetAnchorCertificates(trustRef, anchorArray);
|
||||
SecTrustSetAnchorCertificatesOnly(trustRef, anchor_only);
|
||||
CFRelease(anchorArray);
|
||||
}
|
||||
CFErrorRef error = NULL;
|
||||
result = SecTrustEvaluateWithError(trustRef, &error);
|
||||
if (error != NULL) {
|
||||
CFRelease(error);
|
||||
}
|
||||
CFRelease(trustRef);
|
||||
return result;
|
||||
}
|
||||
|
||||
static nw_connection_t box_apple_tls_create_connection(int connected_socket, nw_parameters_t parameters) {
|
||||
static box_nw_connection_create_with_connected_socket_and_parameters_f create_fn;
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^{
|
||||
char name[] = "sretemarap_dna_tekcos_detcennoc_htiw_etaerc_noitcennoc_wn";
|
||||
for (size_t i = 0, j = sizeof(name) - 2; i < j; i++, j--) {
|
||||
char t = name[i];
|
||||
name[i] = name[j];
|
||||
name[j] = t;
|
||||
}
|
||||
create_fn = (box_nw_connection_create_with_connected_socket_and_parameters_f)dlsym(RTLD_DEFAULT, name);
|
||||
});
|
||||
if (create_fn == NULL) {
|
||||
return nil;
|
||||
}
|
||||
return create_fn(connected_socket, parameters);
|
||||
}
|
||||
|
||||
static bool box_apple_tls_state_copy(const box_apple_tls_state_t *source, box_apple_tls_state_t *destination) {
|
||||
memset(destination, 0, sizeof(box_apple_tls_state_t));
|
||||
destination->version = source->version;
|
||||
destination->cipher_suite = source->cipher_suite;
|
||||
if (source->alpn != NULL) {
|
||||
destination->alpn = strdup(source->alpn);
|
||||
if (destination->alpn == NULL) {
|
||||
goto oom;
|
||||
}
|
||||
}
|
||||
if (source->server_name != NULL) {
|
||||
destination->server_name = strdup(source->server_name);
|
||||
if (destination->server_name == NULL) {
|
||||
goto oom;
|
||||
}
|
||||
}
|
||||
if (source->peer_cert_chain_len > 0) {
|
||||
destination->peer_cert_chain = malloc(source->peer_cert_chain_len);
|
||||
if (destination->peer_cert_chain == NULL) {
|
||||
goto oom;
|
||||
}
|
||||
memcpy(destination->peer_cert_chain, source->peer_cert_chain, source->peer_cert_chain_len);
|
||||
destination->peer_cert_chain_len = source->peer_cert_chain_len;
|
||||
}
|
||||
return true;
|
||||
|
||||
oom:
|
||||
box_apple_tls_state_reset(destination);
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool box_apple_tls_state_load(nw_connection_t connection, box_apple_tls_state_t *state, char **error_out) {
|
||||
box_apple_tls_state_reset(state);
|
||||
if (connection == nil) {
|
||||
box_set_error_message(error_out, "apple TLS: invalid client");
|
||||
return false;
|
||||
}
|
||||
|
||||
nw_protocol_definition_t tls_definition = nw_protocol_copy_tls_definition();
|
||||
nw_protocol_metadata_t metadata = nw_connection_copy_protocol_metadata(connection, tls_definition);
|
||||
if (metadata == NULL || !nw_protocol_metadata_is_tls(metadata)) {
|
||||
box_set_error_message(error_out, "apple TLS: metadata unavailable");
|
||||
return false;
|
||||
}
|
||||
|
||||
sec_protocol_metadata_t sec_metadata = nw_tls_copy_sec_protocol_metadata(metadata);
|
||||
if (sec_metadata == NULL) {
|
||||
box_set_error_message(error_out, "apple TLS: metadata unavailable");
|
||||
return false;
|
||||
}
|
||||
|
||||
state->version = (uint16_t)sec_protocol_metadata_get_negotiated_tls_protocol_version(sec_metadata);
|
||||
state->cipher_suite = (uint16_t)sec_protocol_metadata_get_negotiated_tls_ciphersuite(sec_metadata);
|
||||
state->alpn = box_apple_tls_metadata_copy_negotiated_protocol(sec_metadata);
|
||||
state->server_name = box_apple_tls_metadata_copy_server_name(sec_metadata);
|
||||
|
||||
NSMutableData *chain_data = [NSMutableData data];
|
||||
sec_protocol_metadata_access_peer_certificate_chain(sec_metadata, ^(sec_certificate_t certificate) {
|
||||
SecCertificateRef certificate_ref = sec_certificate_copy_ref(certificate);
|
||||
if (certificate_ref == NULL) {
|
||||
return;
|
||||
}
|
||||
CFDataRef certificate_data = SecCertificateCopyData(certificate_ref);
|
||||
CFRelease(certificate_ref);
|
||||
if (certificate_data == NULL) {
|
||||
return;
|
||||
}
|
||||
uint32_t certificate_len = (uint32_t)CFDataGetLength(certificate_data);
|
||||
uint32_t network_len = htonl(certificate_len);
|
||||
[chain_data appendBytes:&network_len length:sizeof(network_len)];
|
||||
[chain_data appendBytes:CFDataGetBytePtr(certificate_data) length:certificate_len];
|
||||
CFRelease(certificate_data);
|
||||
});
|
||||
if (chain_data.length > 0) {
|
||||
state->peer_cert_chain = malloc(chain_data.length);
|
||||
if (state->peer_cert_chain == NULL) {
|
||||
box_set_error_message(error_out, "apple TLS: out of memory");
|
||||
box_apple_tls_state_reset(state);
|
||||
return false;
|
||||
}
|
||||
memcpy(state->peer_cert_chain, chain_data.bytes, chain_data.length);
|
||||
state->peer_cert_chain_len = chain_data.length;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
box_apple_tls_client_t *box_apple_tls_client_create(
|
||||
int connected_socket,
|
||||
const char *server_name,
|
||||
const char *alpn,
|
||||
size_t alpn_len,
|
||||
uint16_t min_version,
|
||||
uint16_t max_version,
|
||||
bool insecure,
|
||||
const char *anchor_pem,
|
||||
size_t anchor_pem_len,
|
||||
bool anchor_only,
|
||||
bool has_verify_time,
|
||||
int64_t verify_time_unix_millis,
|
||||
char **error_out
|
||||
) {
|
||||
box_apple_tls_client_t *client = calloc(1, sizeof(box_apple_tls_client_t));
|
||||
if (client == NULL) {
|
||||
close(connected_socket);
|
||||
box_set_error_message(error_out, "apple TLS: out of memory");
|
||||
return NULL;
|
||||
}
|
||||
client->queue = (__bridge_retained void *)dispatch_queue_create("sing-box.apple-private-tls", DISPATCH_QUEUE_SERIAL);
|
||||
client->ready_semaphore = (__bridge_retained void *)dispatch_semaphore_create(0);
|
||||
atomic_init(&client->ref_count, 1);
|
||||
atomic_init(&client->ready, false);
|
||||
atomic_init(&client->ready_done, false);
|
||||
|
||||
NSArray<NSString *> *alpnList = box_split_lines(alpn, alpn_len);
|
||||
NSArray *anchors = box_parse_certificates_from_pem(anchor_pem, anchor_pem_len);
|
||||
NSDate *verifyDate = nil;
|
||||
if (has_verify_time) {
|
||||
verifyDate = [NSDate dateWithTimeIntervalSince1970:(NSTimeInterval)verify_time_unix_millis / 1000.0];
|
||||
}
|
||||
nw_parameters_t parameters = nw_parameters_create_secure_tcp(^(nw_protocol_options_t tls_options) {
|
||||
sec_protocol_options_t sec_options = nw_tls_copy_sec_protocol_options(tls_options);
|
||||
if (min_version != 0) {
|
||||
sec_protocol_options_set_min_tls_protocol_version(sec_options, (tls_protocol_version_t)min_version);
|
||||
}
|
||||
if (max_version != 0) {
|
||||
sec_protocol_options_set_max_tls_protocol_version(sec_options, (tls_protocol_version_t)max_version);
|
||||
}
|
||||
if (server_name != NULL && server_name[0] != '\0') {
|
||||
sec_protocol_options_set_tls_server_name(sec_options, server_name);
|
||||
}
|
||||
for (NSString *protocol in alpnList) {
|
||||
sec_protocol_options_add_tls_application_protocol(sec_options, protocol.UTF8String);
|
||||
}
|
||||
sec_protocol_options_set_peer_authentication_required(sec_options, !insecure);
|
||||
if (insecure) {
|
||||
sec_protocol_options_set_verify_block(sec_options, ^(sec_protocol_metadata_t metadata, sec_trust_t trust, sec_protocol_verify_complete_t complete) {
|
||||
complete(true);
|
||||
}, box_apple_tls_client_queue(client));
|
||||
} else if (verifyDate != nil || anchors.count > 0 || anchor_only) {
|
||||
sec_protocol_options_set_verify_block(sec_options, ^(sec_protocol_metadata_t metadata, sec_trust_t trust, sec_protocol_verify_complete_t complete) {
|
||||
complete(box_evaluate_trust(trust, anchors, anchor_only, verifyDate));
|
||||
}, box_apple_tls_client_queue(client));
|
||||
}
|
||||
}, NW_PARAMETERS_DEFAULT_CONFIGURATION);
|
||||
|
||||
nw_connection_t connection = box_apple_tls_create_connection(connected_socket, parameters);
|
||||
if (connection == NULL) {
|
||||
close(connected_socket);
|
||||
if (client->ready_semaphore != NULL) {
|
||||
CFBridgingRelease(client->ready_semaphore);
|
||||
}
|
||||
if (client->queue != NULL) {
|
||||
CFBridgingRelease(client->queue);
|
||||
}
|
||||
free(client);
|
||||
box_set_error_message(error_out, "apple TLS: failed to create connection");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
client->connection = (__bridge_retained void *)connection;
|
||||
atomic_fetch_add(&client->ref_count, 1);
|
||||
|
||||
nw_connection_set_state_changed_handler(connection, ^(nw_connection_state_t state, nw_error_t error) {
|
||||
switch (state) {
|
||||
case nw_connection_state_ready:
|
||||
if (!atomic_load(&client->ready_done)) {
|
||||
atomic_store(&client->ready, box_apple_tls_state_load(connection, &client->state, &client->ready_error));
|
||||
atomic_store(&client->ready_done, true);
|
||||
dispatch_semaphore_signal(box_apple_tls_ready_semaphore(client));
|
||||
}
|
||||
break;
|
||||
case nw_connection_state_failed:
|
||||
if (!atomic_load(&client->ready_done)) {
|
||||
box_set_error_from_nw_error(&client->ready_error, error);
|
||||
atomic_store(&client->ready_done, true);
|
||||
dispatch_semaphore_signal(box_apple_tls_ready_semaphore(client));
|
||||
}
|
||||
break;
|
||||
case nw_connection_state_cancelled:
|
||||
if (!atomic_load(&client->ready_done)) {
|
||||
box_set_error_from_nw_error(&client->ready_error, error);
|
||||
atomic_store(&client->ready_done, true);
|
||||
dispatch_semaphore_signal(box_apple_tls_ready_semaphore(client));
|
||||
}
|
||||
box_apple_tls_client_release(client);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
});
|
||||
nw_connection_set_queue(connection, box_apple_tls_client_queue(client));
|
||||
nw_connection_start(connection);
|
||||
return client;
|
||||
}
|
||||
|
||||
int box_apple_tls_client_wait_ready(box_apple_tls_client_t *client, int timeout_msec, char **error_out) {
|
||||
dispatch_semaphore_t ready_semaphore = box_apple_tls_ready_semaphore(client);
|
||||
if (ready_semaphore == nil) {
|
||||
box_set_error_message(error_out, "apple TLS: invalid client");
|
||||
return 0;
|
||||
}
|
||||
if (!atomic_load(&client->ready_done)) {
|
||||
dispatch_time_t timeout = DISPATCH_TIME_FOREVER;
|
||||
if (timeout_msec >= 0) {
|
||||
timeout = dispatch_time(DISPATCH_TIME_NOW, (int64_t)timeout_msec * NSEC_PER_MSEC);
|
||||
}
|
||||
long wait_result = dispatch_semaphore_wait(ready_semaphore, timeout);
|
||||
if (wait_result != 0) {
|
||||
return -2;
|
||||
}
|
||||
}
|
||||
if (atomic_load(&client->ready)) {
|
||||
return 1;
|
||||
}
|
||||
if (client->ready_error != NULL) {
|
||||
if (error_out != NULL) {
|
||||
*error_out = client->ready_error;
|
||||
client->ready_error = NULL;
|
||||
} else {
|
||||
free(client->ready_error);
|
||||
client->ready_error = NULL;
|
||||
}
|
||||
} else {
|
||||
box_set_error_message(error_out, "apple TLS: handshake failed");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void box_apple_tls_client_cancel(box_apple_tls_client_t *client) {
|
||||
if (client == NULL) {
|
||||
return;
|
||||
}
|
||||
nw_connection_t connection = box_apple_tls_connection(client);
|
||||
if (connection != nil) {
|
||||
nw_connection_cancel(connection);
|
||||
}
|
||||
}
|
||||
|
||||
void box_apple_tls_client_free(box_apple_tls_client_t *client) {
|
||||
if (client == NULL) {
|
||||
return;
|
||||
}
|
||||
nw_connection_t connection = box_apple_tls_connection(client);
|
||||
if (connection != nil) {
|
||||
nw_connection_cancel(connection);
|
||||
}
|
||||
box_apple_tls_client_release(client);
|
||||
}
|
||||
|
||||
ssize_t box_apple_tls_client_read(box_apple_tls_client_t *client, void *buffer, size_t buffer_len, int timeout_msec, bool *eof_out, char **error_out) {
|
||||
nw_connection_t connection = box_apple_tls_connection(client);
|
||||
if (connection == nil) {
|
||||
box_set_error_message(error_out, "apple TLS: invalid client");
|
||||
return -1;
|
||||
}
|
||||
|
||||
dispatch_semaphore_t read_semaphore = dispatch_semaphore_create(0);
|
||||
__block NSData *content_data = nil;
|
||||
__block bool read_eof = false;
|
||||
__block char *local_error = NULL;
|
||||
|
||||
nw_connection_receive(connection, 1, (uint32_t)buffer_len, ^(dispatch_data_t content, nw_content_context_t context, bool is_complete, nw_error_t error) {
|
||||
if (content != NULL) {
|
||||
const void *mapped = NULL;
|
||||
size_t mapped_len = 0;
|
||||
dispatch_data_t mapped_data = dispatch_data_create_map(content, &mapped, &mapped_len);
|
||||
if (mapped != NULL && mapped_len > 0) {
|
||||
content_data = [NSData dataWithBytes:mapped length:mapped_len];
|
||||
}
|
||||
(void)mapped_data;
|
||||
}
|
||||
if (error != NULL && content_data.length == 0) {
|
||||
box_set_error_from_nw_error(&local_error, error);
|
||||
}
|
||||
if (is_complete && (context == NULL || nw_content_context_get_is_final(context))) {
|
||||
read_eof = true;
|
||||
}
|
||||
dispatch_semaphore_signal(read_semaphore);
|
||||
});
|
||||
|
||||
dispatch_time_t wait_deadline = DISPATCH_TIME_FOREVER;
|
||||
if (timeout_msec >= 0) {
|
||||
wait_deadline = dispatch_time(DISPATCH_TIME_NOW, (int64_t)timeout_msec * NSEC_PER_MSEC);
|
||||
}
|
||||
long wait_result = dispatch_semaphore_wait(read_semaphore, wait_deadline);
|
||||
if (wait_result != 0) {
|
||||
nw_connection_cancel(connection);
|
||||
dispatch_semaphore_wait(read_semaphore, DISPATCH_TIME_FOREVER);
|
||||
if (local_error != NULL) {
|
||||
free(local_error);
|
||||
local_error = NULL;
|
||||
}
|
||||
return -2;
|
||||
}
|
||||
if (local_error != NULL) {
|
||||
if (error_out != NULL) {
|
||||
*error_out = local_error;
|
||||
} else {
|
||||
free(local_error);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
if (eof_out != NULL) {
|
||||
*eof_out = read_eof;
|
||||
}
|
||||
if (content_data == nil || content_data.length == 0) {
|
||||
return 0;
|
||||
}
|
||||
memcpy(buffer, content_data.bytes, content_data.length);
|
||||
return (ssize_t)content_data.length;
|
||||
}
|
||||
|
||||
ssize_t box_apple_tls_client_write(box_apple_tls_client_t *client, const void *buffer, size_t buffer_len, int timeout_msec, char **error_out) {
|
||||
nw_connection_t connection = box_apple_tls_connection(client);
|
||||
if (connection == nil) {
|
||||
box_set_error_message(error_out, "apple TLS: invalid client");
|
||||
return -1;
|
||||
}
|
||||
if (buffer_len == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
void *content_copy = malloc(buffer_len);
|
||||
dispatch_queue_t queue = box_apple_tls_client_queue(client);
|
||||
if (content_copy == NULL) {
|
||||
free(content_copy);
|
||||
box_set_error_message(error_out, "apple TLS: out of memory");
|
||||
return -1;
|
||||
}
|
||||
if (queue == nil) {
|
||||
free(content_copy);
|
||||
box_set_error_message(error_out, "apple TLS: invalid client");
|
||||
return -1;
|
||||
}
|
||||
memcpy(content_copy, buffer, buffer_len);
|
||||
dispatch_data_t content = dispatch_data_create(content_copy, buffer_len, queue, ^{
|
||||
free(content_copy);
|
||||
});
|
||||
|
||||
dispatch_semaphore_t write_semaphore = dispatch_semaphore_create(0);
|
||||
__block char *local_error = NULL;
|
||||
|
||||
nw_connection_send(connection, content, NW_CONNECTION_DEFAULT_STREAM_CONTEXT, false, ^(nw_error_t error) {
|
||||
if (error != NULL) {
|
||||
box_set_error_from_nw_error(&local_error, error);
|
||||
}
|
||||
dispatch_semaphore_signal(write_semaphore);
|
||||
});
|
||||
|
||||
dispatch_time_t wait_deadline = DISPATCH_TIME_FOREVER;
|
||||
if (timeout_msec >= 0) {
|
||||
wait_deadline = dispatch_time(DISPATCH_TIME_NOW, (int64_t)timeout_msec * NSEC_PER_MSEC);
|
||||
}
|
||||
long wait_result = dispatch_semaphore_wait(write_semaphore, wait_deadline);
|
||||
if (wait_result != 0) {
|
||||
nw_connection_cancel(connection);
|
||||
dispatch_semaphore_wait(write_semaphore, DISPATCH_TIME_FOREVER);
|
||||
if (local_error != NULL) {
|
||||
free(local_error);
|
||||
local_error = NULL;
|
||||
}
|
||||
return -2;
|
||||
}
|
||||
if (local_error != NULL) {
|
||||
if (error_out != NULL) {
|
||||
*error_out = local_error;
|
||||
} else {
|
||||
free(local_error);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
return (ssize_t)buffer_len;
|
||||
}
|
||||
|
||||
bool box_apple_tls_client_copy_state(box_apple_tls_client_t *client, box_apple_tls_state_t *state, char **error_out) {
|
||||
dispatch_queue_t queue = box_apple_tls_client_queue(client);
|
||||
if (queue == nil || state == NULL) {
|
||||
box_set_error_message(error_out, "apple TLS: invalid client");
|
||||
return false;
|
||||
}
|
||||
memset(state, 0, sizeof(box_apple_tls_state_t));
|
||||
__block bool copied = false;
|
||||
__block char *local_error = NULL;
|
||||
dispatch_sync(queue, ^{
|
||||
if (!atomic_load(&client->ready)) {
|
||||
box_set_error_message(&local_error, "apple TLS: metadata unavailable");
|
||||
return;
|
||||
}
|
||||
if (!box_apple_tls_state_copy(&client->state, state)) {
|
||||
box_set_error_message(&local_error, "apple TLS: out of memory");
|
||||
return;
|
||||
}
|
||||
copied = true;
|
||||
});
|
||||
if (copied) {
|
||||
return true;
|
||||
}
|
||||
if (local_error != NULL) {
|
||||
if (error_out != NULL) {
|
||||
*error_out = local_error;
|
||||
} else {
|
||||
free(local_error);
|
||||
}
|
||||
}
|
||||
box_apple_tls_state_reset(state);
|
||||
return false;
|
||||
}
|
||||
|
||||
void box_apple_tls_state_free(box_apple_tls_state_t *state) {
|
||||
box_apple_tls_state_reset(state);
|
||||
}
|
||||
@@ -0,0 +1,453 @@
|
||||
//go:build darwin && cgo
|
||||
|
||||
package tls
|
||||
|
||||
import (
|
||||
"context"
|
||||
stdtls "crypto/tls"
|
||||
"errors"
|
||||
"net"
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/sagernet/sing-box/option"
|
||||
"github.com/sagernet/sing/common/json/badoption"
|
||||
"github.com/sagernet/sing/common/logger"
|
||||
)
|
||||
|
||||
const appleTLSTestTimeout = 5 * time.Second
|
||||
|
||||
const (
|
||||
appleTLSSuccessHandshakeLoops = 20
|
||||
appleTLSFailureRecoveryLoops = 10
|
||||
)
|
||||
|
||||
type appleTLSServerResult struct {
|
||||
state stdtls.ConnectionState
|
||||
err error
|
||||
}
|
||||
|
||||
func TestAppleClientHandshakeAppliesALPNAndVersion(t *testing.T) {
|
||||
serverCertificate, serverCertificatePEM := newAppleTestCertificate(t, "localhost")
|
||||
for index := 0; index < appleTLSSuccessHandshakeLoops; index++ {
|
||||
serverResult, serverAddress := startAppleTLSTestServer(t, &stdtls.Config{
|
||||
Certificates: []stdtls.Certificate{serverCertificate},
|
||||
MinVersion: stdtls.VersionTLS12,
|
||||
MaxVersion: stdtls.VersionTLS12,
|
||||
NextProtos: []string{"h2"},
|
||||
})
|
||||
|
||||
clientConn, err := newAppleTestClientConn(t, serverAddress, option.OutboundTLSOptions{
|
||||
Enabled: true,
|
||||
Engine: "apple",
|
||||
ServerName: "localhost",
|
||||
MinVersion: "1.2",
|
||||
MaxVersion: "1.2",
|
||||
ALPN: badoption.Listable[string]{"h2"},
|
||||
Certificate: badoption.Listable[string]{serverCertificatePEM},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("iteration %d: %v", index, err)
|
||||
}
|
||||
|
||||
clientState := clientConn.ConnectionState()
|
||||
if clientState.Version != stdtls.VersionTLS12 {
|
||||
_ = clientConn.Close()
|
||||
t.Fatalf("iteration %d: unexpected negotiated version: %x", index, clientState.Version)
|
||||
}
|
||||
if clientState.NegotiatedProtocol != "h2" {
|
||||
_ = clientConn.Close()
|
||||
t.Fatalf("iteration %d: unexpected negotiated protocol: %q", index, clientState.NegotiatedProtocol)
|
||||
}
|
||||
_ = clientConn.Close()
|
||||
|
||||
result := <-serverResult
|
||||
if result.err != nil {
|
||||
t.Fatalf("iteration %d: %v", index, result.err)
|
||||
}
|
||||
if result.state.Version != stdtls.VersionTLS12 {
|
||||
t.Fatalf("iteration %d: server negotiated unexpected version: %x", index, result.state.Version)
|
||||
}
|
||||
if result.state.NegotiatedProtocol != "h2" {
|
||||
t.Fatalf("iteration %d: server negotiated unexpected protocol: %q", index, result.state.NegotiatedProtocol)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestAppleClientHandshakeRejectsVersionMismatch(t *testing.T) {
|
||||
serverCertificate, serverCertificatePEM := newAppleTestCertificate(t, "localhost")
|
||||
serverResult, serverAddress := startAppleTLSTestServer(t, &stdtls.Config{
|
||||
Certificates: []stdtls.Certificate{serverCertificate},
|
||||
MinVersion: stdtls.VersionTLS13,
|
||||
MaxVersion: stdtls.VersionTLS13,
|
||||
})
|
||||
|
||||
clientConn, err := newAppleTestClientConn(t, serverAddress, option.OutboundTLSOptions{
|
||||
Enabled: true,
|
||||
Engine: "apple",
|
||||
ServerName: "localhost",
|
||||
MaxVersion: "1.2",
|
||||
Certificate: badoption.Listable[string]{serverCertificatePEM},
|
||||
})
|
||||
if err == nil {
|
||||
clientConn.Close()
|
||||
t.Fatal("expected version mismatch handshake to fail")
|
||||
}
|
||||
|
||||
if result := <-serverResult; result.err == nil {
|
||||
t.Fatal("expected server handshake to fail on version mismatch")
|
||||
}
|
||||
}
|
||||
|
||||
func TestAppleClientHandshakeRejectsServerNameMismatch(t *testing.T) {
|
||||
serverCertificate, serverCertificatePEM := newAppleTestCertificate(t, "localhost")
|
||||
serverResult, serverAddress := startAppleTLSTestServer(t, &stdtls.Config{
|
||||
Certificates: []stdtls.Certificate{serverCertificate},
|
||||
})
|
||||
|
||||
clientConn, err := newAppleTestClientConn(t, serverAddress, option.OutboundTLSOptions{
|
||||
Enabled: true,
|
||||
Engine: "apple",
|
||||
ServerName: "example.com",
|
||||
Certificate: badoption.Listable[string]{serverCertificatePEM},
|
||||
})
|
||||
if err == nil {
|
||||
clientConn.Close()
|
||||
t.Fatal("expected server name mismatch handshake to fail")
|
||||
}
|
||||
|
||||
if result := <-serverResult; result.err == nil {
|
||||
t.Fatal("expected server handshake to fail on server name mismatch")
|
||||
}
|
||||
}
|
||||
|
||||
func TestAppleClientHandshakeRecoversAfterFailure(t *testing.T) {
|
||||
serverCertificate, serverCertificatePEM := newAppleTestCertificate(t, "localhost")
|
||||
testCases := []struct {
|
||||
name string
|
||||
serverConfig *stdtls.Config
|
||||
clientOptions option.OutboundTLSOptions
|
||||
}{
|
||||
{
|
||||
name: "version mismatch",
|
||||
serverConfig: &stdtls.Config{
|
||||
Certificates: []stdtls.Certificate{serverCertificate},
|
||||
MinVersion: stdtls.VersionTLS13,
|
||||
MaxVersion: stdtls.VersionTLS13,
|
||||
},
|
||||
clientOptions: option.OutboundTLSOptions{
|
||||
Enabled: true,
|
||||
Engine: "apple",
|
||||
ServerName: "localhost",
|
||||
MaxVersion: "1.2",
|
||||
Certificate: badoption.Listable[string]{serverCertificatePEM},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "server name mismatch",
|
||||
serverConfig: &stdtls.Config{
|
||||
Certificates: []stdtls.Certificate{serverCertificate},
|
||||
},
|
||||
clientOptions: option.OutboundTLSOptions{
|
||||
Enabled: true,
|
||||
Engine: "apple",
|
||||
ServerName: "example.com",
|
||||
Certificate: badoption.Listable[string]{serverCertificatePEM},
|
||||
},
|
||||
},
|
||||
}
|
||||
successClientOptions := option.OutboundTLSOptions{
|
||||
Enabled: true,
|
||||
Engine: "apple",
|
||||
ServerName: "localhost",
|
||||
MinVersion: "1.2",
|
||||
MaxVersion: "1.2",
|
||||
ALPN: badoption.Listable[string]{"h2"},
|
||||
Certificate: badoption.Listable[string]{serverCertificatePEM},
|
||||
}
|
||||
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
for index := 0; index < appleTLSFailureRecoveryLoops; index++ {
|
||||
failedResult, failedAddress := startAppleTLSTestServer(t, testCase.serverConfig)
|
||||
failedConn, err := newAppleTestClientConn(t, failedAddress, testCase.clientOptions)
|
||||
if err == nil {
|
||||
_ = failedConn.Close()
|
||||
t.Fatalf("iteration %d: expected handshake failure", index)
|
||||
}
|
||||
if result := <-failedResult; result.err == nil {
|
||||
t.Fatalf("iteration %d: expected server handshake failure", index)
|
||||
}
|
||||
|
||||
successResult, successAddress := startAppleTLSTestServer(t, &stdtls.Config{
|
||||
Certificates: []stdtls.Certificate{serverCertificate},
|
||||
MinVersion: stdtls.VersionTLS12,
|
||||
MaxVersion: stdtls.VersionTLS12,
|
||||
NextProtos: []string{"h2"},
|
||||
})
|
||||
successConn, err := newAppleTestClientConn(t, successAddress, successClientOptions)
|
||||
if err != nil {
|
||||
t.Fatalf("iteration %d: follow-up handshake failed: %v", index, err)
|
||||
}
|
||||
clientState := successConn.ConnectionState()
|
||||
if clientState.NegotiatedProtocol != "h2" {
|
||||
_ = successConn.Close()
|
||||
t.Fatalf("iteration %d: unexpected negotiated protocol after failure: %q", index, clientState.NegotiatedProtocol)
|
||||
}
|
||||
_ = successConn.Close()
|
||||
|
||||
result := <-successResult
|
||||
if result.err != nil {
|
||||
t.Fatalf("iteration %d: follow-up server handshake failed: %v", index, result.err)
|
||||
}
|
||||
if result.state.NegotiatedProtocol != "h2" {
|
||||
t.Fatalf("iteration %d: follow-up server negotiated unexpected protocol: %q", index, result.state.NegotiatedProtocol)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestAppleClientReadDeadline(t *testing.T) {
|
||||
serverCertificate, serverCertificatePEM := newAppleTestCertificate(t, "localhost")
|
||||
serverDone, serverAddress := startAppleTLSSilentServer(t, &stdtls.Config{
|
||||
Certificates: []stdtls.Certificate{serverCertificate},
|
||||
MinVersion: stdtls.VersionTLS12,
|
||||
MaxVersion: stdtls.VersionTLS12,
|
||||
})
|
||||
|
||||
clientConn, err := newAppleTestClientConn(t, serverAddress, option.OutboundTLSOptions{
|
||||
Enabled: true,
|
||||
Engine: "apple",
|
||||
ServerName: "localhost",
|
||||
MinVersion: "1.2",
|
||||
MaxVersion: "1.2",
|
||||
Certificate: badoption.Listable[string]{serverCertificatePEM},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer clientConn.Close()
|
||||
defer close(serverDone)
|
||||
|
||||
err = clientConn.SetReadDeadline(time.Now().Add(200 * time.Millisecond))
|
||||
if err != nil {
|
||||
t.Fatalf("SetReadDeadline: %v", err)
|
||||
}
|
||||
|
||||
readDone := make(chan error, 1)
|
||||
buffer := make([]byte, 64)
|
||||
go func() {
|
||||
_, readErr := clientConn.Read(buffer)
|
||||
readDone <- readErr
|
||||
}()
|
||||
|
||||
select {
|
||||
case readErr := <-readDone:
|
||||
if !errors.Is(readErr, os.ErrDeadlineExceeded) {
|
||||
t.Fatalf("expected os.ErrDeadlineExceeded, got %v", readErr)
|
||||
}
|
||||
case <-time.After(2 * time.Second):
|
||||
t.Fatal("Read did not return within 2s after deadline")
|
||||
}
|
||||
|
||||
_, err = clientConn.Read(buffer)
|
||||
if !errors.Is(err, os.ErrDeadlineExceeded) {
|
||||
t.Fatalf("sticky deadline: expected os.ErrDeadlineExceeded, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAppleClientSetDeadlineClearsPreExpiredSticky(t *testing.T) {
|
||||
serverCertificate, serverCertificatePEM := newAppleTestCertificate(t, "localhost")
|
||||
serverDone, serverAddress := startAppleTLSSilentServer(t, &stdtls.Config{
|
||||
Certificates: []stdtls.Certificate{serverCertificate},
|
||||
MinVersion: stdtls.VersionTLS12,
|
||||
MaxVersion: stdtls.VersionTLS12,
|
||||
})
|
||||
|
||||
clientConn, err := newAppleTestClientConn(t, serverAddress, option.OutboundTLSOptions{
|
||||
Enabled: true,
|
||||
Engine: "apple",
|
||||
ServerName: "localhost",
|
||||
MinVersion: "1.2",
|
||||
MaxVersion: "1.2",
|
||||
Certificate: badoption.Listable[string]{serverCertificatePEM},
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer clientConn.Close()
|
||||
defer close(serverDone)
|
||||
|
||||
err = clientConn.SetReadDeadline(time.Now().Add(-time.Second))
|
||||
if err != nil {
|
||||
t.Fatalf("SetReadDeadline past: %v", err)
|
||||
}
|
||||
|
||||
// Pre-expired deadline trips sticky flag without cancelling nw_connection
|
||||
// (prepareReadTimeout short-circuits before the C read is issued).
|
||||
buffer := make([]byte, 64)
|
||||
_, err = clientConn.Read(buffer)
|
||||
if !errors.Is(err, os.ErrDeadlineExceeded) {
|
||||
t.Fatalf("pre-expired: expected os.ErrDeadlineExceeded, got %v", err)
|
||||
}
|
||||
|
||||
err = clientConn.SetReadDeadline(time.Time{})
|
||||
if err != nil {
|
||||
t.Fatalf("SetReadDeadline zero: %v", err)
|
||||
}
|
||||
|
||||
newDeadline := 300 * time.Millisecond
|
||||
err = clientConn.SetReadDeadline(time.Now().Add(newDeadline))
|
||||
if err != nil {
|
||||
t.Fatalf("SetReadDeadline future: %v", err)
|
||||
}
|
||||
|
||||
readStart := time.Now()
|
||||
_, err = clientConn.Read(buffer)
|
||||
readElapsed := time.Since(readStart)
|
||||
if !errors.Is(err, os.ErrDeadlineExceeded) {
|
||||
t.Fatalf("after clear: expected os.ErrDeadlineExceeded, got %v", err)
|
||||
}
|
||||
if readElapsed < newDeadline-50*time.Millisecond {
|
||||
t.Fatalf("sticky flag was not cleared: Read returned after %v, expected ~%v", readElapsed, newDeadline)
|
||||
}
|
||||
}
|
||||
|
||||
func startAppleTLSSilentServer(t *testing.T, tlsConfig *stdtls.Config) (chan<- struct{}, string) {
|
||||
t.Helper()
|
||||
|
||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
listener.Close()
|
||||
})
|
||||
|
||||
if tcpListener, isTCP := listener.(*net.TCPListener); isTCP {
|
||||
err = tcpListener.SetDeadline(time.Now().Add(appleTLSTestTimeout))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
conn, acceptErr := listener.Accept()
|
||||
if acceptErr != nil {
|
||||
return
|
||||
}
|
||||
defer conn.Close()
|
||||
handshakeErr := conn.SetDeadline(time.Now().Add(appleTLSTestTimeout))
|
||||
if handshakeErr != nil {
|
||||
return
|
||||
}
|
||||
tlsConn := stdtls.Server(conn, tlsConfig)
|
||||
defer tlsConn.Close()
|
||||
handshakeErr = tlsConn.Handshake()
|
||||
if handshakeErr != nil {
|
||||
return
|
||||
}
|
||||
handshakeErr = conn.SetDeadline(time.Time{})
|
||||
if handshakeErr != nil {
|
||||
return
|
||||
}
|
||||
<-done
|
||||
}()
|
||||
return done, listener.Addr().String()
|
||||
}
|
||||
|
||||
func newAppleTestCertificate(t *testing.T, serverName string) (stdtls.Certificate, string) {
|
||||
t.Helper()
|
||||
|
||||
privateKeyPEM, certificatePEM, err := GenerateCertificate(nil, nil, time.Now, serverName, time.Now().Add(time.Hour))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
certificate, err := stdtls.X509KeyPair(certificatePEM, privateKeyPEM)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return certificate, string(certificatePEM)
|
||||
}
|
||||
|
||||
func startAppleTLSTestServer(t *testing.T, tlsConfig *stdtls.Config) (<-chan appleTLSServerResult, string) {
|
||||
t.Helper()
|
||||
|
||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
listener.Close()
|
||||
})
|
||||
|
||||
if tcpListener, isTCP := listener.(*net.TCPListener); isTCP {
|
||||
err = tcpListener.SetDeadline(time.Now().Add(appleTLSTestTimeout))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
result := make(chan appleTLSServerResult, 1)
|
||||
go func() {
|
||||
defer close(result)
|
||||
|
||||
conn, err := listener.Accept()
|
||||
if err != nil {
|
||||
result <- appleTLSServerResult{err: err}
|
||||
return
|
||||
}
|
||||
defer conn.Close()
|
||||
|
||||
err = conn.SetDeadline(time.Now().Add(appleTLSTestTimeout))
|
||||
if err != nil {
|
||||
result <- appleTLSServerResult{err: err}
|
||||
return
|
||||
}
|
||||
|
||||
tlsConn := stdtls.Server(conn, tlsConfig)
|
||||
defer tlsConn.Close()
|
||||
|
||||
err = tlsConn.Handshake()
|
||||
if err != nil {
|
||||
result <- appleTLSServerResult{err: err}
|
||||
return
|
||||
}
|
||||
|
||||
result <- appleTLSServerResult{state: tlsConn.ConnectionState()}
|
||||
}()
|
||||
|
||||
return result, listener.Addr().String()
|
||||
}
|
||||
|
||||
func newAppleTestClientConn(t *testing.T, serverAddress string, options option.OutboundTLSOptions) (Conn, error) {
|
||||
t.Helper()
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), appleTLSTestTimeout)
|
||||
t.Cleanup(cancel)
|
||||
|
||||
clientConfig, err := NewClientWithOptions(ClientOptions{
|
||||
Context: ctx,
|
||||
Logger: logger.NOP(),
|
||||
ServerAddress: "",
|
||||
Options: options,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
conn, err := net.DialTimeout("tcp", serverAddress, appleTLSTestTimeout)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
tlsConn, err := ClientHandshake(ctx, conn, clientConfig)
|
||||
if err != nil {
|
||||
conn.Close()
|
||||
return nil, err
|
||||
}
|
||||
return tlsConn, nil
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
//go:build !darwin || !cgo
|
||||
|
||||
package tls
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/sagernet/sing-box/option"
|
||||
E "github.com/sagernet/sing/common/exceptions"
|
||||
"github.com/sagernet/sing/common/logger"
|
||||
)
|
||||
|
||||
func newAppleClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions, allowEmptyServerName bool) (Config, error) {
|
||||
return nil, E.New("Apple TLS engine is not available on non-Apple platforms")
|
||||
}
|
||||
+21
-12
@@ -10,12 +10,15 @@ import (
|
||||
"github.com/sagernet/sing-box/common/badtls"
|
||||
C "github.com/sagernet/sing-box/constant"
|
||||
"github.com/sagernet/sing-box/option"
|
||||
E "github.com/sagernet/sing/common/exceptions"
|
||||
"github.com/sagernet/sing/common/logger"
|
||||
M "github.com/sagernet/sing/common/metadata"
|
||||
N "github.com/sagernet/sing/common/network"
|
||||
aTLS "github.com/sagernet/sing/common/tls"
|
||||
)
|
||||
|
||||
var errMissingServerName = E.New("missing server_name or insecure=true")
|
||||
|
||||
func NewDialerFromOptions(ctx context.Context, logger logger.ContextLogger, dialer N.Dialer, serverAddress string, options option.OutboundTLSOptions) (N.Dialer, error) {
|
||||
if !options.Enabled {
|
||||
return dialer, nil
|
||||
@@ -42,11 +45,12 @@ func NewClient(ctx context.Context, logger logger.ContextLogger, serverAddress s
|
||||
}
|
||||
|
||||
type ClientOptions struct {
|
||||
Context context.Context
|
||||
Logger logger.ContextLogger
|
||||
ServerAddress string
|
||||
Options option.OutboundTLSOptions
|
||||
KTLSCompatible bool
|
||||
Context context.Context
|
||||
Logger logger.ContextLogger
|
||||
ServerAddress string
|
||||
Options option.OutboundTLSOptions
|
||||
AllowEmptyServerName bool
|
||||
KTLSCompatible bool
|
||||
}
|
||||
|
||||
func NewClientWithOptions(options ClientOptions) (Config, error) {
|
||||
@@ -61,17 +65,22 @@ func NewClientWithOptions(options ClientOptions) (Config, error) {
|
||||
if options.Options.KernelRx {
|
||||
options.Logger.Warn("enabling kTLS RX will definitely reduce performance, please checkout https://sing-box.sagernet.org/configuration/shared/tls/#kernel_rx")
|
||||
}
|
||||
if options.Options.Reality != nil && options.Options.Reality.Enabled {
|
||||
return NewRealityClient(options.Context, options.Logger, options.ServerAddress, options.Options)
|
||||
} else if options.Options.UTLS != nil && options.Options.UTLS.Enabled {
|
||||
return NewUTLSClient(options.Context, options.Logger, options.ServerAddress, options.Options)
|
||||
switch options.Options.Engine {
|
||||
case C.TLSEngineDefault, "go":
|
||||
case C.TLSEngineApple:
|
||||
return newAppleClient(options.Context, options.Logger, options.ServerAddress, options.Options, options.AllowEmptyServerName)
|
||||
default:
|
||||
return nil, E.New("unknown tls engine: ", options.Options.Engine)
|
||||
}
|
||||
return NewSTDClient(options.Context, options.Logger, options.ServerAddress, options.Options)
|
||||
if options.Options.Reality != nil && options.Options.Reality.Enabled {
|
||||
return newRealityClient(options.Context, options.Logger, options.ServerAddress, options.Options, options.AllowEmptyServerName)
|
||||
} else if options.Options.UTLS != nil && options.Options.UTLS.Enabled {
|
||||
return newUTLSClient(options.Context, options.Logger, options.ServerAddress, options.Options, options.AllowEmptyServerName)
|
||||
}
|
||||
return newSTDClient(options.Context, options.Logger, options.ServerAddress, options.Options, options.AllowEmptyServerName)
|
||||
}
|
||||
|
||||
func ClientHandshake(ctx context.Context, conn net.Conn, config Config) (Conn, error) {
|
||||
ctx, cancel := context.WithTimeout(ctx, C.TCPTimeout)
|
||||
defer cancel()
|
||||
tlsConn, err := aTLS.ClientHandshake(ctx, conn, config)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -52,11 +52,15 @@ type RealityClientConfig struct {
|
||||
}
|
||||
|
||||
func NewRealityClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions) (Config, error) {
|
||||
return newRealityClient(ctx, logger, serverAddress, options, false)
|
||||
}
|
||||
|
||||
func newRealityClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions, allowEmptyServerName bool) (Config, error) {
|
||||
if options.UTLS == nil || !options.UTLS.Enabled {
|
||||
return nil, E.New("uTLS is required by reality client")
|
||||
}
|
||||
|
||||
uClient, err := NewUTLSClient(ctx, logger, serverAddress, options)
|
||||
uClient, err := newUTLSClient(ctx, logger, serverAddress, options, allowEmptyServerName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -108,6 +112,14 @@ func (e *RealityClientConfig) SetNextProtos(nextProto []string) {
|
||||
e.uClient.SetNextProtos(nextProto)
|
||||
}
|
||||
|
||||
func (e *RealityClientConfig) HandshakeTimeout() time.Duration {
|
||||
return e.uClient.HandshakeTimeout()
|
||||
}
|
||||
|
||||
func (e *RealityClientConfig) SetHandshakeTimeout(timeout time.Duration) {
|
||||
e.uClient.SetHandshakeTimeout(timeout)
|
||||
}
|
||||
|
||||
func (e *RealityClientConfig) STDConfig() (*STDConfig, error) {
|
||||
return nil, E.New("unsupported usage for reality")
|
||||
}
|
||||
|
||||
@@ -26,7 +26,8 @@ import (
|
||||
var _ ServerConfigCompat = (*RealityServerConfig)(nil)
|
||||
|
||||
type RealityServerConfig struct {
|
||||
config *utls.RealityConfig
|
||||
config *utls.RealityConfig
|
||||
handshakeTimeout time.Duration
|
||||
}
|
||||
|
||||
func NewRealityServer(ctx context.Context, logger log.ContextLogger, options option.InboundTLSOptions) (ServerConfig, error) {
|
||||
@@ -130,7 +131,16 @@ func NewRealityServer(ctx context.Context, logger log.ContextLogger, options opt
|
||||
if options.ECH != nil && options.ECH.Enabled {
|
||||
return nil, E.New("Reality is conflict with ECH")
|
||||
}
|
||||
var config ServerConfig = &RealityServerConfig{&tlsConfig}
|
||||
var handshakeTimeout time.Duration
|
||||
if options.HandshakeTimeout > 0 {
|
||||
handshakeTimeout = options.HandshakeTimeout.Build()
|
||||
} else {
|
||||
handshakeTimeout = C.TCPTimeout
|
||||
}
|
||||
var config ServerConfig = &RealityServerConfig{
|
||||
config: &tlsConfig,
|
||||
handshakeTimeout: handshakeTimeout,
|
||||
}
|
||||
if options.KernelTx || options.KernelRx {
|
||||
if !C.IsLinux {
|
||||
return nil, E.New("kTLS is only supported on Linux")
|
||||
@@ -161,6 +171,14 @@ func (c *RealityServerConfig) SetNextProtos(nextProto []string) {
|
||||
c.config.NextProtos = nextProto
|
||||
}
|
||||
|
||||
func (c *RealityServerConfig) HandshakeTimeout() time.Duration {
|
||||
return c.handshakeTimeout
|
||||
}
|
||||
|
||||
func (c *RealityServerConfig) SetHandshakeTimeout(timeout time.Duration) {
|
||||
c.handshakeTimeout = timeout
|
||||
}
|
||||
|
||||
func (c *RealityServerConfig) STDConfig() (*tls.Config, error) {
|
||||
return nil, E.New("unsupported usage for reality")
|
||||
}
|
||||
@@ -191,7 +209,8 @@ func (c *RealityServerConfig) ServerHandshake(ctx context.Context, conn net.Conn
|
||||
|
||||
func (c *RealityServerConfig) Clone() Config {
|
||||
return &RealityServerConfig{
|
||||
config: c.config.Clone(),
|
||||
config: c.config.Clone(),
|
||||
handshakeTimeout: c.handshakeTimeout,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -46,8 +46,11 @@ func NewServerWithOptions(options ServerOptions) (ServerConfig, error) {
|
||||
}
|
||||
|
||||
func ServerHandshake(ctx context.Context, conn net.Conn, config ServerConfig) (Conn, error) {
|
||||
ctx, cancel := context.WithTimeout(ctx, C.TCPTimeout)
|
||||
defer cancel()
|
||||
if config.HandshakeTimeout() == 0 {
|
||||
var cancel context.CancelFunc
|
||||
ctx, cancel = context.WithTimeout(ctx, C.TCPTimeout)
|
||||
defer cancel()
|
||||
}
|
||||
tlsConn, err := aTLS.ServerHandshake(ctx, conn, config)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
+77
-25
@@ -24,16 +24,30 @@ import (
|
||||
type STDClientConfig struct {
|
||||
ctx context.Context
|
||||
config *tls.Config
|
||||
serverName string
|
||||
disableSNI bool
|
||||
verifyServerName bool
|
||||
handshakeTimeout time.Duration
|
||||
fragment bool
|
||||
fragmentFallbackDelay time.Duration
|
||||
recordFragment bool
|
||||
}
|
||||
|
||||
func (c *STDClientConfig) ServerName() string {
|
||||
return c.config.ServerName
|
||||
return c.serverName
|
||||
}
|
||||
|
||||
func (c *STDClientConfig) SetServerName(serverName string) {
|
||||
c.serverName = serverName
|
||||
if c.disableSNI {
|
||||
c.config.ServerName = ""
|
||||
if c.verifyServerName {
|
||||
c.config.VerifyConnection = verifyConnection(c.config.RootCAs, c.config.Time, serverName)
|
||||
} else {
|
||||
c.config.VerifyConnection = nil
|
||||
}
|
||||
return
|
||||
}
|
||||
c.config.ServerName = serverName
|
||||
}
|
||||
|
||||
@@ -45,6 +59,14 @@ func (c *STDClientConfig) SetNextProtos(nextProto []string) {
|
||||
c.config.NextProtos = nextProto
|
||||
}
|
||||
|
||||
func (c *STDClientConfig) HandshakeTimeout() time.Duration {
|
||||
return c.handshakeTimeout
|
||||
}
|
||||
|
||||
func (c *STDClientConfig) SetHandshakeTimeout(timeout time.Duration) {
|
||||
c.handshakeTimeout = timeout
|
||||
}
|
||||
|
||||
func (c *STDClientConfig) STDConfig() (*STDConfig, error) {
|
||||
return c.config, nil
|
||||
}
|
||||
@@ -57,13 +79,19 @@ func (c *STDClientConfig) Client(conn net.Conn) (Conn, error) {
|
||||
}
|
||||
|
||||
func (c *STDClientConfig) Clone() Config {
|
||||
return &STDClientConfig{
|
||||
cloned := &STDClientConfig{
|
||||
ctx: c.ctx,
|
||||
config: c.config.Clone(),
|
||||
serverName: c.serverName,
|
||||
disableSNI: c.disableSNI,
|
||||
verifyServerName: c.verifyServerName,
|
||||
handshakeTimeout: c.handshakeTimeout,
|
||||
fragment: c.fragment,
|
||||
fragmentFallbackDelay: c.fragmentFallbackDelay,
|
||||
recordFragment: c.recordFragment,
|
||||
}
|
||||
cloned.SetServerName(cloned.serverName)
|
||||
return cloned
|
||||
}
|
||||
|
||||
func (c *STDClientConfig) ECHConfigList() []byte {
|
||||
@@ -75,41 +103,27 @@ func (c *STDClientConfig) SetECHConfigList(EncryptedClientHelloConfigList []byte
|
||||
}
|
||||
|
||||
func NewSTDClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions) (Config, error) {
|
||||
return newSTDClient(ctx, logger, serverAddress, options, false)
|
||||
}
|
||||
|
||||
func newSTDClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions, allowEmptyServerName bool) (Config, error) {
|
||||
var serverName string
|
||||
if options.ServerName != "" {
|
||||
serverName = options.ServerName
|
||||
} else if serverAddress != "" {
|
||||
serverName = serverAddress
|
||||
}
|
||||
if serverName == "" && !options.Insecure {
|
||||
return nil, E.New("missing server_name or insecure=true")
|
||||
if serverName == "" && !options.Insecure && !allowEmptyServerName {
|
||||
return nil, errMissingServerName
|
||||
}
|
||||
|
||||
var tlsConfig tls.Config
|
||||
tlsConfig.Time = ntp.TimeFuncFromContext(ctx)
|
||||
tlsConfig.RootCAs = adapter.RootPoolFromContext(ctx)
|
||||
if !options.DisableSNI {
|
||||
tlsConfig.ServerName = serverName
|
||||
}
|
||||
if options.Insecure {
|
||||
tlsConfig.InsecureSkipVerify = options.Insecure
|
||||
} else if options.DisableSNI {
|
||||
tlsConfig.InsecureSkipVerify = true
|
||||
tlsConfig.VerifyConnection = func(state tls.ConnectionState) error {
|
||||
verifyOptions := x509.VerifyOptions{
|
||||
Roots: tlsConfig.RootCAs,
|
||||
DNSName: serverName,
|
||||
Intermediates: x509.NewCertPool(),
|
||||
}
|
||||
for _, cert := range state.PeerCertificates[1:] {
|
||||
verifyOptions.Intermediates.AddCert(cert)
|
||||
}
|
||||
if tlsConfig.Time != nil {
|
||||
verifyOptions.CurrentTime = tlsConfig.Time()
|
||||
}
|
||||
_, err := state.PeerCertificates[0].Verify(verifyOptions)
|
||||
return err
|
||||
}
|
||||
}
|
||||
if len(options.CertificatePublicKeySHA256) > 0 {
|
||||
if len(options.Certificate) > 0 || options.CertificatePath != "" {
|
||||
@@ -117,7 +131,7 @@ func NewSTDClient(ctx context.Context, logger logger.ContextLogger, serverAddres
|
||||
}
|
||||
tlsConfig.InsecureSkipVerify = true
|
||||
tlsConfig.VerifyPeerCertificate = func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
|
||||
return verifyPublicKeySHA256(options.CertificatePublicKeySHA256, rawCerts, tlsConfig.Time)
|
||||
return VerifyPublicKeySHA256(options.CertificatePublicKeySHA256, rawCerts)
|
||||
}
|
||||
}
|
||||
if len(options.ALPN) > 0 {
|
||||
@@ -198,7 +212,24 @@ func NewSTDClient(ctx context.Context, logger logger.ContextLogger, serverAddres
|
||||
} else if len(clientCertificate) > 0 || len(clientKey) > 0 {
|
||||
return nil, E.New("client certificate and client key must be provided together")
|
||||
}
|
||||
var config Config = &STDClientConfig{ctx, &tlsConfig, options.Fragment, time.Duration(options.FragmentFallbackDelay), options.RecordFragment}
|
||||
var handshakeTimeout time.Duration
|
||||
if options.HandshakeTimeout > 0 {
|
||||
handshakeTimeout = options.HandshakeTimeout.Build()
|
||||
} else {
|
||||
handshakeTimeout = C.TCPTimeout
|
||||
}
|
||||
var config Config = &STDClientConfig{
|
||||
ctx: ctx,
|
||||
config: &tlsConfig,
|
||||
serverName: serverName,
|
||||
disableSNI: options.DisableSNI,
|
||||
verifyServerName: options.DisableSNI && !options.Insecure,
|
||||
handshakeTimeout: handshakeTimeout,
|
||||
fragment: options.Fragment,
|
||||
fragmentFallbackDelay: time.Duration(options.FragmentFallbackDelay),
|
||||
recordFragment: options.RecordFragment,
|
||||
}
|
||||
config.SetServerName(serverName)
|
||||
if options.ECH != nil && options.ECH.Enabled {
|
||||
var err error
|
||||
config, err = parseECHClientConfig(ctx, config.(ECHCapableConfig), options)
|
||||
@@ -220,7 +251,28 @@ func NewSTDClient(ctx context.Context, logger logger.ContextLogger, serverAddres
|
||||
return config, nil
|
||||
}
|
||||
|
||||
func verifyPublicKeySHA256(knownHashValues [][]byte, rawCerts [][]byte, timeFunc func() time.Time) error {
|
||||
func verifyConnection(rootCAs *x509.CertPool, timeFunc func() time.Time, serverName string) func(state tls.ConnectionState) error {
|
||||
return func(state tls.ConnectionState) error {
|
||||
if serverName == "" {
|
||||
return errMissingServerName
|
||||
}
|
||||
verifyOptions := x509.VerifyOptions{
|
||||
Roots: rootCAs,
|
||||
DNSName: serverName,
|
||||
Intermediates: x509.NewCertPool(),
|
||||
}
|
||||
for _, cert := range state.PeerCertificates[1:] {
|
||||
verifyOptions.Intermediates.AddCert(cert)
|
||||
}
|
||||
if timeFunc != nil {
|
||||
verifyOptions.CurrentTime = timeFunc()
|
||||
}
|
||||
_, err := state.PeerCertificates[0].Verify(verifyOptions)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
func VerifyPublicKeySHA256(knownHashValues [][]byte, rawCerts [][]byte) error {
|
||||
leafCertificate, err := x509.ParseCertificate(rawCerts[0])
|
||||
if err != nil {
|
||||
return E.Cause(err, "failed to parse leaf certificate")
|
||||
|
||||
@@ -92,6 +92,7 @@ func getACMENextProtos(provider adapter.CertificateProvider) []string {
|
||||
type STDServerConfig struct {
|
||||
access sync.RWMutex
|
||||
config *tls.Config
|
||||
handshakeTimeout time.Duration
|
||||
logger log.Logger
|
||||
certificateProvider managedCertificateProvider
|
||||
acmeService adapter.SimpleLifecycle
|
||||
@@ -139,6 +140,18 @@ func (c *STDServerConfig) SetNextProtos(nextProto []string) {
|
||||
c.config = config
|
||||
}
|
||||
|
||||
func (c *STDServerConfig) HandshakeTimeout() time.Duration {
|
||||
c.access.RLock()
|
||||
defer c.access.RUnlock()
|
||||
return c.handshakeTimeout
|
||||
}
|
||||
|
||||
func (c *STDServerConfig) SetHandshakeTimeout(timeout time.Duration) {
|
||||
c.access.Lock()
|
||||
defer c.access.Unlock()
|
||||
c.handshakeTimeout = timeout
|
||||
}
|
||||
|
||||
func (c *STDServerConfig) hasACMEALPN() bool {
|
||||
if c.acmeService != nil {
|
||||
return true
|
||||
@@ -165,7 +178,8 @@ func (c *STDServerConfig) Server(conn net.Conn) (Conn, error) {
|
||||
|
||||
func (c *STDServerConfig) Clone() Config {
|
||||
return &STDServerConfig{
|
||||
config: c.config.Clone(),
|
||||
config: c.config.Clone(),
|
||||
handshakeTimeout: c.handshakeTimeout,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -458,7 +472,7 @@ func NewSTDServer(ctx context.Context, logger log.ContextLogger, options option.
|
||||
tlsConfig.ClientAuth = tls.RequestClientCert
|
||||
}
|
||||
tlsConfig.VerifyPeerCertificate = func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
|
||||
return verifyPublicKeySHA256(options.ClientCertificatePublicKeySHA256, rawCerts, tlsConfig.Time)
|
||||
return VerifyPublicKeySHA256(options.ClientCertificatePublicKeySHA256, rawCerts)
|
||||
}
|
||||
} else {
|
||||
return nil, E.New("missing client_certificate, client_certificate_path or client_certificate_public_key_sha256 for client authentication")
|
||||
@@ -471,8 +485,15 @@ func NewSTDServer(ctx context.Context, logger log.ContextLogger, options option.
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
var handshakeTimeout time.Duration
|
||||
if options.HandshakeTimeout > 0 {
|
||||
handshakeTimeout = options.HandshakeTimeout.Build()
|
||||
} else {
|
||||
handshakeTimeout = C.TCPTimeout
|
||||
}
|
||||
serverConfig := &STDServerConfig{
|
||||
config: tlsConfig,
|
||||
handshakeTimeout: handshakeTimeout,
|
||||
logger: logger,
|
||||
certificateProvider: certificateProvider,
|
||||
acmeService: acmeService,
|
||||
|
||||
+62
-11
@@ -28,6 +28,10 @@ import (
|
||||
type UTLSClientConfig struct {
|
||||
ctx context.Context
|
||||
config *utls.Config
|
||||
serverName string
|
||||
disableSNI bool
|
||||
verifyServerName bool
|
||||
handshakeTimeout time.Duration
|
||||
id utls.ClientHelloID
|
||||
fragment bool
|
||||
fragmentFallbackDelay time.Duration
|
||||
@@ -35,10 +39,20 @@ type UTLSClientConfig struct {
|
||||
}
|
||||
|
||||
func (c *UTLSClientConfig) ServerName() string {
|
||||
return c.config.ServerName
|
||||
return c.serverName
|
||||
}
|
||||
|
||||
func (c *UTLSClientConfig) SetServerName(serverName string) {
|
||||
c.serverName = serverName
|
||||
if c.disableSNI {
|
||||
c.config.ServerName = ""
|
||||
if c.verifyServerName {
|
||||
c.config.InsecureServerNameToVerify = serverName
|
||||
} else {
|
||||
c.config.InsecureServerNameToVerify = ""
|
||||
}
|
||||
return
|
||||
}
|
||||
c.config.ServerName = serverName
|
||||
}
|
||||
|
||||
@@ -53,6 +67,14 @@ func (c *UTLSClientConfig) SetNextProtos(nextProto []string) {
|
||||
c.config.NextProtos = nextProto
|
||||
}
|
||||
|
||||
func (c *UTLSClientConfig) HandshakeTimeout() time.Duration {
|
||||
return c.handshakeTimeout
|
||||
}
|
||||
|
||||
func (c *UTLSClientConfig) SetHandshakeTimeout(timeout time.Duration) {
|
||||
c.handshakeTimeout = timeout
|
||||
}
|
||||
|
||||
func (c *UTLSClientConfig) STDConfig() (*STDConfig, error) {
|
||||
return nil, E.New("unsupported usage for uTLS")
|
||||
}
|
||||
@@ -69,9 +91,20 @@ func (c *UTLSClientConfig) SetSessionIDGenerator(generator func(clientHello []by
|
||||
}
|
||||
|
||||
func (c *UTLSClientConfig) Clone() Config {
|
||||
return &UTLSClientConfig{
|
||||
c.ctx, c.config.Clone(), c.id, c.fragment, c.fragmentFallbackDelay, c.recordFragment,
|
||||
cloned := &UTLSClientConfig{
|
||||
ctx: c.ctx,
|
||||
config: c.config.Clone(),
|
||||
serverName: c.serverName,
|
||||
disableSNI: c.disableSNI,
|
||||
verifyServerName: c.verifyServerName,
|
||||
handshakeTimeout: c.handshakeTimeout,
|
||||
id: c.id,
|
||||
fragment: c.fragment,
|
||||
fragmentFallbackDelay: c.fragmentFallbackDelay,
|
||||
recordFragment: c.recordFragment,
|
||||
}
|
||||
cloned.SetServerName(cloned.serverName)
|
||||
return cloned
|
||||
}
|
||||
|
||||
func (c *UTLSClientConfig) ECHConfigList() []byte {
|
||||
@@ -143,29 +176,29 @@ func (c *utlsALPNWrapper) HandshakeContext(ctx context.Context) error {
|
||||
}
|
||||
|
||||
func NewUTLSClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions) (Config, error) {
|
||||
return newUTLSClient(ctx, logger, serverAddress, options, false)
|
||||
}
|
||||
|
||||
func newUTLSClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions, allowEmptyServerName bool) (Config, error) {
|
||||
var serverName string
|
||||
if options.ServerName != "" {
|
||||
serverName = options.ServerName
|
||||
} else if serverAddress != "" {
|
||||
serverName = serverAddress
|
||||
}
|
||||
if serverName == "" && !options.Insecure {
|
||||
return nil, E.New("missing server_name or insecure=true")
|
||||
if serverName == "" && !options.Insecure && !allowEmptyServerName {
|
||||
return nil, errMissingServerName
|
||||
}
|
||||
|
||||
var tlsConfig utls.Config
|
||||
tlsConfig.Time = ntp.TimeFuncFromContext(ctx)
|
||||
tlsConfig.RootCAs = adapter.RootPoolFromContext(ctx)
|
||||
if !options.DisableSNI {
|
||||
tlsConfig.ServerName = serverName
|
||||
}
|
||||
if options.Insecure {
|
||||
tlsConfig.InsecureSkipVerify = options.Insecure
|
||||
} else if options.DisableSNI {
|
||||
if options.Reality != nil && options.Reality.Enabled {
|
||||
return nil, E.New("disable_sni is unsupported in reality")
|
||||
}
|
||||
tlsConfig.InsecureServerNameToVerify = serverName
|
||||
}
|
||||
if len(options.CertificatePublicKeySHA256) > 0 {
|
||||
if len(options.Certificate) > 0 || options.CertificatePath != "" {
|
||||
@@ -173,7 +206,7 @@ func NewUTLSClient(ctx context.Context, logger logger.ContextLogger, serverAddre
|
||||
}
|
||||
tlsConfig.InsecureSkipVerify = true
|
||||
tlsConfig.VerifyPeerCertificate = func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
|
||||
return verifyPublicKeySHA256(options.CertificatePublicKeySHA256, rawCerts, tlsConfig.Time)
|
||||
return VerifyPublicKeySHA256(options.CertificatePublicKeySHA256, rawCerts)
|
||||
}
|
||||
}
|
||||
if len(options.ALPN) > 0 {
|
||||
@@ -251,11 +284,29 @@ func NewUTLSClient(ctx context.Context, logger logger.ContextLogger, serverAddre
|
||||
} else if len(clientCertificate) > 0 || len(clientKey) > 0 {
|
||||
return nil, E.New("client certificate and client key must be provided together")
|
||||
}
|
||||
var handshakeTimeout time.Duration
|
||||
if options.HandshakeTimeout > 0 {
|
||||
handshakeTimeout = options.HandshakeTimeout.Build()
|
||||
} else {
|
||||
handshakeTimeout = C.TCPTimeout
|
||||
}
|
||||
id, err := uTLSClientHelloID(options.UTLS.Fingerprint)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var config Config = &UTLSClientConfig{ctx, &tlsConfig, id, options.Fragment, time.Duration(options.FragmentFallbackDelay), options.RecordFragment}
|
||||
var config Config = &UTLSClientConfig{
|
||||
ctx: ctx,
|
||||
config: &tlsConfig,
|
||||
serverName: serverName,
|
||||
disableSNI: options.DisableSNI,
|
||||
verifyServerName: options.DisableSNI && !options.Insecure,
|
||||
handshakeTimeout: handshakeTimeout,
|
||||
id: id,
|
||||
fragment: options.Fragment,
|
||||
fragmentFallbackDelay: time.Duration(options.FragmentFallbackDelay),
|
||||
recordFragment: options.RecordFragment,
|
||||
}
|
||||
config.SetServerName(serverName)
|
||||
if options.ECH != nil && options.ECH.Enabled {
|
||||
if options.Reality != nil && options.Reality.Enabled {
|
||||
return nil, E.New("Reality is conflict with ECH")
|
||||
|
||||
@@ -12,10 +12,18 @@ import (
|
||||
)
|
||||
|
||||
func NewUTLSClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions) (Config, error) {
|
||||
return newUTLSClient(ctx, logger, serverAddress, options, false)
|
||||
}
|
||||
|
||||
func newUTLSClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions, allowEmptyServerName bool) (Config, error) {
|
||||
return nil, E.New(`uTLS is not included in this build, rebuild with -tags with_utls`)
|
||||
}
|
||||
|
||||
func NewRealityClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions) (Config, error) {
|
||||
return newRealityClient(ctx, logger, serverAddress, options, false)
|
||||
}
|
||||
|
||||
func newRealityClient(ctx context.Context, logger logger.ContextLogger, serverAddress string, options option.OutboundTLSOptions, allowEmptyServerName bool) (Config, error) {
|
||||
return nil, E.New(`uTLS, which is required by reality is not included in this build, rebuild with -tags with_utls`)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user