mirror of
https://github.com/refraction-networking/utls.git
synced 2025-04-03 20:17:36 +03:00
Implement ClientHelloSpec JSON Unmarshaler (#176)
* 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
GitHub
parent
6d2506f52f
commit
3721531ea9
13 changed files with 1453 additions and 357 deletions
131
u_common.go
131
u_common.go
|
|
@ -210,8 +210,9 @@ func (chs *ClientHelloSpec) ReadTLSExtensions(b []byte, allowBluntMimicry bool)
|
|||
return fmt.Errorf("unable to read data for extension %x", extension)
|
||||
}
|
||||
|
||||
extWriter := ExtensionIDToExtension(extension)
|
||||
if extWriter != nil {
|
||||
ext := ExtensionFromID(extension)
|
||||
extWriter, ok := ext.(TLSExtensionWriter)
|
||||
if ext != nil && ok { // known extension and implements TLSExtensionWriter properly
|
||||
if extension == extensionSupportedVersions {
|
||||
chs.TLSVersMin = 0
|
||||
chs.TLSVersMax = 0
|
||||
|
|
@ -293,8 +294,12 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
}
|
||||
|
||||
for _, extType := range tlsExtensionTypes {
|
||||
extension := ExtensionIDToExtension(extType)
|
||||
if extension == nil {
|
||||
extension := ExtensionFromID(extType)
|
||||
extWriter, ok := extension.(TLSExtensionWriter)
|
||||
if !ok {
|
||||
return fmt.Errorf("unsupported extension %d", extType)
|
||||
}
|
||||
if extension == nil || !ok {
|
||||
log.Printf("[Warning] Unsupported extension %d added as a &GenericExtension without Data", extType)
|
||||
chs.Extensions = append(chs.Extensions, &GenericExtension{extType, []byte{}})
|
||||
} else {
|
||||
|
|
@ -303,7 +308,7 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
if data["pt_fmts"] == nil {
|
||||
return errors.New("pt_fmts is required")
|
||||
}
|
||||
_, err = extension.Write(data["pt_fmts"])
|
||||
_, err = extWriter.Write(data["pt_fmts"])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -311,7 +316,7 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
if data["sig_algs"] == nil {
|
||||
return errors.New("sig_algs is required")
|
||||
}
|
||||
_, err = extension.Write(data["sig_algs"])
|
||||
_, err = extWriter.Write(data["sig_algs"])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -327,7 +332,7 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
fixedData := make([]byte, len(data["supported_versions"])+1)
|
||||
fixedData[0] = uint8(len(data["supported_versions"]) & 0xff)
|
||||
copy(fixedData[1:], data["supported_versions"])
|
||||
_, err = extension.Write(fixedData)
|
||||
_, err = extWriter.Write(fixedData)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -336,7 +341,7 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
return errors.New("curves is required")
|
||||
}
|
||||
|
||||
_, err = extension.Write(data["curves"])
|
||||
_, err = extWriter.Write(data["curves"])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -345,7 +350,7 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
return errors.New("alpn is required")
|
||||
}
|
||||
|
||||
_, err = extension.Write(data["alpn"])
|
||||
_, err = extWriter.Write(data["alpn"])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -365,7 +370,7 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
// add uint16 length prefix
|
||||
fixedData = append([]byte{uint8(len(fixedData) >> 8), uint8(len(fixedData) & 0xff)}, fixedData...)
|
||||
|
||||
_, err = extension.Write(fixedData)
|
||||
_, err = extWriter.Write(fixedData)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -378,7 +383,7 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
fixedData := make([]byte, len(data["psk_key_exchange_modes"])+1)
|
||||
fixedData[0] = uint8(len(data["psk_key_exchange_modes"]) & 0xff)
|
||||
copy(fixedData[1:], data["psk_key_exchange_modes"])
|
||||
_, err = extension.Write(fixedData)
|
||||
_, err = extWriter.Write(fixedData)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -391,7 +396,7 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
fixedData := make([]byte, len(data["cert_compression_algs"])+1)
|
||||
fixedData[0] = uint8(len(data["cert_compression_algs"]) & 0xff)
|
||||
copy(fixedData[1:], data["cert_compression_algs"])
|
||||
_, err = extension.Write(fixedData)
|
||||
_, err = extWriter.Write(fixedData)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -400,13 +405,13 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
return errors.New("record_size_limit is required")
|
||||
}
|
||||
|
||||
_, err = extension.Write(data["record_size_limit"]) // uint16 as []byte
|
||||
_, err = extWriter.Write(data["record_size_limit"]) // uint16 as []byte
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
case utlsExtensionApplicationSettings:
|
||||
// TODO: tlsfingerprint.io should record/provide application settings data
|
||||
extension.(*ApplicationSettingsExtension).SupportedProtocols = []string{"h2"}
|
||||
extWriter.(*ApplicationSettingsExtension).SupportedProtocols = []string{"h2"}
|
||||
case fakeExtensionPreSharedKey:
|
||||
log.Printf("[Warning] PSK extension added without data")
|
||||
default:
|
||||
|
|
@ -416,12 +421,15 @@ func (chs *ClientHelloSpec) ImportTLSClientHello(data map[string][]byte) error {
|
|||
log.Printf("[Warning] GREASE extension added but ID/Data discarded. They will be automatically re-GREASEd on ApplyPreset() call.")
|
||||
}*/
|
||||
}
|
||||
chs.Extensions = append(chs.Extensions, extension)
|
||||
chs.Extensions = append(chs.Extensions, extWriter)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ImportTLSClientHelloFromJSON imports ClientHelloSpec from JSON data from client.tlsfingerprint.io format
|
||||
//
|
||||
// It calls ImportTLSClientHello internally after unmarshaling JSON data into map[string][]byte
|
||||
func (chs *ClientHelloSpec) ImportTLSClientHelloFromJSON(jsonB []byte) error {
|
||||
var data map[string][]byte
|
||||
err := json.Unmarshal(jsonB, &data)
|
||||
|
|
@ -431,6 +439,99 @@ func (chs *ClientHelloSpec) ImportTLSClientHelloFromJSON(jsonB []byte) error {
|
|||
return chs.ImportTLSClientHello(data)
|
||||
}
|
||||
|
||||
// FromRaw converts a ClientHello message in the form of raw bytes into a ClientHelloSpec.
|
||||
func (chs *ClientHelloSpec) FromRaw(raw []byte, allowBluntMimicry ...bool) error {
|
||||
if chs == nil {
|
||||
return errors.New("cannot unmarshal into nil ClientHelloSpec")
|
||||
}
|
||||
|
||||
var bluntMimicry = false
|
||||
if len(allowBluntMimicry) == 1 {
|
||||
bluntMimicry = allowBluntMimicry[0]
|
||||
}
|
||||
|
||||
*chs = ClientHelloSpec{} // reset
|
||||
s := cryptobyte.String(raw)
|
||||
|
||||
var contentType uint8
|
||||
var recordVersion uint16
|
||||
if !s.ReadUint8(&contentType) || // record type
|
||||
!s.ReadUint16(&recordVersion) || !s.Skip(2) { // record version and length
|
||||
return errors.New("unable to read record type, version, and length")
|
||||
}
|
||||
|
||||
if recordType(contentType) != recordTypeHandshake {
|
||||
return errors.New("record is not a handshake")
|
||||
}
|
||||
|
||||
var handshakeVersion uint16
|
||||
var handshakeType uint8
|
||||
|
||||
if !s.ReadUint8(&handshakeType) || !s.Skip(3) || // message type and 3 byte length
|
||||
!s.ReadUint16(&handshakeVersion) || !s.Skip(32) { // 32 byte random
|
||||
return errors.New("unable to read handshake message type, length, and random")
|
||||
}
|
||||
|
||||
if handshakeType != typeClientHello {
|
||||
return errors.New("handshake message is not a ClientHello")
|
||||
}
|
||||
|
||||
chs.TLSVersMin = recordVersion
|
||||
chs.TLSVersMax = handshakeVersion
|
||||
|
||||
var ignoredSessionID cryptobyte.String
|
||||
if !s.ReadUint8LengthPrefixed(&ignoredSessionID) {
|
||||
return errors.New("unable to read session id")
|
||||
}
|
||||
|
||||
// CipherSuites
|
||||
var cipherSuitesBytes cryptobyte.String
|
||||
if !s.ReadUint16LengthPrefixed(&cipherSuitesBytes) {
|
||||
return errors.New("unable to read ciphersuites")
|
||||
}
|
||||
|
||||
if err := chs.ReadCipherSuites(cipherSuitesBytes); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// CompressionMethods
|
||||
var compressionMethods cryptobyte.String
|
||||
if !s.ReadUint8LengthPrefixed(&compressionMethods) {
|
||||
return errors.New("unable to read compression methods")
|
||||
}
|
||||
|
||||
if err := chs.ReadCompressionMethods(compressionMethods); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if s.Empty() {
|
||||
// Extensions are optional
|
||||
return nil
|
||||
}
|
||||
|
||||
var extensions cryptobyte.String
|
||||
if !s.ReadUint16LengthPrefixed(&extensions) {
|
||||
return errors.New("unable to read extensions data")
|
||||
}
|
||||
|
||||
if err := chs.ReadTLSExtensions(extensions, bluntMimicry); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// UnmarshalJSON unmarshals a ClientHello message in the form of JSON into a ClientHelloSpec.
|
||||
func (chs *ClientHelloSpec) UnmarshalJSON(jsonB []byte) error {
|
||||
var chsju ClientHelloSpecJSONUnmarshaler
|
||||
if err := json.Unmarshal(jsonB, &chsju); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
*chs = chsju.ClientHelloSpec()
|
||||
return nil
|
||||
}
|
||||
|
||||
var (
|
||||
// HelloGolang will use default "crypto/tls" handshake marshaling codepath, which WILL
|
||||
// overwrite your changes to Hello(Config, Session are fine).
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue