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

feat: allow custom GREASE value/body

Browse source 
Added a `Customized` flag to avoid overwriting by `ApplyPreset()`.
This commit is contained in:
Gaukas Wang 2022-11-08 22:11:11 -07:00
parent 8e1e65eb22
commit 77fb9c073d
No known key found for this signature in database
GPG key ID: 9E2F8986D76F8B5D
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
u_parrots.go
View file

@ -1939,16 +1939,19 @@ func (uconn *UConn) ApplyPreset(p *ClientHelloSpec) error {
ext.ServerName = uconn.config.ServerName ext.ServerName = uconn.config.ServerName
} }
case *UtlsGREASEExtension: case *UtlsGREASEExtension:
grease_extensions_seen += 1
if ext.Customized == true { // Requested in #128: allow custom GREASE values
continue
}
switch grease_extensions_seen { switch grease_extensions_seen {
case 0:
ext.Value = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_extension1)
case 1: case 1:
ext.Value = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_extension1)
case 2:
ext.Value = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_extension2) ext.Value = GetBoringGREASEValue(uconn.greaseSeed, ssl_grease_extension2)
ext.Body = []byte{0} ext.Body = []byte{0}
default: default:
return errors.New("at most 2 grease extensions are supported") return errors.New("at most 2 grease extensions are supported")
} }
grease_extensions_seen += 1
case *SessionTicketExtension: case *SessionTicketExtension:
if session == nil && uconn.config.ClientSessionCache != nil { if session == nil && uconn.config.ClientSessionCache != nil {
cacheKey := clientSessionCacheKey(uconn.RemoteAddr(), uconn.config) cacheKey := clientSessionCacheKey(uconn.RemoteAddr(), uconn.config)

5
u_tls_extensions.go
View file

@ -551,8 +551,9 @@ const (
// it is responsibility of user not to generate multiple grease extensions with same value // it is responsibility of user not to generate multiple grease extensions with same value
type UtlsGREASEExtension struct { type UtlsGREASEExtension struct {
Value uint16 Value uint16
Body []byte // in Chrome first grease has empty body, second grease has a single zero byte Body []byte // in Chrome first grease has empty body, second grease has a single zero byte
Customized bool // Requested in #128: if set to true, Value and Body are used as is (otherwise uTLS will generate them)
} }
func (e *UtlsGREASEExtension) writeToUConn(uc *UConn) error { func (e *UtlsGREASEExtension) writeToUConn(uc *UConn) error {