From 679d713b89093b42f23871a1f126f690d8d18d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E3=81=AE=E3=81=8B=E3=81=88=E3=81=A7?= Date: Mon, 6 Sep 2021 12:59:40 +0800 Subject: [PATCH] feat: add Shadowsocks simplified config --- infra/conf/v4/shadowsocks.go | 21 +- proxy/shadowsocks/config.go | 16 ++ proxy/shadowsocks/simplified/config.go | 48 ++++ proxy/shadowsocks/simplified/config.pb.go | 269 ++++++++++++++++++++++ proxy/shadowsocks/simplified/config.proto | 28 +++ 5 files changed, 363 insertions(+), 19 deletions(-) create mode 100644 proxy/shadowsocks/simplified/config.go create mode 100644 proxy/shadowsocks/simplified/config.pb.go create mode 100644 proxy/shadowsocks/simplified/config.proto diff --git a/infra/conf/v4/shadowsocks.go b/infra/conf/v4/shadowsocks.go index 45d83dc1e..6af6bf5dc 100644 --- a/infra/conf/v4/shadowsocks.go +++ b/infra/conf/v4/shadowsocks.go @@ -1,8 +1,6 @@ package v4 import ( - "strings" - "github.com/golang/protobuf/proto" "github.com/v2fly/v2ray-core/v4/common/protocol" @@ -11,21 +9,6 @@ import ( "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" ) -func cipherFromString(c string) shadowsocks.CipherType { - switch strings.ToLower(c) { - case "aes-128-gcm", "aead_aes_128_gcm": - return shadowsocks.CipherType_AES_128_GCM - case "aes-256-gcm", "aead_aes_256_gcm": - return shadowsocks.CipherType_AES_256_GCM - case "chacha20-poly1305", "aead_chacha20_poly1305", "chacha20-ietf-poly1305": - return shadowsocks.CipherType_CHACHA20_POLY1305 - case "none", "plain": - return shadowsocks.CipherType_NONE - default: - return shadowsocks.CipherType_UNKNOWN - } -} - type ShadowsocksServerConfig struct { Cipher string `json:"method"` Password string `json:"password"` @@ -48,7 +31,7 @@ func (v *ShadowsocksServerConfig) Build() (proto.Message, error) { Password: v.Password, IvCheck: v.IVCheck, } - account.CipherType = cipherFromString(v.Cipher) + account.CipherType = shadowsocks.CipherFromString(v.Cipher) if account.CipherType == shadowsocks.CipherType_UNKNOWN { return nil, newError("unknown cipher method: ", v.Cipher) } @@ -98,7 +81,7 @@ func (v *ShadowsocksClientConfig) Build() (proto.Message, error) { account := &shadowsocks.Account{ Password: server.Password, } - account.CipherType = cipherFromString(server.Cipher) + account.CipherType = shadowsocks.CipherFromString(server.Cipher) if account.CipherType == shadowsocks.CipherType_UNKNOWN { return nil, newError("unknown cipher method: ", server.Cipher) } diff --git a/proxy/shadowsocks/config.go b/proxy/shadowsocks/config.go index 470e8028c..97dab5094 100644 --- a/proxy/shadowsocks/config.go +++ b/proxy/shadowsocks/config.go @@ -7,6 +7,7 @@ import ( "crypto/md5" "crypto/sha1" "io" + "strings" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/hkdf" @@ -206,6 +207,21 @@ func (NoneCipher) DecodePacket(key []byte, b *buf.Buffer) error { return nil } +func CipherFromString(c string) CipherType { + switch strings.ToLower(c) { + case "aes-128-gcm", "aead_aes_128_gcm": + return CipherType_AES_128_GCM + case "aes-256-gcm", "aead_aes_256_gcm": + return CipherType_AES_256_GCM + case "chacha20-poly1305", "aead_chacha20_poly1305", "chacha20-ietf-poly1305": + return CipherType_CHACHA20_POLY1305 + case "none", "plain": + return CipherType_NONE + default: + return CipherType_UNKNOWN + } +} + func passwordToCipherKey(password []byte, keySize int32) []byte { key := make([]byte, 0, keySize) diff --git a/proxy/shadowsocks/simplified/config.go b/proxy/shadowsocks/simplified/config.go new file mode 100644 index 000000000..af28806c2 --- /dev/null +++ b/proxy/shadowsocks/simplified/config.go @@ -0,0 +1,48 @@ +package simplified + +import ( + "context" + + "github.com/v2fly/v2ray-core/v4/common" + "github.com/v2fly/v2ray-core/v4/common/protocol" + "github.com/v2fly/v2ray-core/v4/common/serial" + "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks" +) + +func init() { + common.Must(common.RegisterConfig((*ServerConfig)(nil), func(ctx context.Context, config interface{}) (interface{}, error) { + simplifiedServer := config.(*ServerConfig) + fullServer := &shadowsocks.ServerConfig{ + User: &protocol.User{ + Account: serial.ToTypedMessage(&shadowsocks.Account{ + Password: simplifiedServer.Password, + CipherType: shadowsocks.CipherFromString(simplifiedServer.Method), + }), + }, + } + + return common.CreateObject(ctx, fullServer) + })) + + common.Must(common.RegisterConfig((*ClientConfig)(nil), func(ctx context.Context, config interface{}) (interface{}, error) { + simplifiedClient := config.(*ClientConfig) + fullClient := &shadowsocks.ClientConfig{ + Server: []*protocol.ServerEndpoint{ + { + Address: simplifiedClient.Address, + Port: simplifiedClient.Port, + User: []*protocol.User{ + { + Account: serial.ToTypedMessage(&shadowsocks.Account{ + Password: simplifiedClient.Password, + CipherType: shadowsocks.CipherFromString(simplifiedClient.Method), + }), + }, + }, + }, + }, + } + + return common.CreateObject(ctx, fullClient) + })) +} diff --git a/proxy/shadowsocks/simplified/config.pb.go b/proxy/shadowsocks/simplified/config.pb.go new file mode 100644 index 000000000..99b863f2b --- /dev/null +++ b/proxy/shadowsocks/simplified/config.pb.go @@ -0,0 +1,269 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.27.1 +// protoc v3.17.3 +// source: proxy/shadowsocks/simplified/config.proto + +package simplified + +import ( + net "github.com/v2fly/v2ray-core/v4/common/net" + _ "github.com/v2fly/v2ray-core/v4/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 ServerConfig struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Method string `protobuf:"bytes,1,opt,name=method,proto3" json:"method,omitempty"` + Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` +} + +func (x *ServerConfig) Reset() { + *x = ServerConfig{} + if protoimpl.UnsafeEnabled { + mi := &file_proxy_shadowsocks_simplified_config_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ServerConfig) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ServerConfig) ProtoMessage() {} + +func (x *ServerConfig) ProtoReflect() protoreflect.Message { + mi := &file_proxy_shadowsocks_simplified_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 ServerConfig.ProtoReflect.Descriptor instead. +func (*ServerConfig) Descriptor() ([]byte, []int) { + return file_proxy_shadowsocks_simplified_config_proto_rawDescGZIP(), []int{0} +} + +func (x *ServerConfig) GetMethod() string { + if x != nil { + return x.Method + } + return "" +} + +func (x *ServerConfig) GetPassword() string { + if x != nil { + return x.Password + } + return "" +} + +type ClientConfig struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Address *net.IPOrDomain `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Port uint32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"` + Method string `protobuf:"bytes,3,opt,name=method,proto3" json:"method,omitempty"` + Password string `protobuf:"bytes,4,opt,name=password,proto3" json:"password,omitempty"` +} + +func (x *ClientConfig) Reset() { + *x = ClientConfig{} + if protoimpl.UnsafeEnabled { + mi := &file_proxy_shadowsocks_simplified_config_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ClientConfig) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ClientConfig) ProtoMessage() {} + +func (x *ClientConfig) ProtoReflect() protoreflect.Message { + mi := &file_proxy_shadowsocks_simplified_config_proto_msgTypes[1] + 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 ClientConfig.ProtoReflect.Descriptor instead. +func (*ClientConfig) Descriptor() ([]byte, []int) { + return file_proxy_shadowsocks_simplified_config_proto_rawDescGZIP(), []int{1} +} + +func (x *ClientConfig) GetAddress() *net.IPOrDomain { + if x != nil { + return x.Address + } + return nil +} + +func (x *ClientConfig) GetPort() uint32 { + if x != nil { + return x.Port + } + return 0 +} + +func (x *ClientConfig) GetMethod() string { + if x != nil { + return x.Method + } + return "" +} + +func (x *ClientConfig) GetPassword() string { + if x != nil { + return x.Password + } + return "" +} + +var File_proxy_shadowsocks_simplified_config_proto protoreflect.FileDescriptor + +var file_proxy_shadowsocks_simplified_config_proto_rawDesc = []byte{ + 0x0a, 0x29, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, + 0x63, 0x6b, 0x73, 0x2f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2f, 0x63, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x27, 0x76, 0x32, 0x72, + 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x2e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, + 0x66, 0x69, 0x65, 0x64, 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, 0x1a, 0x18, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6e, + 0x65, 0x74, 0x2f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0x62, 0x0a, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x3a, 0x1e, 0x82, 0xb5, 0x18, 0x09, 0x0a, 0x07, 0x69, 0x6e, 0x62, 0x6f, + 0x75, 0x6e, 0x64, 0x82, 0xb5, 0x18, 0x0d, 0x12, 0x0b, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, + 0x6f, 0x63, 0x6b, 0x73, 0x22, 0xb4, 0x01, 0x0a, 0x0c, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3b, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, + 0x6f, 0x72, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x74, 0x2e, 0x49, + 0x50, 0x4f, 0x72, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x1a, + 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3a, 0x1f, 0x82, 0xb5, 0x18, 0x0a, + 0x0a, 0x08, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x82, 0xb5, 0x18, 0x0d, 0x12, 0x0b, + 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x42, 0x96, 0x01, 0x0a, 0x2b, + 0x63, 0x6f, 0x6d, 0x2e, 0x76, 0x32, 0x72, 0x61, 0x79, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, + 0x2e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0x50, 0x01, 0x5a, 0x3b, 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, 0x34, 0x2f, 0x70, 0x72, + 0x6f, 0x78, 0x79, 0x2f, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x2f, + 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x66, 0x69, 0x65, 0x64, 0xaa, 0x02, 0x27, 0x56, 0x32, 0x52, + 0x61, 0x79, 0x2e, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x53, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x73, 0x6f, 0x63, 0x6b, 0x73, 0x2e, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x69, + 0x66, 0x69, 0x65, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_proxy_shadowsocks_simplified_config_proto_rawDescOnce sync.Once + file_proxy_shadowsocks_simplified_config_proto_rawDescData = file_proxy_shadowsocks_simplified_config_proto_rawDesc +) + +func file_proxy_shadowsocks_simplified_config_proto_rawDescGZIP() []byte { + file_proxy_shadowsocks_simplified_config_proto_rawDescOnce.Do(func() { + file_proxy_shadowsocks_simplified_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_proxy_shadowsocks_simplified_config_proto_rawDescData) + }) + return file_proxy_shadowsocks_simplified_config_proto_rawDescData +} + +var file_proxy_shadowsocks_simplified_config_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_proxy_shadowsocks_simplified_config_proto_goTypes = []interface{}{ + (*ServerConfig)(nil), // 0: v2ray.core.proxy.shadowsocks.simplified.ServerConfig + (*ClientConfig)(nil), // 1: v2ray.core.proxy.shadowsocks.simplified.ClientConfig + (*net.IPOrDomain)(nil), // 2: v2ray.core.common.net.IPOrDomain +} +var file_proxy_shadowsocks_simplified_config_proto_depIdxs = []int32{ + 2, // 0: v2ray.core.proxy.shadowsocks.simplified.ClientConfig.address:type_name -> v2ray.core.common.net.IPOrDomain + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_proxy_shadowsocks_simplified_config_proto_init() } +func file_proxy_shadowsocks_simplified_config_proto_init() { + if File_proxy_shadowsocks_simplified_config_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_proxy_shadowsocks_simplified_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ServerConfig); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_proxy_shadowsocks_simplified_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ClientConfig); 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_proxy_shadowsocks_simplified_config_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_proxy_shadowsocks_simplified_config_proto_goTypes, + DependencyIndexes: file_proxy_shadowsocks_simplified_config_proto_depIdxs, + MessageInfos: file_proxy_shadowsocks_simplified_config_proto_msgTypes, + }.Build() + File_proxy_shadowsocks_simplified_config_proto = out.File + file_proxy_shadowsocks_simplified_config_proto_rawDesc = nil + file_proxy_shadowsocks_simplified_config_proto_goTypes = nil + file_proxy_shadowsocks_simplified_config_proto_depIdxs = nil +} diff --git a/proxy/shadowsocks/simplified/config.proto b/proxy/shadowsocks/simplified/config.proto new file mode 100644 index 000000000..d4dd40f32 --- /dev/null +++ b/proxy/shadowsocks/simplified/config.proto @@ -0,0 +1,28 @@ +syntax = "proto3"; + +package v2ray.core.proxy.shadowsocks.simplified; +option csharp_namespace = "V2Ray.Core.Proxy.Shadowsocks.Simplified"; +option go_package = "github.com/v2fly/v2ray-core/v4/proxy/shadowsocks/simplified"; +option java_package = "com.v2ray.core.proxy.shadowsocks.simplified"; +option java_multiple_files = true; + +import "common/protoext/extensions.proto"; +import "common/net/address.proto"; + +message ServerConfig{ + option (v2ray.core.common.protoext.message_opt).type = "inbound"; + option (v2ray.core.common.protoext.message_opt).short_name = "shadowsocks"; + + string method = 1; + string password = 2; +} + +message ClientConfig { + option (v2ray.core.common.protoext.message_opt).type = "outbound"; + option (v2ray.core.common.protoext.message_opt).short_name = "shadowsocks"; + + v2ray.core.common.net.IPOrDomain address = 1; + uint32 port = 2; + string method = 3; + string password = 4; +} \ No newline at end of file