Add webtunnel support (a571773a) · Commits · yifei / lyrebird

common/utlsutil/clienthelloID.go

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		package utlsutil

		import (
		"fmt"
		utls "github.com/refraction-networking/utls"
		"strings"
		)

		var (
		// This should be kept in sync with what is available in utls.
		clientHelloIDMap = map[string]*utls.ClientHelloID{
		"hellogolang": nil, // Don't bother with utls.
		"hellorandomized": &utls.HelloRandomized,
		"hellorandomizedalpn": &utls.HelloRandomizedALPN,
		"hellorandomizednoalpn": &utls.HelloRandomizedNoALPN,
		"hellofirefox_auto": &utls.HelloFirefox_Auto,
		"hellofirefox_55": &utls.HelloFirefox_55,
		"hellofirefox_56": &utls.HelloFirefox_56,
		"hellofirefox_63": &utls.HelloFirefox_63,
		"hellofirefox_65": &utls.HelloFirefox_65,
		"hellofirefox_99": &utls.HelloFirefox_99,
		"hellofirefox_102": &utls.HelloFirefox_102,
		"hellofirefox_105": &utls.HelloFirefox_105,
		"hellochrome_auto": &utls.HelloChrome_Auto,
		"hellochrome_58": &utls.HelloChrome_58,
		"hellochrome_62": &utls.HelloChrome_62,
		"hellochrome_70": &utls.HelloChrome_70,
		"hellochrome_72": &utls.HelloChrome_72,
		"hellochrome_83": &utls.HelloChrome_83,
		"hellochrome_87": &utls.HelloChrome_87,
		"hellochrome_96": &utls.HelloChrome_96,
		"hellochrome_100": &utls.HelloChrome_100,
		"hellochrome_102": &utls.HelloChrome_102,
		"helloios_auto": &utls.HelloIOS_Auto,
		"helloios_11_1": &utls.HelloIOS_11_1,
		"helloios_12_1": &utls.HelloIOS_12_1,
		"helloios_13": &utls.HelloIOS_13,
		"helloios_14": &utls.HelloIOS_14,
		"helloandroid_11": &utls.HelloAndroid_11_OkHttp,
		"helloedge_auto": &utls.HelloEdge_Auto,
		"helloedge_85": &utls.HelloEdge_85,
		"helloedge_106": &utls.HelloEdge_106,
		"hellosafari_auto": &utls.HelloSafari_Auto,
		"hellosafari_16_0": &utls.HelloSafari_16_0,
		"hello360_auto": &utls.Hello360_Auto,
		"hello360_7_5": &utls.Hello360_7_5,
		"hello360_11_0": &utls.Hello360_11_0,
		"helloqq_auto": &utls.HelloQQ_Auto,
		"helloqq_11_1": &utls.HelloQQ_11_1,
		}
		defaultClientHello = &utls.HelloChrome_Auto
		)

		func ParseClientHelloID(s string) (*utls.ClientHelloID, error) {
		s = strings.ToLower(s)
		switch s {
		case "none":
		return nil, nil
		case "":
		return defaultClientHello, nil
		default:
		if ret := clientHelloIDMap[s]; ret != nil {
		return ret, nil
		}
		}
		return nil, fmt.Errorf("invalid ClientHelloID: '%v'", s)
		}

go.mod

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ require (
		github.com/cloudflare/circl v1.3.7 // indirect
		github.com/klauspost/compress v1.17.4 // indirect
		github.com/quic-go/quic-go v0.40.1 // indirect
		gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel v0.0.0-20240220175603-399c24557a18 // indirect
		golang.org/x/sys v0.18.0 // indirect
		golang.org/x/text v0.14.0 // indirect
		)

go.sum

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ gitlab.com/yawning/edwards25519-extra v0.0.0-20231005122941-2149dcafc266 h1:Ivjs
		gitlab.com/yawning/edwards25519-extra v0.0.0-20231005122941-2149dcafc266/go.mod h1:K/3SQWdJL6udzwInHk1gaYaECYxMp9dDayniPq6gCSo=
		gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0 h1:rzdY78Ox2T+VlXcxGxELF+6VyUXlZBhmRqZu5etLm+c=
		gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.5.0/go.mod h1:70bhd4JKW/+1HLfm+TMrgHJsUHG4coelMWwiVEJ2gAg=
		gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel v0.0.0-20240220175603-399c24557a18 h1:1HzbXOJcabrfVn7Fn8mSnSW/y1NvYTYIcqSK5OOUYv0=
		gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel v0.0.0-20240220175603-399c24557a18/go.mod h1:wqPdBpeGYh9E4V9l4YFU3US9Thu4jaahPDbMRmM906M=
		golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
		golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
		golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=

