mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-03 20:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Implement uconn.RemoveSNIExtension() (#51)

Browse source 
Authored by: https://github.com/max-b
Co-authored-by: Myles Horton <myles@getlantern.org>
Co-authored-by: Willie Forkner <1120829+forkner@users.noreply.github.com>
This commit is contained in:
maxb 2020-07-28 18:25:16 -07:00 • committed by GitHub
parent 02675388fe
commit dc2ae3bffe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 162 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

33
u_conn_test.go
View file

@ -159,6 +159,21 @@ func TestUTLSHelloRetryRequest(t *testing.T) {
runUTLSClientTestTLS13(t, test, helloID)
}
func TestUTLSRemoveSNIExtension(t *testing.T) {
helloID := HelloChrome_70
config := getUTLSTestConfig()
opensslCipherName := "ECDHE-RSA-AES128-GCM-SHA256"
test := &clientTest{
name: "UTLS-" + opensslCipherName + "-" + helloID.Str() + "-OmitSNI",
args: []string{"-cipher", opensslCipherName},
config: config,
}
runUTLSClientTestForVersion(t, test, "TLSv12-", "-tls1_2", helloID, true)
}
/*
*
HELPER FUNCTIONS BELOW
@ -364,7 +379,7 @@ func testUTLSHandshakeClientECDHE_ECDSA_WITH_CHACHA20_POLY1305(t *testing.T, hel
runUTLSClientTestTLS12(t, test, helloID)
}
func runUTLSClientTestForVersion(t *testing.T, template *clientTest, prefix, option string, helloID ClientHelloID) {
func runUTLSClientTestForVersion(t *testing.T, template *clientTest, prefix, option string, helloID ClientHelloID, omitSNI bool) {
test := *template
test.name = prefix + test.name
if len(test.args) == 0 {
@ -372,18 +387,18 @@ func runUTLSClientTestForVersion(t *testing.T, template *clientTest, prefix, opt
}
test.args = append([]string(nil), test.args...)
test.args = append(test.args, option)
test.runUTLS(t, *update, helloID)
test.runUTLS(t, *update, helloID, false)
}
func runUTLSClientTestTLS12(t *testing.T, template *clientTest, helloID ClientHelloID) {
runUTLSClientTestForVersion(t, template, "TLSv12-", "-tls1_2", helloID)
runUTLSClientTestForVersion(t, template, "TLSv12-", "-tls1_2", helloID, false)
}
func runUTLSClientTestTLS13(t *testing.T, template *clientTest, helloID ClientHelloID) {
runUTLSClientTestForVersion(t, template, "TLSv13-", "-tls1_3", helloID)
runUTLSClientTestForVersion(t, template, "TLSv13-", "-tls1_3", helloID, false)
}
func (test *clientTest) runUTLS(t *testing.T, write bool, helloID ClientHelloID) {
func (test *clientTest) runUTLS(t *testing.T, write bool, helloID ClientHelloID, omitSNIExtension bool) {
checkOpenSSLVersion(t)
var clientConn, serverConn net.Conn
@ -409,6 +424,14 @@ func (test *clientTest) runUTLS(t *testing.T, write bool, helloID ClientHelloID)
return
}
client := UClient(clientConn, config, helloID)
if omitSNIExtension {
if err := client.RemoveSNIExtension(); err != nil {
t.Error("Failed to remove SNI extension")
return
}
}
if strings.HasPrefix(test.name, "TLSv12-UTLS-setclienthello-") {
err := client.BuildHandshakeState()
if err != nil {