1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 09:36:34 -05:00
Commit Graph

1324 Commits

Author SHA1 Message Date
maskedeken
e445d21f4b
Add trojan protocol support (#181)
* Add trojan protocol support

Co-authored-by: Eken Chan <ekenchan@msn.com>
Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Co-authored-by: GitHub Action <action@github.com>
2020-09-26 23:31:24 +08:00
RPRX
f55e05c166
int -> int32 2020-09-24 12:18:11 +00:00
RPRX
4b0aea1dca
Fix bug 2020-09-24 11:22:12 +00:00
RPRX
0e8e23897c
Tiny adjustment 2020-09-24 11:09:14 +00:00
RPRX
3072cdccf4
Add return 2020-09-24 11:02:27 +00:00
RPRX
648d4180aa
VLESS PREVIEW 2 2020-09-24 01:59:14 +00:00
RPRX
010fbf4d8b
Make isAEAD more efficient 2020-09-21 03:20:04 +00:00
RPRX
470dc8523b
Make isAEAD more efficient 2020-09-21 01:10:56 +00:00
Kslr
0cbed7e265
Merge pull request #187 from wwqgtxx/master
support disable vmess aead by os environ
2020-09-14 18:04:12 +08:00
wwqgtxx
43174d6951 support disable vmess aead by os environ 2020-09-14 17:49:59 +08:00
Darhwa
d2d4f48815 Fix the coarse-grained mutex in http outbound
fix v2ray#2731
2020-09-13 02:07:22 +08:00
Shelikhoo
e2e266114a
Fix incorrect IV usage which slightly reduced security 2020-09-12 16:27:40 +08:00
RPRX
ee1e18df24
Schedulers -> Flow 2020-09-11 03:37:23 +00:00
RPRX
2237528d1e
fix 2020-09-10 16:05:02 +00:00
RPRX
8c2e8e9db9
Add defer 2020-09-10 15:58:38 +00:00
Kslr
2a3fe11952
VMess AEAD will be used when alterId is 0 2020-09-09 00:02:53 +08:00
RPRX
16fe0b03f6
Do not convert @ to \x00 2020-09-07 16:39:53 +08:00
loyalsoldier
f12f76582f
Fix according to staticcheck result
staticcheck repo: https://github.com/dominikh/go-tools/tree/master/cmd/staticcheck
2020-08-30 23:41:15 +08:00
loyalsoldier
1fa89b32d4
Format: run go fmt ./... 2020-08-30 21:17:22 +08:00
RPRX
84aaf3a1e3
VLESS PREVIEW 1.5 2020-08-28 07:51:09 +00:00
loyalsoldier
f9175e3bc8
Fix according to go vet results 2020-08-26 19:35:33 +08:00
Shelikhoo
a40727a3dc
added drain for ss and improved vmess drain 2020-08-26 13:51:23 +08:00
Loyalsoldier
ef460f68f8
Adjust Protocol Buffers (#109)
* Update protoc binary executable files to v3.13.0

* Write proto files in more standard way

* Make go generate & vprotogen compatible with protoc-gen-gofast

* Regenerate pb.go files according to new proto files

* Clean go.sum by running go mod tidy

* Implement mustEmbedUnimplementedServiceServer for gPRC services
2020-08-24 12:10:26 +00:00
Darhwa
d05ddc8f78 Make http outbound 0-rtt 2020-08-15 23:58:58 +08:00
RPRX
5708edd117
VLESS PREVIEW 1.3 2020-08-04 13:08:35 +00:00
RPRX
070e72f581
unexpected -> invalid 2020-08-03 19:16:14 +00:00
RPRX
1cfc02e720
VLESS PREVIEW 1.2 2020-08-03 06:13:26 +00:00
RPRX
2c49559c61
Merge pull request #76 from Vigilans/vigilans/tproxy-sockopt
Apply sockopt from inbound config to dokodemo tproxy's response connection
2020-08-02 03:02:36 +00:00
Vigilans
30e312f72b Apply sockopt from inbound config to dokodemo tproxy's response connection 2020-08-01 02:04:06 +08:00
Darhwa
cae278dd00 Fix http outbound
Get correct TLS negotiated protocol when stats setting exists
2020-07-31 23:51:08 +08:00
Darhwa
1acb2fd854 Some cleaning and linting 2020-07-31 23:49:54 +08:00
RPRX
bad7e2cfd8
VLESS PREVIEW 1.1 2020-07-28 15:00:23 +00:00
lucifer9
9da4339d8a Add access log for dokodemo inbound 2020-07-13 21:02:19 +08:00
Shelikhoo
437a66b7de
Added Unit Test for VMessAEAD 2020-07-04 13:48:47 +08:00
Agioi Theodoroi
bbd3988f3d
clean up code 2020-06-27 07:51:42 +08:00
rprx
1432278c2c
Fix typo (#36) 2020-06-26 21:27:23 +08:00
Shelikhoo
f19f95af35
Update AEAD design to rely more on AEAD 2020-06-26 20:15:37 +08:00
Xiaokang Wang
327a6ee1f7
Merge pull request #18 from darhwa/enhance_http_outbound
使http outbound支持连接https与http/2代理服务器
2020-06-25 16:25:44 +08:00
Roger Shimizu
90af5f19ba
Apply Debian's patch to upstream 2020-06-24 12:57:03 +08:00
Darhwa
d29370a654 Enhance http outbound
1. Enables http outbound to set up a HTTP tunnel above HTTP/1.1,
  HTTP/1.1 over TLS, or HTTP/2 over TLS. Previously it only works for
  plain HTTP/1.1
2. In setting up CONNECT tunnel, replaces handcrafted request with
  standard http.Request
2020-06-20 23:03:44 +08:00
Shelikhoo
38868e0469
Fix context layering in Shadowsocks UDP 2020-06-19 17:52:39 +08:00
Shelikhoo
3e13d79af7
Fix TProxy Process Logic 2020-06-18 13:40:48 +08:00
Shelikhoo
73616ab9e2
branch context instead of layer it 2020-06-18 12:01:37 +08:00
Shelikhoo
d06a4d1f50
Added TestsEnabled Settings to enable VMessAEAD test 2020-06-08 16:50:50 +08:00
Shelikhoo
09b81b78c3
regenerate pb data 2020-06-08 16:16:32 +08:00
Shelikhoo
da0b63bc12
allow user to define tests enable for this server 2020-06-08 14:20:31 +08:00
Shelikhoo
870ff52775
Apply Coding Style 2020-06-08 13:25:33 +08:00
Shelikhoo
8c886b4b46
Apply Coding Style 2020-06-08 13:21:59 +08:00
Shelikhoo
a58b20b5b8
Reserve sign bit 2020-06-08 10:23:59 +08:00
Shelikhoo
78d7b4f183
Check replay only for AEAD connection, and later 2020-06-06 20:54:29 +08:00
Shelikhoo
9fc37646b6
Check replay only for AEAD connection 2020-06-06 20:51:01 +08:00
Shelikhoo
6a29fa5fe2
Enable AEAD by Default 2020-06-06 20:37:30 +08:00
Shelikhoo
8d489f6c7c
Make taint acquire lesser lock 2020-06-06 19:22:27 +08:00
Shelikhoo
6007e4cc6f
Detailed AEAD Auth Error 2020-06-06 18:57:49 +08:00
Shelikhoo
9bf07b1f26
VMess AEAD Experiment 2020-06-06 17:11:30 +08:00
Shelikhoo
38e89bd2c7
VMess will Drain Connection On Auth failure 2020-06-03 11:25:47 +08:00
Shelikhoo
8f45736dd3
drain replayed connection 2020-06-02 20:02:08 +08:00
Shelikhoo
34c13f3b27
Detailed code and output 2020-06-02 18:18:31 +08:00
Shelikhoo
944c45a776
Fix not update behavior seed 2020-06-02 18:01:43 +08:00
Shelikhoo
5e59534333
Fix when rolled number is zero 2020-06-02 17:30:48 +08:00
Shelikhoo
13cef19430
Increase Drain Pool 2020-06-02 17:11:51 +08:00
Shelikhoo
ca032dd00f
Drain Connection Based on uuid based behavior seed(skip auth info drain for now) 2020-06-02 15:16:17 +08:00
Shelikhoo
d671780804
Drain Connection Based on Uuid based Behavior seed 2020-06-02 14:47:54 +08:00
Shelikhoo
e0aa18b6f3
Drain Connection with invalid checksum before closing. Emergency fix for weakness described in https://github.com/v2ray/v2ray-core/issues/2523 2020-06-01 16:40:54 +08:00
Kslr
cfbb875546 Revert "Reduce http proxy client overhead by 1RTT" 2020-03-19 19:11:17 +08:00
Anonymous-Someneese
99cf401867 http: send HTTP Connect if no content is written after 5ms. 2020-03-12 00:42:29 +08:00
Anonymous-Someneese
a5caa01cb6 Optimize HTTP tunnel setup in TFO environment 2020-03-12 00:42:29 +08:00
Anonymous-Someneese
197fe15d5a Fix code quality 2020-03-12 00:42:29 +08:00
Anonymous-Someneese
f0e63c6e3c Reduce http proxy client overhead by 1RTT 2020-03-12 00:42:29 +08:00
tnextday
ad3bcd2c07 pass username to inbound.User.Email in http/socks server 2020-03-12 00:42:29 +08:00
vcptr
60603abee7 fix: dns test default timeout too short 2019-11-27 13:06:08 +08:00
Kslr
876e2fcc73
Merge pull request #1904 from hex2tan/master
fixed add new vmess user bug
2019-10-27 15:27:03 +08:00
fcying
fa926a1d1d access log add detour tag 2019-10-27 14:24:50 +08:00
hex2tan
3d63ec4e78
fixed add new user bug
fixed add new user bug.
when add new user, just add the key(u.email) to the map(v.cache), the value of map is nil.
2019-09-26 13:48:52 +08:00
vcptr
ad4a1a3dc2 show vmess decode errors at warning level 2019-08-27 09:29:29 +08:00
aaaaa
5ab4f5ab9a fix a crash problem of fetching user from a nil request which returned by shadowsocks failed to read IV 2019-08-19 18:03:35 +08:00
yuanmomo
95f1a4d466 blank row between build and package 2019-08-08 12:27:39 +08:00
vcptr
27da2d139f fix: !confonly missing in http client 2019-08-07 14:49:29 +08:00
wuxiaolong
acde5a55b6 Rewrite comments in English 2019-07-24 22:08:21 +08:00
wuxiaolong
97764114ea Support http outbound 2019-07-24 09:15:05 +08:00
Kslr
2451eedbc4
Merge pull request #1767 from Gondnat/addEmailIntoAccessLog
Add email into access log for shadowsocks and vmess
2019-07-13 22:50:35 +08:00
Gondnat
dd048bfb29 add email into access log for shadowsocks, vmess and mux 2019-07-02 10:43:34 +08:00
Kirill Motkov
0401a91ef4 Some code improvements
* Rewrite empty string checks more idiomatically.
* Change strings.ToLower comparisons to strings.EqualFold.
* Rewrite switch statement with only one case as if.
2019-06-28 17:53:44 +03:00
Darien Raymond
8de236b08c
upper case http method 2019-02-28 14:36:31 +01:00
Darien Raymond
888494aac8
support attributes in session.Content 2019-02-28 11:45:06 +01:00
Darien Raymond
39835e8da2
specify protocol in http inbound 2019-02-28 10:37:27 +01:00
Darien Raymond
9957c64b4a
correctly propagate dns errors all the way through.
the internal dns system can correctly handle the cases where:
1) domain has no A or AAAA records
2) domain doesn't exist
fixes #1565
2019-02-21 13:43:48 +01:00
Darien Raymond
1531642768
benchmark test for user validator 2019-02-20 22:56:17 +01:00
Darien Raymond
c072d38e2c
refine tls connection 2019-02-17 00:58:02 +01:00
Darien Raymond
b488c42453
set recursive bits 2019-02-15 23:13:41 +01:00
Darien Raymond
2a6cad2f9b
fix inbound user in dekodemo door and http 2019-02-15 00:46:19 +01:00
Darien Raymond
634bba0f8a
fix user level in socks inbound 2019-02-15 00:28:26 +01:00
Darien Raymond
114ec4c74b
support dest override in dns outbound 2019-02-12 22:34:43 +01:00
Darien Raymond
69e8db7bbe
include question section in dns response 2019-02-12 13:29:12 +01:00
Darien Raymond
5530ead381
fix broken test 2019-02-10 19:47:26 +01:00
Darien Raymond
98950d5ada
remove dep of assert lib 2019-02-10 15:02:28 +01:00
Darien Raymond
b234cfb4c4
unify NewPacketReader 2019-02-07 19:14:37 +01:00
Darien Raymond
4f08b7c795
fix reading udp packets 2019-02-07 16:36:54 +01:00
Darien Raymond
2aa0c08709
check domain name 2019-02-06 21:02:03 +01:00
Darien Raymond
fae47083c2
set response bit in dns 2019-02-06 19:41:55 +01:00
Darien Raymond
836440c61a
dns outbound proxy 2019-02-06 10:21:04 +01:00
Darien Raymond
9d7efdd2e1
confonly 2019-02-02 22:19:40 +01:00
Darien Raymond
bdd71a44b4
remove dep on assert lib 2019-02-02 22:19:30 +01:00
Darien Raymond
2a0f3591f4
add confonly tag for blackhole 2019-02-01 21:00:08 +01:00
Darien Raymond
1ab94fed79
optimize v2ctl size 2019-02-01 20:08:21 +01:00
Darien Raymond
28189197b3
remove dependency of assert lib 2019-02-01 14:38:14 +01:00
Darien Raymond
c9958681f7
remove dependency on assert lib 2019-01-31 20:57:01 +01:00
Darien Raymond
b05514b02c
wait for both requests to finish before changing timeout 2019-01-30 21:38:25 +01:00
Darien Raymond
bb5a959876
refactor tproxy handling in dokodemo 2019-01-27 22:30:34 +01:00
SAPikachu
c89828e1fb Fix potential memory leak 2019-01-27 20:14:22 +08:00
SAPikachu
d8285161ba Properly handle TPROXY UDP connections 2019-01-25 15:49:34 +08:00
Darien Raymond
35432832c4
don't use new address if not in redirect mode 2019-01-14 22:57:53 +01:00
Darien Raymond
163776b182
remove dependency on assert lib 2019-01-08 23:27:02 +01:00
Darien Raymond
d26700a2fe
remove common/compare package 2019-01-07 00:12:04 +01:00
Darien Raymond
b52725cf65
DialUDP function 2019-01-05 21:43:22 +01:00
Darien Raymond
3de8389361
rename CloseError() to Interrupt() 2018-12-31 21:25:10 +01:00
Darien Raymond
ec95dca3e5
force packet reader in freedom on UDP 2018-12-11 10:17:50 +01:00
Darien Raymond
7e37d141e2
move parseHost to http protocol 2018-12-10 23:08:16 +01:00
Darien Raymond
427679e66d
simplify task execution 2018-12-06 11:35:02 +01:00
Darien Raymond
bea521537e
errors.Combine 2018-12-04 14:17:08 +01:00
Darien Raymond
057e271588
update proto lib 2018-12-01 17:39:51 +01:00
Darien Raymond
6870ead73e
remove unless check 2018-11-23 17:04:32 +01:00
Darien Raymond
5279296f03
remove use of context.WithValue in transport 2018-11-21 14:54:40 +01:00
Darien Raymond
234c8081f4
remove unused functions 2018-11-20 17:05:32 +01:00
Darien Raymond
769f770cf7
migrate NetworkList to []Network 2018-11-20 16:58:26 +01:00
Darien Raymond
8a82a3664c
pick IP family by local address in freedom 2018-11-19 21:36:46 +01:00
Darien Raymond
cb7646f682
remove unnecessary err object from SplitBytes 2018-11-18 19:44:32 +01:00
Darien Raymond
842a089dad
refactor multibuffer 2018-11-18 19:36:36 +01:00
Darien Raymond
0f324a613e
remove MultiBuffer.Release 2018-11-17 22:45:07 +01:00
Darien Raymond
a01fdc29a6
remove NewMultiBufferValue 2018-11-16 11:08:12 +01:00
Darien Raymond
f2f67132a7
refactor socks handshake 2018-11-15 23:37:53 +01:00
Darien Raymond
a20262ef20
allocate buffer on stack 2018-11-15 21:32:27 +01:00
Darien Raymond
ac4f868078
introduce go-cmp 2018-11-15 10:30:03 +01:00
Darien Raymond
6c7dcc35ab
remove buffer.WriteBytes 2018-11-14 22:55:20 +01:00
Darien Raymond
5c5816072e
use buffer for reading user id in socks 2018-11-14 20:23:52 +01:00
Darien Raymond
585608a796
propagate error 2018-11-14 19:17:11 +01:00
Darien Raymond
a14fae4b35
fix lint warnings 2018-11-13 23:19:58 +01:00
Darien Raymond
953bfac572
remove unnecessary assignment 2018-11-13 09:51:55 +01:00
Darien Raymond
77c03f0da5
move back to serial 2018-11-03 13:03:02 +01:00
Darien Raymond
128a90b98b
move link to transport 2018-11-03 12:36:29 +01:00
Darien Raymond
8bb018dae2
fix encoding bug in shadowsocks 2018-11-02 22:04:52 +01:00
Darien Raymond
18ddde4fd4
fix build break in shadowsocks 2018-11-02 21:35:59 +01:00
Darien Raymond
f7b96507f9
simplify buffer extension 2018-11-02 21:34:04 +01:00
Darien Raymond
35ccc3a49c
cleanup unnecessary method in serial. 2018-11-02 18:20:02 +01:00
Darien Raymond
815c7f09ba
migrate to std lib 2018-11-02 15:47:58 +01:00
Darien Raymond
ee489c95b3
remove Port.Bytes() 2018-11-02 15:14:34 +01:00
Darien Raymond
58e2ed3381
remove closure on ReadFullFrom 2018-11-02 15:01:33 +01:00
Victoria Raymond
787f37363b
Merge pull request #1352 from comwrg/more-cases-validator
add more test cases for `proxy/vmess/validator.go`
2018-11-02 09:35:19 +01:00
Darien Raymond
9f48a6d017
enable global padding for aead by default 2018-11-02 09:15:35 +01:00
comwrg
078a92128a
add more test cases for proxy/vmess/validator.go 2018-11-02 16:09:17 +08:00