transports/meeklite/meek.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import (
		"encoding/hex"
		"errors"
		"fmt"
		"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/common/utlsutil"
		"io"
		"io/ioutil"
		"net"
		@@ -111,7 +112,7 @@ func newClientArgs(args pt.Args) (ca meekClientArgs, err error) {

		// Parse the (optional) utls argument.
		utlsOpt, _ := args.Get(utlsArg)
		if ca.utls, err = parseClientHelloID(utlsOpt); err != nil {
		if ca.utls, err = utlsutil.ParseClientHelloID(utlsOpt); err != nil {
		return nil, err
		}

transports/meeklite/transport.go

+0 −58

Original line number	Diff line number	Diff line
		@@ -35,49 +35,6 @@ import (

		var (
		errProtocolNegotiated = errors.New("meek_lite: protocol negotiated")

		// This should be kept in sync with what is available in utls.
		clientHelloIDMap = map[string]*utls.ClientHelloID{
		"hellogolang": nil, // Don't bother with utls.
		"hellorandomized": &utls.HelloRandomized,
		"hellorandomizedalpn": &utls.HelloRandomizedALPN,
		"hellorandomizednoalpn": &utls.HelloRandomizedNoALPN,
		"hellofirefox_auto": &utls.HelloFirefox_Auto,
		"hellofirefox_55": &utls.HelloFirefox_55,
		"hellofirefox_56": &utls.HelloFirefox_56,
		"hellofirefox_63": &utls.HelloFirefox_63,
		"hellofirefox_65": &utls.HelloFirefox_65,
		"hellofirefox_99": &utls.HelloFirefox_99,
		"hellofirefox_102": &utls.HelloFirefox_102,
		"hellofirefox_105": &utls.HelloFirefox_105,
		"hellochrome_auto": &utls.HelloChrome_Auto,
		"hellochrome_58": &utls.HelloChrome_58,
		"hellochrome_62": &utls.HelloChrome_62,
		"hellochrome_70": &utls.HelloChrome_70,
		"hellochrome_72": &utls.HelloChrome_72,
		"hellochrome_83": &utls.HelloChrome_83,
		"hellochrome_87": &utls.HelloChrome_87,
		"hellochrome_96": &utls.HelloChrome_96,
		"hellochrome_100": &utls.HelloChrome_100,
		"hellochrome_102": &utls.HelloChrome_102,
		"helloios_auto": &utls.HelloIOS_Auto,
		"helloios_11_1": &utls.HelloIOS_11_1,
		"helloios_12_1": &utls.HelloIOS_12_1,
		"helloios_13": &utls.HelloIOS_13,
		"helloios_14": &utls.HelloIOS_14,
		"helloandroid_11": &utls.HelloAndroid_11_OkHttp,
		"helloedge_auto": &utls.HelloEdge_Auto,
		"helloedge_85": &utls.HelloEdge_85,
		"helloedge_106": &utls.HelloEdge_106,
		"hellosafari_auto": &utls.HelloSafari_Auto,
		"hellosafari_16_0": &utls.HelloSafari_16_0,
		"hello360_auto": &utls.Hello360_Auto,
		"hello360_7_5": &utls.Hello360_7_5,
		"hello360_11_0": &utls.Hello360_11_0,
		"helloqq_auto": &utls.HelloQQ_Auto,
		"helloqq_11_1": &utls.HelloQQ_11_1,
		}
		defaultClientHello = &utls.HelloChrome_Auto
		)

		type roundTripper struct {
		@@ -208,21 +165,6 @@ func newRoundTripper(dialFn base.DialFunc, clientHelloID *utls.ClientHelloID) ht
		}
		}

		func parseClientHelloID(s string) (*utls.ClientHelloID, error) {
		s = strings.ToLower(s)
		switch s {
		case "none":
		return nil, nil
		case "":
		return defaultClientHello, nil
		default:
		if ret := clientHelloIDMap[s]; ret != nil {
		return ret, nil
		}
		}
		return nil, fmt.Errorf("invalid ClientHelloID: '%v'", s)
		}

		func newHTTPTransport(dialFn, dialTLSFn base.DialFunc) *http.Transport {
		base := (http.DefaultTransport).(*http.Transport)