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 ClientHelloSpec JSON Unmarshaler (#176)

Browse source 
* wip: staging work

* wip: staging work

* feat: ClientHello JSON Unmarshaler

Allowing unmarshalling a JSON object into a ClientHelloSpec.

* feat: ClientHello JSON Unmarshaler rev

- Revised JSON ClientHello format
- Implemented `TLSExtensionJSON` interface for some more extensions
This commit is contained in:
Gaukas Wang 2023-03-30 09:13:47 -06:00 • committed by GitHub
parent 6d2506f52f
commit 3721531ea9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 1453 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

123
u_clienthello_json_test.go Normal file
View file

@ -0,0 +1,123 @@
package tls
import (
"encoding/json"
"os"
"reflect"
"testing"
)
func TestClientHelloSpecJSONUnmarshaler(t *testing.T) {
testClientHelloSpecJSONUnmarshaler(t, "testdata/ClientHello-JSON-Chrome102.json", HelloChrome_102)
testClientHelloSpecJSONUnmarshaler(t, "testdata/ClientHello-JSON-Firefox105.json", HelloFirefox_105)
testClientHelloSpecJSONUnmarshaler(t, "testdata/ClientHello-JSON-iOS14.json", HelloIOS_14)
testClientHelloSpecJSONUnmarshaler(t, "testdata/ClientHello-JSON-Edge106.json", HelloEdge_106)
}
func testClientHelloSpecJSONUnmarshaler(
t *testing.T,
jsonFilepath string,
truthClientHelloID ClientHelloID,
) {
jsonCH, err := os.ReadFile(jsonFilepath)
if err != nil {
t.Fatal(err)
}
var chsju ClientHelloSpecJSONUnmarshaler
if err := json.Unmarshal(jsonCH, &chsju); err != nil {
t.Fatal(err)
}
truthSpec, _ := utlsIdToSpec(truthClientHelloID)
jsonSpec := chsju.ClientHelloSpec()
// Compare CipherSuites
if !reflect.DeepEqual(jsonSpec.CipherSuites, truthSpec.CipherSuites) {
t.Errorf("JSONUnmarshaler %s: got %#v, want %#v", clientHelloSpecJSONTestIdentifier(truthClientHelloID), jsonSpec.CipherSuites, truthSpec.CipherSuites)
}
// Compare CompressionMethods
if !reflect.DeepEqual(jsonSpec.CompressionMethods, truthSpec.CompressionMethods) {
t.Errorf("JSONUnmarshaler %s: got %#v, want %#v", clientHelloSpecJSONTestIdentifier(truthClientHelloID), jsonSpec.CompressionMethods, truthSpec.CompressionMethods)
}
// Compare Extensions
if len(jsonSpec.Extensions) != len(truthSpec.Extensions) {
t.Errorf("JSONUnmarshaler %s: len(jsonExtensions) = %d != %d = len(truthExtensions)", clientHelloSpecJSONTestIdentifier(truthClientHelloID), len(jsonSpec.Extensions), len(truthSpec.Extensions))
}
for i := range jsonSpec.Extensions {
if !reflect.DeepEqual(jsonSpec.Extensions[i], truthSpec.Extensions[i]) {
if _, ok := jsonSpec.Extensions[i].(*UtlsPaddingExtension); ok {
testedPaddingExt := jsonSpec.Extensions[i].(*UtlsPaddingExtension)
savedPaddingExt := truthSpec.Extensions[i].(*UtlsPaddingExtension)
if testedPaddingExt.PaddingLen != savedPaddingExt.PaddingLen || testedPaddingExt.WillPad != savedPaddingExt.WillPad {
t.Errorf("got %#v, want %#v", testedPaddingExt, savedPaddingExt)
} else {
continue // UtlsPaddingExtension has non-nil function member
}
}
t.Errorf("JSONUnmarshaler %s: got %#v, want %#v", clientHelloSpecJSONTestIdentifier(truthClientHelloID), jsonSpec.Extensions[i], truthSpec.Extensions[i])
}
}
}
func TestClientHelloSpecUnmarshalJSON(t *testing.T) {
testClientHelloSpecUnmarshalJSON(t, "testdata/ClientHello-JSON-Chrome102.json", HelloChrome_102)
testClientHelloSpecUnmarshalJSON(t, "testdata/ClientHello-JSON-Firefox105.json", HelloFirefox_105)
testClientHelloSpecUnmarshalJSON(t, "testdata/ClientHello-JSON-iOS14.json", HelloIOS_14)
testClientHelloSpecUnmarshalJSON(t, "testdata/ClientHello-JSON-Edge106.json", HelloEdge_106)
}
func testClientHelloSpecUnmarshalJSON(
t *testing.T,
jsonFilepath string,
truthClientHelloID ClientHelloID,
) {
var jsonSpec ClientHelloSpec
jsonCH, err := os.ReadFile(jsonFilepath)
if err != nil {
t.Fatal(err)
}
if err := json.Unmarshal(jsonCH, &jsonSpec); err != nil {
t.Fatal(err)
}
truthSpec, _ := utlsIdToSpec(truthClientHelloID)
// Compare CipherSuites
if !reflect.DeepEqual(jsonSpec.CipherSuites, truthSpec.CipherSuites) {
t.Errorf("UnmarshalJSON %s: got %#v, want %#v", clientHelloSpecJSONTestIdentifier(truthClientHelloID), jsonSpec.CipherSuites, truthSpec.CipherSuites)
}
// Compare CompressionMethods
if !reflect.DeepEqual(jsonSpec.CompressionMethods, truthSpec.CompressionMethods) {
t.Errorf("UnmarshalJSON %s: got %#v, want %#v", clientHelloSpecJSONTestIdentifier(truthClientHelloID), jsonSpec.CompressionMethods, truthSpec.CompressionMethods)
}
// Compare Extensions
if len(jsonSpec.Extensions) != len(truthSpec.Extensions) {
t.Errorf("UnmarshalJSON %s: len(jsonExtensions) = %d != %d = len(truthExtensions)", jsonFilepath, len(jsonSpec.Extensions), len(truthSpec.Extensions))
}
for i := range jsonSpec.Extensions {
if !reflect.DeepEqual(jsonSpec.Extensions[i], truthSpec.Extensions[i]) {
if _, ok := jsonSpec.Extensions[i].(*UtlsPaddingExtension); ok {
testedPaddingExt := jsonSpec.Extensions[i].(*UtlsPaddingExtension)
savedPaddingExt := truthSpec.Extensions[i].(*UtlsPaddingExtension)
if testedPaddingExt.PaddingLen != savedPaddingExt.PaddingLen || testedPaddingExt.WillPad != savedPaddingExt.WillPad {
t.Errorf("got %#v, want %#v", testedPaddingExt, savedPaddingExt)
} else {
continue // UtlsPaddingExtension has non-nil function member
}
}
t.Errorf("UnmarshalJSON %s: got %#v, want %#v", clientHelloSpecJSONTestIdentifier(truthClientHelloID), jsonSpec.Extensions[i], truthSpec.Extensions[i])
}
}
}
func clientHelloSpecJSONTestIdentifier(id ClientHelloID) string {
return id.Client + id.Version
}