diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go index 965a05a0b007..1f03d3b70b7b 100644 --- a/infra/conf/transport_internet.go +++ b/infra/conf/transport_internet.go @@ -452,6 +452,31 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) { return config, nil } +type XDriveConfig struct { + RemoteFolder string `json:"remoteFolder"` + Service string `json:"service"` + Secrets []string `json:"secrets"` +} + +// Build implements Buildable. +func (c *XDriveConfig) Build() (proto.Message, error) { + switch c.Service { + case "local": + case "Google Drive": + if len(c.Secrets) != 3 { + return nil, errors.New("Google Drive needs 3 secrets in order of ClientID, ClientSecret, RefreshToken") + } + default: + return nil, errors.New("unsupported service") + } + config := &xdrive.Config{ + RemoteFolder: c.RemoteFolder, + Service: c.Service, + Secrets: c.Secrets, + } + return config, nil +} + const ( Byte = 1 Kilobyte = 1024 * Byte diff --git a/main/distro/all/all.go b/main/distro/all/all.go index 11b58d9215d3..219f34193716 100644 --- a/main/distro/all/all.go +++ b/main/distro/all/all.go @@ -59,6 +59,7 @@ import ( _ "github.com/xtls/xray-core/transport/internet/tls" _ "github.com/xtls/xray-core/transport/internet/udp" _ "github.com/xtls/xray-core/transport/internet/websocket" + _ "github.com/xtls/xray-core/transport/internet/xdrive" // Transport headers _ "github.com/xtls/xray-core/transport/internet/headers/http" diff --git a/transport/internet/xdrive/config.pb.go b/transport/internet/xdrive/config.pb.go new file mode 100644 index 000000000000..cfa657f18697 --- /dev/null +++ b/transport/internet/xdrive/config.pb.go @@ -0,0 +1,140 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.36.11 +// protoc v6.33.5 +// source: transport/internet/xdrive/config.proto + +package xdrive + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" + unsafe "unsafe" +) + +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 `protogen:"open.v1"` + RemoteFolder string `protobuf:"bytes,1,opt,name=remote_folder,json=remoteFolder,proto3" json:"remote_folder,omitempty"` + Service string `protobuf:"bytes,2,opt,name=service,proto3" json:"service,omitempty"` + Secrets []string `protobuf:"bytes,3,rep,name=secrets,proto3" json:"secrets,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *Config) Reset() { + *x = Config{} + mi := &file_transport_internet_xdrive_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_xdrive_config_proto_msgTypes[0] + if 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_xdrive_config_proto_rawDescGZIP(), []int{0} +} + +func (x *Config) GetRemoteFolder() string { + if x != nil { + return x.RemoteFolder + } + return "" +} + +func (x *Config) GetService() string { + if x != nil { + return x.Service + } + return "" +} + +func (x *Config) GetSecrets() []string { + if x != nil { + return x.Secrets + } + return nil +} + +var File_transport_internet_xdrive_config_proto protoreflect.FileDescriptor + +const file_transport_internet_xdrive_config_proto_rawDesc = "" + + "\n" + + "&transport/internet/xdrive/config.proto\x12\x1exray.transport.internet.xdrive\"a\n" + + "\x06Config\x12#\n" + + "\rremote_folder\x18\x01 \x01(\tR\fremoteFolder\x12\x18\n" + + "\aservice\x18\x02 \x01(\tR\aservice\x12\x18\n" + + "\asecrets\x18\x03 \x03(\tR\asecretsB5Z3github.com/xtls/xray-core/transport/internet/xdriveb\x06proto3" + +var ( + file_transport_internet_xdrive_config_proto_rawDescOnce sync.Once + file_transport_internet_xdrive_config_proto_rawDescData []byte +) + +func file_transport_internet_xdrive_config_proto_rawDescGZIP() []byte { + file_transport_internet_xdrive_config_proto_rawDescOnce.Do(func() { + file_transport_internet_xdrive_config_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_transport_internet_xdrive_config_proto_rawDesc), len(file_transport_internet_xdrive_config_proto_rawDesc))) + }) + return file_transport_internet_xdrive_config_proto_rawDescData +} + +var file_transport_internet_xdrive_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_transport_internet_xdrive_config_proto_goTypes = []any{ + (*Config)(nil), // 0: xray.transport.internet.xdrive.Config +} +var file_transport_internet_xdrive_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_xdrive_config_proto_init() } +func file_transport_internet_xdrive_config_proto_init() { + if File_transport_internet_xdrive_config_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_transport_internet_xdrive_config_proto_rawDesc), len(file_transport_internet_xdrive_config_proto_rawDesc)), + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_transport_internet_xdrive_config_proto_goTypes, + DependencyIndexes: file_transport_internet_xdrive_config_proto_depIdxs, + MessageInfos: file_transport_internet_xdrive_config_proto_msgTypes, + }.Build() + File_transport_internet_xdrive_config_proto = out.File + file_transport_internet_xdrive_config_proto_goTypes = nil + file_transport_internet_xdrive_config_proto_depIdxs = nil +} diff --git a/transport/internet/xdrive/config.proto b/transport/internet/xdrive/config.proto new file mode 100644 index 000000000000..cc545753cae0 --- /dev/null +++ b/transport/internet/xdrive/config.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package xray.transport.internet.xdrive; +option go_package = "github.com/xtls/xray-core/transport/internet/xdrive"; + +message Config { + string remote_folder = 1; + string service = 2; + repeated string secrets = 3; +} diff --git a/transport/internet/xdrive/xdrive.go b/transport/internet/xdrive/xdrive.go new file mode 100644 index 000000000000..ed9efa5e322a --- /dev/null +++ b/transport/internet/xdrive/xdrive.go @@ -0,0 +1,45 @@ +package xdrive + +import ( + "context" + + "github.com/xtls/xray-core/common" + "github.com/xtls/xray-core/common/net" + "github.com/xtls/xray-core/transport/internet" + "github.com/xtls/xray-core/transport/internet/stat" +) + +const protocolName = "xdrive" + +func init() { + common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} { + return new(Config) + })) + common.Must(internet.RegisterTransportDialer(protocolName, Dial)) + common.Must(internet.RegisterTransportListener(protocolName, Serve)) +} + +func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (stat.Connection, error) { + //config := streamSettings.ProtocolSettings.(*Config) + + var conn net.Conn + return stat.Connection(conn), nil +} + +type Server struct { + config *Config +} + +func (s *Server) Close() error { + return nil +} + +func (s *Server) Addr() net.Addr { + return nil +} + +func Serve(ctx context.Context, address net.Address, port net.Port, streamSettings *internet.MemoryStreamConfig, addConn internet.ConnHandler) (internet.Listener, error) { + var server Server + + return &server, nil +}