Skip to content

Upgrade utls to v1.6.7 #1459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jovis7 merged 4 commits into from
Dec 5, 2024
Merged

Upgrade utls to v1.6.7 #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dcf00e
Upgrade utls to v1.6.7 and other dependent modules
Jovis7 Dec 4, 2024
1926354
Upgrade utls to v1.6.7 and other dependent modules
Jovis7 Dec 4, 2024
33a0b07
Sync apidb/types.proto with lantern-cloud
Jovis7 Dec 4, 2024
1382ad4
Sync func serializeTLSSessionState from lantern-cloud
Jovis7 Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apipb/legacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ func serializeTLSSessionState(ss *ProxyConnectConfig_TLSConfig_SessionState) (st
Vers uint16
CipherSuite uint16
MasterSecret []byte
SessionState []byte
}

if ss.Version > math.MaxUint16 {
Expand All @@ -211,6 +212,7 @@ func serializeTLSSessionState(ss *ProxyConnectConfig_TLSConfig_SessionState) (st
Vers: uint16(ss.Version),
CipherSuite: uint16(ss.CipherSuite),
MasterSecret: ss.MasterSecret,
SessionState: ss.SessionState,
})
if err != nil {
return "", fmt.Errorf("marshal error: %w", err)
Expand Down
364 changes: 188 additions & 176 deletions apipb/types.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions apipb/types.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ message ProxyConnectConfig {
uint32 version = 2; // actually a uint16
uint32 cipher_suite = 3; // actually a uint16
bytes master_secret = 4;
// Newer utls version (e.g. v1.6.7) or go >1.21 has build-in serialization for SessionState.
// It's either field 1,5(newer version) or field 1,2,3,4(older version) that are used for serialization.
bytes session_state = 5;
}

SessionState session_state = 1;
Expand Down
2 changes: 1 addition & 1 deletion chained/chained_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,5 +288,5 @@ func TestCiphersFromNames(t *testing.T) {
assert.Nil(t, ciphersFromNames(nil))
assert.Nil(t, ciphersFromNames([]string{}))
assert.Nil(t, ciphersFromNames([]string{"UNKNOWN"}))
assert.EqualValues(t, []uint16{0x0035, 0x003c}, ciphersFromNames([]string{"TLS_RSA_WITH_AES_256_CBC_SHA", "UNKNOWN", "TLS_RSA_WITH_AES_128_CBC_SHA256"}))
assert.EqualValues(t, []uint16{0xc02f, 0xc013}, ciphersFromNames([]string{"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "UNKNOWN", "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"}))
}
27 changes: 8 additions & 19 deletions chained/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,28 +142,17 @@ func clientHelloID(pc *config.ProxyConfig) tls.ClientHelloID {
}

var availableTLSCiphers = map[string]uint16{
"TLS_RSA_WITH_RC4_128_SHA": tls.TLS_RSA_WITH_RC4_128_SHA,
"TLS_RSA_WITH_3DES_EDE_CBC_SHA": tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
"TLS_RSA_WITH_AES_128_CBC_SHA": tls.TLS_RSA_WITH_AES_128_CBC_SHA,
"TLS_RSA_WITH_AES_256_CBC_SHA": tls.TLS_RSA_WITH_AES_256_CBC_SHA,
"TLS_RSA_WITH_AES_128_CBC_SHA256": tls.TLS_RSA_WITH_AES_128_CBC_SHA256,
"TLS_RSA_WITH_AES_128_GCM_SHA256": tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
"TLS_RSA_WITH_AES_256_GCM_SHA384": tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
"TLS_ECDHE_ECDSA_WITH_RC4_128_SHA": tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA": tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA": tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
"TLS_ECDHE_RSA_WITH_RC4_128_SHA": tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
"TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA": tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA": tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA": tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256": tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256": tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256": tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
// from CipherSuites() in the order of cipherSuitesPreferenceOrder in cipher_suites.go (excluding the InsecureCipherSuites() ones)
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256": tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384": tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256": tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384": tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305": tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384": tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305": tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305": tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA": tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA": tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA": tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA": tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
}

// helloBrowser is a special hello ID denoting that ClientHellos should be based on those used by
Expand Down
6 changes: 3 additions & 3 deletions chained/tls_file_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package chained
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strconv"
"strings"
Expand Down Expand Up @@ -65,7 +65,7 @@ func PersistSessionStates(configDir string) {
func persistSessionStates(configDir string, saveInterval time.Duration) {
filename := filepath.Join(configDir, "tls_session_states")

existing, err := ioutil.ReadFile(filename)
existing, err := os.ReadFile(filename)
if err == nil {
log.Debugf("Initializing current session states from %v", filename)
rows := strings.Split(string(existing), "\n")
Expand Down Expand Up @@ -107,7 +107,7 @@ func maintainSessionStates(filename string, saveInterval time.Duration) {
serialized, rowDelim, server, state.timestamp.Unix(), serializedState)
rowDelim = "\n" // after first row, include a delimiter
}
err := ioutil.WriteFile(filename, []byte(serialized), 0644)
err := os.WriteFile(filename, []byte(serialized), 0644)
if err != nil {
log.Errorf("unable to update session states in %v: %v", filename, err)
return
Expand Down
14 changes: 7 additions & 7 deletions chained/tls_file_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package chained

import (
"io/ioutil"
"net"
"os"
"testing"
Expand All @@ -14,7 +13,7 @@ import (
)

func TestPersistSessionStates(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "persistSessionStatesTest")
tmpDir, err := os.MkdirTemp("", "persistSessionStatesTest")
if !assert.NoError(t, err) {
return
}
Expand All @@ -27,25 +26,26 @@ func TestPersistSessionStates(t *testing.T) {
currentSessionStatesMx.Unlock()

persistSessionStates(tmpDir, 250*time.Millisecond)

cache := tls.NewLRUClientSessionCache(10)
td := &tlsdialer.Dialer{
DoDial: net.DialTimeout,
Timeout: 10 * time.Second,
SendServerName: true,
ClientHelloID: tls.HelloChrome_Auto,
Config: &tls.Config{
ClientSessionCache: tls.NewLRUClientSessionCache(10),
ClientSessionCache: cache,
},
}

result, err := td.DialForTimings("tcp", "tls-v1-2.badssl.com:1012")
host, port := "tls-v1-2.badssl.com", "1012"
result, err := td.DialForTimings("tcp", net.JoinHostPort(host, port))
if !assert.NoError(t, err) {
return
}
defer result.Conn.Close()
log.Debug(result.Conn.RemoteAddr())

ss1 := result.UConn.HandshakeState.Session
ss1, ok := cache.Get(host)
assert.True(t, ok)
expectedTS := time.Now()
saveSessionState("myserver", ss1, expectedTS)
close(saveSessionStateCh)
Expand Down
34 changes: 17 additions & 17 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/getlantern/flashlight/v7

go 1.22.3
go 1.22.6

toolchain go1.22.8
toolchain go1.23.3

replace github.com/elazarl/goproxy => github.com/getlantern/goproxy v0.0.0-20220805074304-4a43a9ed4ec6

Expand Down Expand Up @@ -43,12 +43,12 @@ require (
github.com/getlantern/event v0.0.0-20210901195647-a7e3145142e6
github.com/getlantern/eventual v1.0.0
github.com/getlantern/eventual/v2 v2.0.2
github.com/getlantern/fronted v0.0.0-20241120203013-eedcd71609d2
github.com/getlantern/fronted v0.0.0-20241203140224-a556be12abc5
github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5
github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65
github.com/getlantern/hellosplitter v0.1.1
github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770
github.com/getlantern/http-proxy-lantern/v2 v2.10.1-0.20240614175233-0df4a97b806e
github.com/getlantern/http-proxy-lantern/v2 v2.10.1
github.com/getlantern/httpseverywhere v0.0.0-20201210200013-19ae11fc4eca
github.com/getlantern/idletiming v0.0.0-20201229174729-33d04d220c4e
github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696
Expand All @@ -59,8 +59,8 @@ require (
github.com/getlantern/mockconn v0.0.0-20200818071412-cb30d065a848
github.com/getlantern/mtime v0.0.0-20200417132445-23682092d1f7
github.com/getlantern/multipath v0.0.0-20230510135141-717ed305ef50
github.com/getlantern/netx v0.0.0-20211206143627-7ccfeb739cbd
github.com/getlantern/ops v0.0.0-20230519221840-1283e026181c
github.com/getlantern/netx v0.0.0-20240814210628-0984f52e2d18
github.com/getlantern/ops v0.0.0-20231025133620-f368ab734534
github.com/getlantern/osversion v0.0.0-20230401075644-c2a30e73c451
github.com/getlantern/proxy/v3 v3.0.0-20240328103708-9185589b6a99
github.com/getlantern/psmux v1.5.15
Expand All @@ -72,9 +72,9 @@ require (
github.com/getlantern/timezone v0.0.0-20210901200113-3f9de9d360c9
github.com/getlantern/tinywss v0.0.0-20211216020538-c10008a7d461
github.com/getlantern/tlsdefaults v0.0.0-20171004213447-cf35cfd0b1b4
github.com/getlantern/tlsdialer/v3 v3.0.3
github.com/getlantern/tlsdialer/v3 v3.0.4
github.com/getlantern/tlsmasq v0.4.7-0.20230302000139-6e479a593298
github.com/getlantern/tlsresumption v0.0.0-20211216020551-6a3f901d86b9
github.com/getlantern/tlsresumption v0.0.0-20241203054031-f3e4eec291ad
github.com/getlantern/tlsutil v0.5.3
github.com/getlantern/uuid v1.2.0
github.com/getlantern/waitforserver v1.0.1
Expand All @@ -88,7 +88,7 @@ require (
github.com/mitchellh/go-server-timing v1.0.1
github.com/mitchellh/mapstructure v1.5.0
github.com/pborman/uuid v1.2.1
github.com/refraction-networking/utls v1.3.3
github.com/refraction-networking/utls v1.6.7
github.com/refraction-networking/water v0.7.0-alpha
github.com/samber/lo v1.38.1
github.com/shadowsocks/go-shadowsocks2 v0.1.5
Expand All @@ -101,7 +101,7 @@ require (
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
go.uber.org/atomic v1.10.0
golang.org/x/sys v0.23.0
golang.org/x/sys v0.26.0
google.golang.org/protobuf v1.33.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
Expand All @@ -113,9 +113,9 @@ require (
github.com/Jigsaw-Code/outline-ss-server v1.5.0 // indirect
github.com/anacrolix/dht/v2 v2.20.0 // indirect
github.com/blang/vfs v1.0.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/coder/websocket v1.8.12 // indirect
github.com/dchest/siphash v1.2.3 // indirect
github.com/gaukas/godicttls v0.0.4 // indirect
github.com/gaukas/wazerofs v0.1.0 // indirect
github.com/getlantern/algeneva v0.0.0-20240222191137-2b4e88234f59 // indirect
github.com/getlantern/lampshade v0.0.0-20201109225444-b06082e15f3a // indirect
Expand Down Expand Up @@ -187,7 +187,7 @@ require (
github.com/getlantern/fdcount v0.0.0-20210503151800-5decd65b3731 // indirect
github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c // indirect
github.com/getlantern/framed v0.0.0-20190601192238-ceb6431eeede // indirect
github.com/getlantern/geo v0.0.0-20240108161311-50692a1b69a9 // indirect
github.com/getlantern/geo v0.0.0-20241129152027-2fc88c10f91e // indirect
github.com/getlantern/gonat v0.0.0-20201001145726-634575ba87fb // indirect
github.com/getlantern/grtrack v0.0.0-20231025115619-bfbfadb228f3 // indirect
github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
Expand All @@ -203,7 +203,7 @@ require (
github.com/getlantern/telemetry v0.0.0-20230523155019-be7c1d8cd8cb // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-llsqlite/adapter v0.0.0-20230927005056-7f5ce7f0c916 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-redis/redis/v8 v8.11.5 // indirect
github.com/go-stack/stack v1.8.1 // indirect
Expand Down Expand Up @@ -293,14 +293,14 @@ require (
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/mock v0.4.0
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.24.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
Expand Down
Loading
Loading