diff --git a/config.go b/config.go new file mode 100644 index 000000000..fc45ac1ab --- /dev/null +++ b/config.go @@ -0,0 +1,87 @@ +package core + +import ( + "io" + "strings" + + "github.com/golang/protobuf/proto" + "v2ray.com/core/common" + "v2ray.com/core/common/buf" +) + +type ConfigFormat struct { + Name string + Extension []string + Loader ConfigLoader +} + +// ConfigLoader is an utility to load V2Ray config from external source. +type ConfigLoader func(input io.Reader) (*Config, error) + +var ( + configLoaderByName = make(map[string]*ConfigFormat) + configLoaderByExt = make(map[string]*ConfigFormat) +) + +// RegisterConfigLoader add a new ConfigLoader. +func RegisterConfigLoader(format *ConfigFormat) error { + name := strings.ToLower(format.Name) + if _, found := configLoaderByName[name]; found { + return newError(format.Name, " already registered.") + } + configLoaderByName[name] = format + + for _, ext := range format.Extension { + lext := strings.ToLower(ext) + if f, found := configLoaderByExt[lext]; found { + return newError(ext, " already registered to ", f.Name) + } + configLoaderByExt[lext] = format + } + + return nil +} + +func getExtension(filename string) string { + idx := strings.LastIndexByte(filename, '.') + if idx == -1 { + return "" + } + return filename[idx+1:] +} + +// LoadConfig loads config with given format from given source. +func LoadConfig(formatName string, filename string, input io.Reader) (*Config, error) { + ext := getExtension(filename) + if len(ext) > 0 { + if f, found := configLoaderByExt[ext]; found { + return f.Loader(input) + } + } + + if f, found := configLoaderByName[formatName]; found { + return f.Loader(input) + } + + return nil, newError("Unable to load config in ", formatName).AtWarning() +} + +func loadProtobufConfig(input io.Reader) (*Config, error) { + config := new(Config) + data, err := buf.ReadAllToBytes(input) + if err != nil { + return nil, err + } + if err := proto.Unmarshal(data, config); err != nil { + return nil, err + } + return config, nil +} + +func init() { + common.Must(RegisterConfigLoader(&ConfigFormat{ + Name: "Protobuf", + Extension: []string{"pb"}, + Loader: loadProtobufConfig, + })) +} diff --git a/config.pb.go b/config.pb.go index 1429f6e22..ac34e2404 100644 --- a/config.pb.go +++ b/config.pb.go @@ -17,28 +17,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package -// Configuration serialization format. -type ConfigFormat int32 - -const ( - ConfigFormat_Protobuf ConfigFormat = 0 - ConfigFormat_JSON ConfigFormat = 1 -) - -var ConfigFormat_name = map[int32]string{ - 0: "Protobuf", - 1: "JSON", -} -var ConfigFormat_value = map[string]int32{ - "Protobuf": 0, - "JSON": 1, -} - -func (x ConfigFormat) String() string { - return proto.EnumName(ConfigFormat_name, int32(x)) -} -func (ConfigFormat) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } - // Master config of V2Ray. V2Ray takes this config as input and functions accordingly. type Config struct { // Inbound handler configurations. Must have at least one item. @@ -186,39 +164,36 @@ func init() { proto.RegisterType((*Config)(nil), "v2ray.core.Config") proto.RegisterType((*InboundHandlerConfig)(nil), "v2ray.core.InboundHandlerConfig") proto.RegisterType((*OutboundHandlerConfig)(nil), "v2ray.core.OutboundHandlerConfig") - proto.RegisterEnum("v2ray.core.ConfigFormat", ConfigFormat_name, ConfigFormat_value) } func init() { proto.RegisterFile("v2ray.com/core/config.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 436 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0x71, 0x13, 0xba, 0xf6, 0x6d, 0x94, 0x60, 0x01, 0xb2, 0x06, 0x87, 0x50, 0x69, 0x53, - 0xc5, 0xc1, 0x45, 0xe5, 0x82, 0x26, 0x71, 0x61, 0x08, 0xc1, 0xa4, 0xd1, 0x29, 0x45, 0x1c, 0xb8, - 0x4c, 0x6e, 0xfa, 0x56, 0x45, 0x5a, 0xec, 0xc8, 0x76, 0xa7, 0xe6, 0x2b, 0xf1, 0x3d, 0xb8, 0xf1, - 0x8d, 0xb8, 0xa0, 0xc4, 0x49, 0x93, 0x41, 0x0f, 0x14, 0x69, 0xa7, 0xc4, 0x79, 0xfe, 0xfd, 0xdf, - 0xfb, 0x25, 0x31, 0x3c, 0xbb, 0x99, 0x68, 0x91, 0xf3, 0x58, 0xa5, 0xe3, 0x58, 0x69, 0x1c, 0xc7, - 0x4a, 0x5e, 0x25, 0x4b, 0x9e, 0x69, 0x65, 0x15, 0x85, 0xba, 0xa8, 0xf1, 0xf0, 0xd5, 0x5f, 0x1b, - 0xd3, 0x54, 0xc9, 0xb1, 0x41, 0x9d, 0x88, 0xeb, 0xb1, 0xcd, 0x33, 0x5c, 0x5c, 0xa6, 0x68, 0x8c, - 0x58, 0xa2, 0xa3, 0x0f, 0x8f, 0xfe, 0x20, 0xac, 0x16, 0xd2, 0x64, 0x4a, 0xdb, 0x5b, 0x4d, 0x86, - 0x3f, 0x3a, 0xd0, 0x3d, 0x2d, 0x1f, 0xd0, 0x13, 0xd8, 0x4b, 0xe4, 0x5c, 0xad, 0xe4, 0x82, 0x91, - 0xd0, 0x1b, 0xed, 0x4f, 0x42, 0xde, 0x4c, 0xc0, 0x3f, 0xb9, 0xd2, 0x47, 0x21, 0x17, 0xd7, 0xa8, - 0x1d, 0x12, 0xd5, 0x00, 0x7d, 0x0b, 0x3d, 0xb5, 0xb2, 0x0e, 0xee, 0x94, 0xf0, 0x8b, 0x36, 0x3c, - 0xad, 0x6a, 0xb7, 0xe9, 0x0d, 0x42, 0xdf, 0x80, 0x27, 0xb2, 0x8c, 0xf9, 0x25, 0x79, 0xdc, 0x26, - 0x9d, 0x28, 0x77, 0xa2, 0xfc, 0x4b, 0x21, 0x7a, 0xee, 0x3c, 0xa3, 0x02, 0xa1, 0x27, 0xd0, 0xdf, - 0x98, 0xb1, 0xfb, 0x21, 0x19, 0xed, 0x4f, 0x9e, 0xb7, 0xf9, 0x4d, 0x91, 0x57, 0x4d, 0x9b, 0xed, - 0xf4, 0x3d, 0xf4, 0x71, 0x6d, 0x51, 0x9a, 0x44, 0x49, 0xd6, 0xdd, 0xa9, 0x77, 0x03, 0x9e, 0xf9, - 0x3d, 0x2f, 0xf0, 0x87, 0x3f, 0x09, 0x3c, 0xde, 0xf6, 0x8a, 0x68, 0x00, 0x9e, 0x15, 0x4b, 0x46, - 0x42, 0x32, 0xea, 0x47, 0xc5, 0x2d, 0x9d, 0xc1, 0x23, 0x8d, 0x31, 0x26, 0x37, 0xa8, 0x2f, 0x0d, - 0x5a, 0x9b, 0xc8, 0xa5, 0x61, 0x9d, 0x72, 0xf4, 0x7f, 0x6d, 0x1f, 0xd4, 0x01, 0xb3, 0x8a, 0xa7, - 0xe7, 0x30, 0xc8, 0xb4, 0x5a, 0xe7, 0x4d, 0xa2, 0xb7, 0x53, 0xe2, 0x83, 0x92, 0xae, 0xe3, 0x86, - 0xbf, 0x08, 0x3c, 0xd9, 0xfa, 0xd1, 0xb6, 0xf8, 0x4c, 0xe1, 0xa1, 0x41, 0xb9, 0xf8, 0x7f, 0x9b, - 0x81, 0xc3, 0xef, 0xc8, 0x85, 0x3e, 0x85, 0x2e, 0xae, 0xb3, 0x44, 0x23, 0xf3, 0x43, 0x32, 0xf2, - 0xa2, 0x6a, 0x45, 0x19, 0xec, 0x15, 0x21, 0x28, 0xdd, 0x8f, 0xd3, 0x8f, 0xea, 0xe5, 0xcb, 0x63, - 0x38, 0x70, 0xb6, 0x1f, 0x94, 0x4e, 0x85, 0xa5, 0x07, 0xd0, 0xbb, 0x28, 0x4e, 0xcb, 0x7c, 0x75, - 0x15, 0xdc, 0xa3, 0x3d, 0xf0, 0xcf, 0x66, 0xd3, 0xcf, 0x01, 0x79, 0x77, 0x04, 0x83, 0x58, 0xa5, - 0xad, 0xa9, 0x2e, 0xc8, 0x37, 0xbf, 0xb8, 0x7e, 0xef, 0xc0, 0xd7, 0x49, 0x24, 0x72, 0x7e, 0xaa, - 0x34, 0xce, 0xbb, 0xe5, 0x51, 0x7b, 0xfd, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x01, 0x08, 0x59, 0x1b, - 0xee, 0x03, 0x00, 0x00, + // 405 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x41, 0x6f, 0x94, 0x40, + 0x1c, 0xc5, 0x33, 0x0b, 0x6e, 0xcb, 0xbf, 0x71, 0x5d, 0x27, 0x6a, 0x26, 0xd5, 0x03, 0x6e, 0x52, + 0xc3, 0x69, 0x30, 0x78, 0x31, 0x4d, 0xbc, 0x58, 0x0f, 0x6a, 0xd2, 0xd4, 0x50, 0xe3, 0xc1, 0x4b, + 0x33, 0x85, 0xbf, 0x84, 0xa4, 0xcc, 0x90, 0x99, 0x69, 0xb3, 0x7c, 0x25, 0xbf, 0x87, 0x37, 0xbf, + 0x91, 0x17, 0x03, 0x03, 0x0b, 0xd5, 0x3d, 0xb8, 0x26, 0x3d, 0xc1, 0xf0, 0xe6, 0xf7, 0xde, 0xff, + 0x01, 0x03, 0x4f, 0x6f, 0x12, 0x2d, 0x1a, 0x9e, 0xa9, 0x2a, 0xce, 0x94, 0xc6, 0x38, 0x53, 0xf2, + 0x5b, 0x59, 0xf0, 0x5a, 0x2b, 0xab, 0x28, 0x0c, 0xa2, 0xc6, 0xc3, 0x97, 0x7f, 0x6d, 0xac, 0x2a, + 0x25, 0x63, 0x83, 0xba, 0x14, 0x57, 0xb1, 0x6d, 0x6a, 0xcc, 0x2f, 0x2a, 0x34, 0x46, 0x14, 0xe8, + 0xe8, 0xc3, 0xa3, 0x3f, 0x08, 0xab, 0x85, 0x34, 0xb5, 0xd2, 0xf6, 0x56, 0xc8, 0xea, 0xc7, 0x0c, + 0xe6, 0x27, 0xdd, 0x03, 0x7a, 0x0c, 0x7b, 0xa5, 0xbc, 0x54, 0xd7, 0x32, 0x67, 0x24, 0xf4, 0xa2, + 0x83, 0x24, 0xe4, 0xe3, 0x04, 0xfc, 0x83, 0x93, 0xde, 0x0b, 0x99, 0x5f, 0xa1, 0x76, 0x48, 0x3a, + 0x00, 0xf4, 0x0d, 0xec, 0xab, 0x6b, 0xeb, 0xe0, 0x59, 0x07, 0x3f, 0x9f, 0xc2, 0x67, 0xbd, 0x76, + 0x9b, 0xde, 0x20, 0xf4, 0x35, 0x78, 0xa2, 0xae, 0x99, 0xdf, 0x91, 0x2f, 0xa6, 0xa4, 0x2b, 0xca, + 0x5d, 0x51, 0xfe, 0xb9, 0x2d, 0x7a, 0xea, 0x7a, 0xa6, 0x2d, 0x42, 0x8f, 0x21, 0xd8, 0x34, 0x63, + 0xf7, 0x42, 0x12, 0x1d, 0x24, 0xcf, 0xa6, 0xfc, 0x46, 0xe4, 0x7d, 0xe8, 0xb8, 0x9d, 0xbe, 0x83, + 0x00, 0xd7, 0x16, 0xa5, 0x29, 0x95, 0x64, 0xf3, 0x9d, 0xb2, 0x47, 0xf0, 0xa3, 0xbf, 0xef, 0x2d, + 0xfd, 0xd5, 0x4f, 0x02, 0x8f, 0xb6, 0xbd, 0x22, 0xba, 0x04, 0xcf, 0x8a, 0x82, 0x91, 0x90, 0x44, + 0x41, 0xda, 0xde, 0xd2, 0x73, 0x78, 0xa8, 0x31, 0xc3, 0xf2, 0x06, 0xf5, 0x85, 0x41, 0x6b, 0x4b, + 0x59, 0x18, 0x36, 0xeb, 0x46, 0xff, 0xd7, 0xf8, 0xe5, 0x60, 0x70, 0xde, 0xf3, 0xf4, 0x14, 0x16, + 0xb5, 0x56, 0xeb, 0x66, 0x74, 0xf4, 0x76, 0x72, 0xbc, 0xdf, 0xd1, 0x83, 0xdd, 0xea, 0x17, 0x81, + 0xc7, 0x5b, 0x3f, 0xda, 0x96, 0x3e, 0x67, 0xf0, 0xc0, 0xa0, 0xcc, 0xff, 0xbf, 0xcd, 0xc2, 0xe1, + 0x77, 0xd4, 0x85, 0x3e, 0x81, 0x39, 0xae, 0xeb, 0x52, 0x23, 0xf3, 0x43, 0x12, 0x79, 0x69, 0xbf, + 0xa2, 0x0c, 0xf6, 0x5a, 0x13, 0x94, 0xee, 0xc7, 0x09, 0xd2, 0x61, 0xf9, 0xf6, 0x08, 0x16, 0x99, + 0xaa, 0x26, 0x69, 0x9f, 0xc8, 0x57, 0xbf, 0xbd, 0x7e, 0x9f, 0xc1, 0x97, 0x24, 0x15, 0x0d, 0x3f, + 0x51, 0x1a, 0x2f, 0xe7, 0xdd, 0x11, 0x7a, 0xf5, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x15, 0xee, + 0x31, 0xc6, 0x03, 0x00, 0x00, } diff --git a/config.proto b/config.proto index 6101c0fa4..31bfb64b7 100644 --- a/config.proto +++ b/config.proto @@ -9,12 +9,6 @@ option java_multiple_files = true; import "v2ray.com/core/common/serial/typed_message.proto"; import "v2ray.com/core/transport/config.proto"; -// Configuration serialization format. -enum ConfigFormat { - Protobuf = 0; - JSON = 1; -} - // Master config of V2Ray. V2Ray takes this config as input and functions accordingly. message Config { // Inbound handler configurations. Must have at least one item. diff --git a/loader.go b/loader.go deleted file mode 100644 index 1dab37dd2..000000000 --- a/loader.go +++ /dev/null @@ -1,46 +0,0 @@ -package core - -import ( - "io" - - "v2ray.com/core/common" - "v2ray.com/core/common/buf" - - "github.com/golang/protobuf/proto" -) - -// ConfigLoader is an utility to load V2Ray config from external source. -type ConfigLoader func(input io.Reader) (*Config, error) - -var configLoaderCache = make(map[ConfigFormat]ConfigLoader) - -// RegisterConfigLoader add a new ConfigLoader. -func RegisterConfigLoader(format ConfigFormat, loader ConfigLoader) error { - configLoaderCache[format] = loader - return nil -} - -// LoadConfig loads config with given format from given source. -func LoadConfig(format ConfigFormat, input io.Reader) (*Config, error) { - loader, found := configLoaderCache[format] - if !found { - return nil, newError(ConfigFormat_name[int32(format)], " is not loadable.").AtWarning() - } - return loader(input) -} - -func loadProtobufConfig(input io.Reader) (*Config, error) { - config := new(Config) - data, err := buf.ReadAllToBytes(input) - if err != nil { - return nil, err - } - if err := proto.Unmarshal(data, config); err != nil { - return nil, err - } - return config, nil -} - -func init() { - common.Must(RegisterConfigLoader(ConfigFormat_Protobuf, loadProtobufConfig)) -} diff --git a/main/config_json.go b/main/config_json.go index 3a8b5819c..dfc2db674 100644 --- a/main/config_json.go +++ b/main/config_json.go @@ -45,7 +45,7 @@ func jsonToProto(input io.Reader) (*core.Config, error) { var config *core.Config loadTask := signal.ExecuteAsync(func() error { - c, err := core.LoadConfig(core.ConfigFormat_Protobuf, stdoutReader) + c, err := core.LoadConfig("protobuf", "", stdoutReader) if err != nil { return err } @@ -65,11 +65,15 @@ func jsonToProto(input io.Reader) (*core.Config, error) { } func init() { - common.Must(core.RegisterConfigLoader(core.ConfigFormat_JSON, func(input io.Reader) (*core.Config, error) { - config, err := jsonToProto(input) - if err != nil { - return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning() - } - return config, nil + common.Must(core.RegisterConfigLoader(&core.ConfigFormat{ + Name: "JSON", + Extension: []string{"json"}, + Loader: func(input io.Reader) (*core.Config, error) { + config, err := jsonToProto(input) + if err != nil { + return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning() + } + return config, nil + }, })) } diff --git a/main/main.go b/main/main.go index b3f533714..82ebe9f6a 100644 --- a/main/main.go +++ b/main/main.go @@ -49,14 +49,12 @@ func getConfigFilePath() string { return "" } -func GetConfigFormat() core.ConfigFormat { +func GetConfigFormat() string { switch strings.ToLower(*format) { - case "json": - return core.ConfigFormat_JSON case "pb", "protobuf": - return core.ConfigFormat_Protobuf + return "protobuf" default: - return core.ConfigFormat_JSON + return "json" } } @@ -74,7 +72,7 @@ func startV2Ray() (core.Server, error) { defer file.Close() configInput = file } - config, err := core.LoadConfig(GetConfigFormat(), configInput) + config, err := core.LoadConfig(GetConfigFormat(), configFile, configInput) if err != nil { return nil, newError("failed to read config file: ", configFile).Base(err) }