1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-05 17:57:42 -05:00
Commit Graph

6076 Commits

Author SHA1 Message Date
kslr
1490ce645d put code_of_conduct in the right place 2021-11-06 22:18:26 +08:00
朱聖黎 (Zhu Sheng Li)
77b88171d6
fix: readRequest API changed since go1.17 (#1370)
fixed: #1265
2021-11-06 22:09:26 +08:00
dyhkwong
c25e33c423
Fix test command does not load default config.json (#1368) 2021-11-06 15:48:06 +08:00
Ye Zhihao
ed9641dad1
Refactor strmatcher.MphMatcherGroup (#1364)
* Refactor strmatcher.MphMatcherGroup

* Add test for empty mph matcher group
2021-11-05 13:24:46 +08:00
ayanamist
80d92381af
Add PATCH TRACE http method to sniffer (#1314) 2021-11-05 13:22:30 +08:00
dependabot[bot]
5dedf7d951
Chore: bump github.com/jhump/protoreflect from 1.9.0 to 1.10.1 (#1323)
Bumps [github.com/jhump/protoreflect](https://github.com/jhump/protoreflect) from 1.9.0 to 1.10.1.
- [Release notes](https://github.com/jhump/protoreflect/releases)
- [Commits](https://github.com/jhump/protoreflect/compare/v1.9.0...v1.10.1)

---
updated-dependencies:
- dependency-name: github.com/jhump/protoreflect
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-03 13:11:06 +08:00
dependabot[bot]
5f86668ceb
Chore: bump google.golang.org/grpc from 1.40.0 to 1.42.0 (#1366)
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.40.0 to 1.42.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.40.0...v1.42.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-03 11:28:39 +08:00
Jachin
05f96fc434
Fix load single config auto format. (#1354) 2021-11-01 11:28:57 +08:00
dependabot[bot]
b467f44ef0
Chore: bump github.com/lucas-clemente/quic-go from 0.23.0 to 0.24.0 (#1338)
Bumps [github.com/lucas-clemente/quic-go](https://github.com/lucas-clemente/quic-go) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/lucas-clemente/quic-go/releases)
- [Changelog](https://github.com/lucas-clemente/quic-go/blob/master/Changelog.md)
- [Commits](https://github.com/lucas-clemente/quic-go/compare/v0.23.0...v0.24.0)

---
updated-dependencies:
- dependency-name: github.com/lucas-clemente/quic-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-31 18:41:06 +08:00
dependabot[bot]
5931240fb1
Chore: bump github.com/pelletier/go-toml from 1.2.0 to 1.9.4 (#1342)
Bumps [github.com/pelletier/go-toml](https://github.com/pelletier/go-toml) from 1.2.0 to 1.9.4.
- [Release notes](https://github.com/pelletier/go-toml/releases)
- [Commits](https://github.com/pelletier/go-toml/compare/v1.2.0...v1.9.4)

---
updated-dependencies:
- dependency-name: github.com/pelletier/go-toml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-31 18:07:20 +08:00
Ye Zhihao
d4da365c5f
Refactor: strmatcher module (#1333)
* Reorganize strmatcher's package structure

* Rename types in strmatcher package according to their file names

* Stablize strmatcher's Matcher interface

* Implement []matcherEntry as SimpleMatcherGroup

* Implement mph algorithm extracted from MphIndexMatcher as MphMatcherGroup

* Implement AddMatcher/AddFullMatcher/AddDomainMatcher/AddSubstrMatcher for each MatcherGroup

* Stablize strmatcher's MatcherGroup interface

* Stablize strmatcher's IndexMatcher interface

* Update strmatcher's benchmark

* Compatibility fix for app/router's DomainMatcher condition

* Fix code quality issue

* Fix basic matcher issues

* Update priority specification for Substr matcher
2021-10-31 18:01:13 +08:00
世界
a66bb28aee
Reformat code 2021-10-28 18:34:19 +08:00
秋のかえで
0f1e21ceba
Chore: rename binary for Windows (#1356) 2021-10-28 13:15:37 +08:00
dependabot[bot]
925209683c
Chore: bump github.com/go-chi/chi/v5 from 5.0.4 to 5.0.5 (#1359)
Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/go-chi/chi/releases)
- [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/go-chi/chi/compare/v5.0.4...v5.0.5)

---
updated-dependencies:
- dependency-name: github.com/go-chi/chi/v5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-28 12:51:48 +08:00
Kslr
e3d966a756
Update cert.go (#1353)
Fix: the description of -name parameter is missing

Co-authored-by: c0520ccf <93182069+c0520ccf@users.noreply.github.com>
2021-10-26 23:16:35 +08:00
秋のかえで
3f1a415ce5
Docs: fix a typo in security policy (#1344) 2021-10-23 11:41:03 +08:00
Shelikhoo
37f1b98cb2
relax test for mixed type content
Whether to allow mixed type data is contested. Since V2Ray does not use this kind of mix content in array by design, relaxing this test to avoid test break.
https://github.com/toml-lang/toml/issues/553
2021-10-21 23:34:53 +01:00
Shelikhoo
f7ba3d0341
fix test break for TOML JSON convertion
Based on 352072d51a/cmd/tomljson/main.go (L56)

Commit 0f7345ba76 updated toml library version, however, the library have changed its check logic for input. This issue is now fixed.
2021-10-21 23:30:35 +01:00
Shelikhoo
054e667983
update version: V5
This is a pre-release version of V2Ray intended for developer preview. Users are not advised to use this version right now. Contributors are encouraged to send pull requests to the V5 Version of the codebase.
2021-10-21 22:52:01 +01:00
世界
cdb14de63e
Apply timeout to dns outbound (#1330)
Cherry-pick from 7b0699e8a5
2021-10-20 23:22:42 +01:00
Shelikhoo
25e2b74c95
kcp v5 config register: auto generated 2021-10-10 15:00:32 +01:00
Shelikhoo
e0cec7f3f6
kcp v5 config register 2021-10-10 15:00:17 +01:00
Shelikhoo
ee185a5824
rework protocol buffer log settings 2021-10-02 22:29:37 +01:00
Ovear
36df3b035c
Remove unnecessary log.
(cherry picked from commit b3e0d54630)
2021-09-30 15:30:21 +01:00
Ovear
9a8e113ad3
Fix: Remove udp conn twice
(cherry picked from commit 75eead5a6e)

See Also: https://github.com/v2fly/v2ray-core/pull/1305
https://github.com/v2fly/v2ray-core/issues/1297
2021-09-30 15:29:51 +01:00
yuhan6665
c58811c14b
Fix flaky TestVMessDynamicPort (#723)
(cherry-picked from a4cd3110f1, modified by committer)

See Also: https://github.com/v2fly/v2ray-core/pull/1289
2021-09-30 15:27:29 +01:00
yuhan6665
d84ead3e00
Fix some tests to use udp.PickPort()
(cherry picked from commit 9458a1abd3, modified by committer)

In the previous version of the test code, when attempting to listen for a UDP socket, the port availability check check for TCP port instead of UDP port. This make it possible to select a UDP port that is unavailable.

See Also: https://github.com/v2fly/v2ray-core/pull/1302
2021-09-30 15:27:27 +01:00
Shelikhoo
52d414fa49
integrate ioutil migration in test
Some inconsistent change have been introduced in a previous version of ioutil migration(0c3105691f).
2021-09-29 09:25:23 +01:00
Shelikhoo
2fcddf1966
return error if the tag is not found
The previous routine cause panic if the tag is not found. Thanks for report from mzz
2021-09-29 09:14:23 +01:00
Shelikhoo
a9979057dc
fix torjan protobuf version
We could migrate to v2 version of protobuf interface now, but it would cause additional trouble. A quick fix is applied.
2021-09-28 18:34:56 +01:00
Shelikhoo
40140c2977
better error reason reporting for auto config format
Without this change, the user will not be able to know the detail of error if auto config format detection is used.
2021-09-28 18:32:38 +01:00
Shelikhoo
82e730bb70
fix: switch away from ioutil 2021-09-28 18:12:40 +01:00
Shelikhoo
0c3105691f
refactor: move from io/ioutil to io and os package (#1298)
Author: Eng Zer Jun <engzerjun@gmail.com>
Date:   Mon Sep 27 00:56:31 2021 +0800

    refactor: move from io/ioutil to io and os package (#1298)
2021-09-27 23:02:19 +01:00
秋のかえで
be4dd56ac7
Feat: custom TCP Fast Open queue length (#1293)
* Feat: custom TCP Fast Open queue length

* Feat: change default TFO queue length to 4096
2021-09-27 22:49:08 +01:00
世界
7d78683d6f
Send shadowsocks handshake with payload if available (#1292) 2021-09-27 22:14:11 +01:00
世界
8cc6fbc6f9
Fix queryStrategy ignored (#1285) 2021-09-27 22:13:40 +01:00
秋のかえで
908408dd45
Fix: Trojan fallback (#1286) 2021-09-27 22:13:25 +01:00
Loyalsoldier
3b1f8b8cc3
Fix: debian package (#1279) 2021-09-27 22:13:13 +01:00
Loyalsoldier
4a056048cf
Chore: update debian package to v4.42.2 (#1277) 2021-09-27 22:13:01 +01:00
Shelikhoo
0f9db48acd
update version 2021-09-27 22:11:38 +01:00
世界
f383f896ed
Add disableFallbackIfMatch dns option 2021-09-27 22:10:54 +01:00
世界
9ee66f7efe
Add socks4/4a support 2021-09-27 21:54:29 +01:00
Loyalsoldier
41ae53e60d
Fix: IP length not deterministic (#1267)
The length of IPv4 address in Go standard library could be 16
if it is in IPv6-mapped-IPv4 format.

(cherry picked from commit c58a372d93)
2021-09-27 21:53:49 +01:00
Loyalsoldier
389a0585f3
Chore: update build script to include geoip-only-cn-private.dat (#1266)
(cherry picked from commit 8a22e942c4)
2021-09-27 21:50:57 +01:00
Shelikhoo
0f7345ba76
adjustment: ♻️ refactor geoip match logic (#1157)
cherry-pick f1902165c7
2021-09-27 21:50:18 +01:00
Loyalsoldier
a86415cb43
♻️ refactor geoip match logic (#1157)
cherry-pick f1902165c7
2021-09-27 21:43:05 +01:00
Ye Zhihao
1919d47649
cherry-pick adjustment for uint socket mask 2021-09-27 21:39:29 +01:00
Ye Zhihao
27614e56fc
🐛 http dialer add socket config; sockopt.mark use uint32 (#1264)
(cherry picked from commit 4d155bc2bf)
2021-09-27 21:37:45 +01:00
dependabot[bot]
38f10d029e
Chore: bump github.com/pires/go-proxyproto from 0.6.0 to 0.6.1 (#1263)
Bumps [github.com/pires/go-proxyproto](https://github.com/pires/go-proxyproto) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/pires/go-proxyproto/releases)
- [Commits](https://github.com/pires/go-proxyproto/compare/v0.6.0...v0.6.1)

---
updated-dependencies:
- dependency-name: github.com/pires/go-proxyproto
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 4a174e8aa6)
2021-09-27 18:11:05 +01:00
kslr
b1311cf807
🐛 fix CodeQL is triggered multiple times
(cherry picked from commit 36d320a4a9)
2021-09-27 18:08:47 +01:00