Shelikhoo
9d771f2f9f
avoid name conflict with .v5.json
2021-09-04 22:56:23 +01:00
Shelikhoo
45dae48d21
added build context to dns
2021-09-04 21:54:21 +01:00
Shelikhoo
ae46fb7b28
added build context to V5 conf
2021-09-04 21:46:10 +01:00
Shelikhoo
62f71c80ca
added buildV5 interface to dns and router
2021-09-04 21:44:10 +01:00
Shelikhoo
7bf1d7a1ce
add jsonv5 conf loader
2021-09-04 19:54:07 +01:00
Shelikhoo
51f05b1bff
fix test break for refactor data into seperate package
2021-09-04 19:43:10 +01:00
Shelikhoo
cef6a46548
add support for custom loader in json parser
2021-09-04 19:22:41 +01:00
Shelikhoo
1ec9a41ee8
added root config builder
2021-09-04 18:45:02 +01:00
Shelikhoo
2560e79ef0
added V5 config builder for outbound
2021-09-04 17:57:12 +01:00
Shelikhoo
9f145b4265
added V5 config builder for V5
2021-09-04 17:49:37 +01:00
Shelikhoo
98ba3a13f0
added protobuf config builder for stream
2021-09-04 17:19:18 +01:00
Shelikhoo
3ebc365230
add error message for v5cfg
2021-09-04 16:49:07 +01:00
Shelikhoo
324f0abbf0
added heterogeneous configure file loader
2021-09-04 16:48:23 +01:00
Shelikhoo
927f21e3e5
add v5 configure file skeleton
2021-09-04 16:11:46 +01:00
Shelikhoo
18b90d13df
isolate proxy settings: auto generated
2021-09-04 13:23:16 +01:00
Shelikhoo
4549dba2d7
update Build Interface
2021-09-04 13:20:04 +01:00
Shelikhoo
663e6028c3
isolate mux,proxy settings
2021-09-04 13:19:43 +01:00
Shelikhoo
436aaca6ab
isolate socks settings
2021-09-04 12:52:13 +01:00
Shelikhoo
df9624a965
isolate tls settings
2021-09-04 12:48:23 +01:00
Shelikhoo
38210fd74a
isolate sniffer config
2021-09-04 12:47:23 +01:00
Shelikhoo
3e68a192f5
isolate sniffer config
2021-09-04 12:37:53 +01:00
Shelikhoo
d1a4b0388a
add app environment definitions
2021-09-04 11:13:31 +01:00
Shelikhoo
a4e6fe5a94
reference google version of protobuf library
2021-09-04 11:13:31 +01:00
Shelikhoo
881571374d
rename Router Enum name Domain to prevent name collision
...
This creates build break in C++ environment.
2021-09-04 11:13:31 +01:00
Shelikhoo
d0521c3861
added protobuf descriptor into repo
2021-09-04 11:13:31 +01:00
Shelikhoo
3bcee172b0
refactor v2jsonpb to reduce unnecessary complexity
2021-09-04 11:13:30 +01:00
Shelikhoo
95ddd2a313
jsonpb loading
2021-09-04 11:13:30 +01:00
Shelikhoo
c119d8dc79
v2jsonpb full dump support
2021-09-04 11:13:30 +01:00
Shelikhoo
c187b6fb3e
v2jsonpb full dump
2021-09-04 11:13:30 +01:00
Shelikhoo
b36b434689
jsonpb format
2021-09-04 11:13:30 +01:00
Shelikhoo
28c36019b2
support v4 json pb output
2021-09-04 11:13:29 +01:00
Shelikhoo
2df4fa39e3
added jsonpb format support: auto generated
2021-09-04 11:13:29 +01:00
Shelikhoo
32374eb545
added jsonpb format support
2021-09-04 11:13:29 +01:00
Shelikhoo
ba2dd5995d
replace TypedMessage with anypb.Any
2021-09-04 11:13:28 +01:00
Shelikhoo
add375390e
move v4 configure support to own directory
2021-09-04 11:13:13 +01:00
Shelikhoo
c86ac3aca6
isolate dns settings synthesis: auto generated
2021-09-04 11:13:13 +01:00
Shelikhoo
b37755d111
isolate dns settings synthesis
2021-09-04 11:13:13 +01:00
Shelikhoo
3510ddb464
isolate log settings synthesis
2021-09-04 11:13:13 +01:00
Shelikhoo
72d2184dba
isolate router settings synthesis: auto generated file
2021-09-04 11:13:13 +01:00
Shelikhoo
39b3866774
isolate router settings synthesis
2021-09-04 11:13:11 +01:00
Shelikhoo
41b54ff61e
move buildable to cfg common
2021-09-04 11:12:36 +01:00
Shelikhoo
22f6b100ba
fix v4 json loader MultiObservatoryConfig
2021-09-04 11:12:35 +01:00
Shelikhoo
ab803000e7
bug fix for observer
2021-09-04 11:12:35 +01:00
Shelikhoo
6fd8e36a3b
adjust test with updated structure
2021-09-04 11:12:35 +01:00
Shelikhoo
2dc539cc70
add V4 json support for observer tag config
2021-09-04 11:12:34 +01:00
Shelikhoo
2cdad52334
add v4 json support for BurstObservatory & fix balancer reference
2021-09-04 11:12:33 +01:00
jebbs
a8dd708028
parse duration conf with time.Parse()
2021-09-04 11:12:04 +01:00
Shelikhoo
718d6f32bf
update coding style
2021-09-04 11:12:04 +01:00
Jebbs
7a0af318df
refine api, run command and merger ( #766 )
...
* mergers code optimize
* api log work with pipe
* remove inbounds/outbounds by tags
*fix rmo flag parse
* cmds description and message optimize
2021-09-04 11:11:45 +01:00
Jebbs
2523d77919
improve commands
...
(rebased from ebbf31f07e
2021-09-04 11:11:45 +01:00
Jebbs
fa0cf6db26
v5: Health Check & LeastLoad Strategy (rebased from 2c5a714903)
...
Some changes will be necessary to integrate it into V2Ray
2021-09-04 11:11:45 +01:00
秋のかえで
dde9463275
V5: Add TOML Support (rebased from 36ba06837f)
2021-09-04 11:11:45 +01:00
Jebbs
ec1694beb1
fix commands issues ( #492 )
...
* fix api commands output
* remove unused code
* fix convert always has -r
* update merge err to locate failed file
2021-09-04 11:09:58 +01:00
young-zy
12dfbc78a3
Update protobuf version (rebased from 6d25d51519)
...
Some change is not adopted since it would break the code base. These changes will be reintroduced at a later date.
2021-09-04 11:09:58 +01:00
Jebbs
b05a469488
v5: Remove v2ctl & wv2ray (rebased from 7c1ab06206)
2021-09-04 11:09:55 +01:00
Jebbs
557b0c3353
V5: YAML support (rebased from 9367e9b1f2)
2021-09-04 11:05:52 +01:00
kslr
54a627c443
remove mtproto (rebased from aa24f9a638)
2021-09-04 11:05:36 +01:00
Jebbs
8c78712841
v5: New multi-json loader (rebased from ff59bd37ce)
2021-09-04 11:05:20 +01:00
Jebbs
a96e093432
go style commands, merge v2ctl commands, v5 oriented (rebased from 521120d196)
2021-09-04 11:05:19 +01:00
Shelikhoo
a53fd35205
separate client ca and server ca
...
This is designed to prevent a server from being attacked with a client with a certificate issued by a trusted system CA.
Some commercial CA actually can issue certificate to individual to proof their identity. The server should not accept these certs as a valid client certificates.
2021-09-01 22:34:13 +01:00
ydx
fb665ee94a
add client certificate verify ( #1169 )
2021-09-01 21:12:03 +01:00
Loyalsoldier
5794a97708
Fix: JSON tag case ( #1212 )
...
JSON unmarshal is case insensitive in Golang
2021-08-19 21:16:54 +08:00
ihotte
8f429c35cb
Fix: observatory log & JSON config( #1211 )
...
Co-authored-by: ihotte <ihotte@yeah.net>
2021-08-19 13:40:47 +08:00
Loyalsoldier
639148dda4
Refinement: LRU ( #1142 )
2021-08-10 11:08:45 +08:00
Shelikhoo
91a2286064
apply coding style
2021-07-01 19:02:27 +01:00
Shelikhoo
54fc21e537
add custom probe interval for observer
2021-06-30 19:33:37 +01:00
Shelikhoo
4773e3a1ed
add custom probe URL support for observatory
2021-06-30 17:47:29 +01:00
Shelikhoo
0822160008
VMess AEAD based packet length
2021-06-22 12:26:01 +01:00
Loyalsoldier
6f8979d017
Style: format code by gofumpt ( #1022 )
2021-05-20 05:28:52 +08:00
Loyalsoldier
b57ebd5c1c
vFormat: use gci instead of customized goimports ( #1020 )
2021-05-19 19:59:46 +08:00
ght99
faee88163c
Fix: v2ctl failed to get geodata loaders ( #1014 )
...
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
2021-05-17 00:44:08 +08:00
Loyalsoldier
218f27c9c1
Feat: vformat supports multi-core processing ( #996 )
2021-05-11 09:05:43 +08:00
Loyalsoldier
a771e3401a
Fix: lint error ( #995 )
2021-05-11 08:36:06 +08:00
Shelikhoo
31a7fb503c
update TCPKeepAliveInterval type to allow expression disable
2021-05-06 15:33:35 +01:00
Shelikhoo
77a573caf1
refactor test for loader benchmark
2021-05-05 13:50:56 +01:00
loyalsoldier
fa85afc920
Feat: add geodata loader benchmark
2021-05-05 13:22:01 +01:00
Loyalsoldier
1cb9fd2999
Chore: little refinements ( #973 )
2021-05-05 07:28:09 +08:00
Shelikhoo
d6abddc7f5
rename the field to keep lint happy
2021-05-04 22:55:39 +01:00
Shelikhoo
44514ebc1a
Merge branch 'dev-wsearlydatadiverse'
2021-05-04 22:50:06 +01:00
Shelikhoo
8d4b4201f8
add json parse rule for tcp keep alive interval
2021-05-04 22:37:38 +01:00
rurirei
2129c6e1e9
feat: update bootstrap_dns_android ( #966 )
...
* update with non_specified network
* remove wrongs
* add alternative bootstrapDialer
* do test
* Update dns_bootstrap_android_test.go
* example of alternative dialer
* public method
* move const
* Update dns_bootstrap_android_test.go
* no duplicated
* Rename infra/conf/dns_bootstrap_android.go to transport/internet/system_dns_android.go
* Update system_dns_android.go
* Update and rename infra/conf/dns_bootstrap_android_test.go to transport/internet/system_dns_android_test.go
* no imports
* Update system_dns_android.go
* Update system_dns_android_test.go
* create systemDNS
* Create system_dns_android.go
* Update system_dialer.go
* call Resolver on systemDialer
* create system_dns_test.go
* resolver.LookupIP params
* param fix
* noneed TestSystemDNSResolver
* revert: no specified resolver
* Delete system_dns.go
* android only
* android only test
* typo
2021-05-04 22:22:01 +01:00
Shelikhoo
1d7e497599
Added json configure file parsing of h2 transport
2021-05-04 20:32:27 +01:00
loyalsoldier
007a15bd79
fix
2021-05-04 19:21:46 +01:00
loyalsoldier
2bdc86049a
code style
2021-05-04 19:21:34 +01:00
loyalsoldier
40f8e82204
refine
2021-05-04 19:19:43 +01:00
Shelikhoo
3ba9a5b4f5
Refine geodata related tests ( #967 )
...
(cherry picked from commit 7805ca2ac1
2021-05-04 19:13:52 +01:00
Shelikhoo
bf0e7e35c8
move geo loader conf to environment variable
2021-05-04 19:08:18 +01:00
Shelikhoo
19d1ff9003
apply coding style
2021-05-04 19:08:15 +01:00
Shelikhoo
4610c5e23f
memconservative geofile loader
2021-05-04 19:08:06 +01:00
Shelikhoo
0f1fac84ca
refactor configure file loader for geo loader and v5
2021-05-04 19:07:58 +01:00
Shelikhoo
9458963b5a
Revert "Refactor: memory-efficient geo file decoder ( #934 )"
...
This reverts commit 7e876709
2021-05-04 19:07:54 +01:00
Shelikhoo
ace2c44c2b
Revert "Refine geodata related tests ( #967 )"
...
This reverts commit 7805ca2a
2021-05-04 19:07:35 +01:00
Loyalsoldier
7805ca2ac1
Refine geodata related tests ( #967 )
2021-05-04 16:30:23 +08:00
Shelikhoo
40a7847d7f
update json configure for websocket header
2021-05-01 15:49:42 +01:00
Loyalsoldier
980fb59878
Fix: observatory starts with empty config & fails to close ( #957 )
2021-05-01 22:28:23 +08:00
秋のかえで
b68411f460
Fix: browserforwarder panics with empty config ( #954 )
...
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
2021-05-01 20:50:30 +08:00
Loyalsoldier
625a15e03b
Chore: format code by new customized goimports ( #950 )
2021-05-01 11:15:39 +08:00
Loyalsoldier
0fe129de65
Infra: use customized goimports ( #949 )
2021-05-01 11:11:37 +08:00
Loyalsoldier
7e876709fe
Refactor: memory-efficient geo file decoder ( #934 )
2021-05-01 07:59:29 +08:00
Shelikhoo
95432b2131
fix:browser forwarder not supported by multi-json
2021-04-30 20:53:08 +01:00
