From 94639807adebbf565852d639e3bf5d6d878529eb Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Mon, 29 May 2023 22:19:50 +0100 Subject: [PATCH] add meek request stereotype --- main/distro/all/all.go | 2 + .../request/stereotype/meek/config.pb.go | 156 ++++++++++++++++++ .../request/stereotype/meek/config.proto | 16 ++ .../stereotype/meek/errors.generated.go | 9 + .../internet/request/stereotype/meek/meek.go | 72 ++++++++ 5 files changed, 255 insertions(+) create mode 100644 transport/internet/request/stereotype/meek/config.pb.go create mode 100644 transport/internet/request/stereotype/meek/config.proto create mode 100644 transport/internet/request/stereotype/meek/errors.generated.go create mode 100644 transport/internet/request/stereotype/meek/meek.go diff --git a/main/distro/all/all.go b/main/distro/all/all.go index 32a6489d5..9bcbc14c2 100644 --- a/main/distro/all/all.go +++ b/main/distro/all/all.go @@ -71,6 +71,8 @@ import ( _ "github.com/v2fly/v2ray-core/v5/transport/internet/request/assembler/simple" _ "github.com/v2fly/v2ray-core/v5/transport/internet/request/roundtripper/httprt" + _ "github.com/v2fly/v2ray-core/v5/transport/internet/request/stereotype/meek" + // Transport headers _ "github.com/v2fly/v2ray-core/v5/transport/internet/headers/http" _ "github.com/v2fly/v2ray-core/v5/transport/internet/headers/noop" diff --git a/transport/internet/request/stereotype/meek/config.pb.go b/transport/internet/request/stereotype/meek/config.pb.go new file mode 100644 index 000000000..72a8a94f2 --- /dev/null +++ b/transport/internet/request/stereotype/meek/config.pb.go @@ -0,0 +1,156 @@ +package meek + +import ( + _ "github.com/v2fly/v2ray-core/v5/common/protoext" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type Config struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` +} + +func (x *Config) Reset() { + *x = Config{} + if protoimpl.UnsafeEnabled { + mi := &file_transport_internet_request_stereotype_meek_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Config) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Config) ProtoMessage() {} + +func (x *Config) ProtoReflect() protoreflect.Message { + mi := &file_transport_internet_request_stereotype_meek_config_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Config.ProtoReflect.Descriptor instead. +func (*Config) Descriptor() ([]byte, []int) { + return file_transport_internet_request_stereotype_meek_config_proto_rawDescGZIP(), []int{0} +} + +func (x *Config) GetUrl() string { + if x != nil { + return x.Url + } + return "" +} + +var File_transport_internet_request_stereotype_meek_config_proto protoreflect.FileDescriptor + +var file_transport_internet_request_stereotype_meek_config_proto_rawDesc = []byte{ + 0x0a, 0x37, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2f, 0x73, 0x74, 0x65, + 0x72, 0x65, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x65, 0x65, 0x6b, 0x2f, 0x63, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x35, 0x76, 0x32, 0x72, 0x61, 0x79, + 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x2e, 0x73, 0x74, 0x65, 0x72, 0x65, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x65, 0x6b, + 0x1a, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x65, 0x78, + 0x74, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0x31, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x3a, 0x15, + 0x82, 0xb5, 0x18, 0x11, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x12, + 0x04, 0x6d, 0x65, 0x65, 0x6b, 0x42, 0xc0, 0x01, 0x0a, 0x39, 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, + 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, + 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x72, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x2e, 0x73, 0x74, 0x65, 0x72, 0x65, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, + 0x65, 0x65, 0x6b, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x76, 0x32, 0x66, 0x6c, 0x79, 0x2f, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2d, 0x63, 0x6f, + 0x72, 0x65, 0x2f, 0x76, 0x35, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x2f, 0x73, 0x74, 0x65, 0x72, 0x65, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x65, 0x65, 0x6b, + 0xaa, 0x02, 0x35, 0x56, 0x32, 0x52, 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, + 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, + 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x53, 0x74, 0x65, 0x72, 0x65, 0x6f, 0x74, + 0x79, 0x70, 0x65, 0x2e, 0x4d, 0x65, 0x65, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_transport_internet_request_stereotype_meek_config_proto_rawDescOnce sync.Once + file_transport_internet_request_stereotype_meek_config_proto_rawDescData = file_transport_internet_request_stereotype_meek_config_proto_rawDesc +) + +func file_transport_internet_request_stereotype_meek_config_proto_rawDescGZIP() []byte { + file_transport_internet_request_stereotype_meek_config_proto_rawDescOnce.Do(func() { + file_transport_internet_request_stereotype_meek_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_transport_internet_request_stereotype_meek_config_proto_rawDescData) + }) + return file_transport_internet_request_stereotype_meek_config_proto_rawDescData +} + +var file_transport_internet_request_stereotype_meek_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_transport_internet_request_stereotype_meek_config_proto_goTypes = []interface{}{ + (*Config)(nil), // 0: v2ray.core.transport.internet.request.stereotype.meek.Config +} +var file_transport_internet_request_stereotype_meek_config_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_transport_internet_request_stereotype_meek_config_proto_init() } +func file_transport_internet_request_stereotype_meek_config_proto_init() { + if File_transport_internet_request_stereotype_meek_config_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_transport_internet_request_stereotype_meek_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Config); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_transport_internet_request_stereotype_meek_config_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_transport_internet_request_stereotype_meek_config_proto_goTypes, + DependencyIndexes: file_transport_internet_request_stereotype_meek_config_proto_depIdxs, + MessageInfos: file_transport_internet_request_stereotype_meek_config_proto_msgTypes, + }.Build() + File_transport_internet_request_stereotype_meek_config_proto = out.File + file_transport_internet_request_stereotype_meek_config_proto_rawDesc = nil + file_transport_internet_request_stereotype_meek_config_proto_goTypes = nil + file_transport_internet_request_stereotype_meek_config_proto_depIdxs = nil +} diff --git a/transport/internet/request/stereotype/meek/config.proto b/transport/internet/request/stereotype/meek/config.proto new file mode 100644 index 000000000..482bc2866 --- /dev/null +++ b/transport/internet/request/stereotype/meek/config.proto @@ -0,0 +1,16 @@ +syntax = "proto3"; + +package v2ray.core.transport.internet.request.stereotype.meek; +option csharp_namespace = "V2Ray.Core.Transport.Internet.Request.Stereotype.Meek"; +option go_package = "github.com/v2fly/v2ray-core/v5/transport/internet/request/stereotype/meek"; +option java_package = "com.v2ray.core.transport.internet.request.stereotype.meek"; +option java_multiple_files = true; + +import "common/protoext/extensions.proto"; + +message Config{ + option (v2ray.core.common.protoext.message_opt).type = "transport"; + option (v2ray.core.common.protoext.message_opt).short_name = "meek"; + + string url = 1; +} \ No newline at end of file diff --git a/transport/internet/request/stereotype/meek/errors.generated.go b/transport/internet/request/stereotype/meek/errors.generated.go new file mode 100644 index 000000000..68ac2e47f --- /dev/null +++ b/transport/internet/request/stereotype/meek/errors.generated.go @@ -0,0 +1,9 @@ +package meek + +import "github.com/v2fly/v2ray-core/v5/common/errors" + +type errPathObjHolder struct{} + +func newError(values ...interface{}) *errors.Error { + return errors.New(values...).WithPathObj(errPathObjHolder{}) +} diff --git a/transport/internet/request/stereotype/meek/meek.go b/transport/internet/request/stereotype/meek/meek.go new file mode 100644 index 000000000..db232e590 --- /dev/null +++ b/transport/internet/request/stereotype/meek/meek.go @@ -0,0 +1,72 @@ +package meek + +import ( + "context" + + "github.com/v2fly/v2ray-core/v5/common" + "github.com/v2fly/v2ray-core/v5/common/net" + "github.com/v2fly/v2ray-core/v5/common/serial" + "github.com/v2fly/v2ray-core/v5/transport/internet" + "github.com/v2fly/v2ray-core/v5/transport/internet/request/assembler/simple" + "github.com/v2fly/v2ray-core/v5/transport/internet/request/assembly" + "github.com/v2fly/v2ray-core/v5/transport/internet/request/roundtripper/httprt" +) + +//go:generate go run github.com/v2fly/v2ray-core/v5/common/errors/errorgen + +const protocolName = "meek" + +func init() { + common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) { + return nil, newError("meek is a transport") + })) + + common.Must(internet.RegisterTransportDialer(protocolName, meekDial)) + common.Must(internet.RegisterTransportListener(protocolName, meekListen)) +} + +func meekDial(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (internet.Connection, error) { + meekSetting := streamSettings.ProtocolSettings.(*Config) + simpleAssembler := &simple.ClientConfig{ + MaxWriteSize: 65536, + WaitSubsequentWriteMs: 10, + InitialPollingIntervalMs: 100, + MaxPollingIntervalMs: 1000, + MinPollingIntervalMs: 10, + BackoffFactor: 1.5, + FailedRetryIntervalMs: 1000, + } + httprtSetting := &httprt.ClientConfig{Http: &httprt.HTTPConfig{ + UrlPrefix: meekSetting.Url, + }} + request := &assembly.Config{ + Assembler: serial.ToTypedMessage(simpleAssembler), + Roundtripper: serial.ToTypedMessage(httprtSetting), + } + constructedSetting := &internet.MemoryStreamConfig{ + ProtocolName: "request", + ProtocolSettings: request, + SecurityType: streamSettings.SecurityType, + SecuritySettings: streamSettings.SecuritySettings, + SocketSettings: streamSettings.SocketSettings, + } + return internet.Dial(ctx, dest, constructedSetting) +} + +func meekListen(ctx context.Context, address net.Address, port net.Port, streamSettings *internet.MemoryStreamConfig, callback internet.ConnHandler) (internet.Listener, error) { + meekSetting := streamSettings.ProtocolSettings.(*Config) + simpleAssembler := &simple.ServerConfig{MaxWriteSize: 65536} + httprtSetting := &httprt.ServerConfig{NoDecodingSessionTag: true, Http: &httprt.HTTPConfig{UrlPrefix: meekSetting.Url}} + request := &assembly.Config{ + Assembler: serial.ToTypedMessage(simpleAssembler), + Roundtripper: serial.ToTypedMessage(httprtSetting), + } + constructedSetting := &internet.MemoryStreamConfig{ + ProtocolName: "request", + ProtocolSettings: request, + SecurityType: streamSettings.SecurityType, + SecuritySettings: streamSettings.SecuritySettings, + SocketSettings: streamSettings.SocketSettings, + } + return internet.ListenTCP(ctx, address, port, constructedSetting, callback) +}