QUIC sniffer: Full support for handling multiple initial packets by j2rong4cn · Pull Request #4642 · XTLS/Xray-core

j2rong4cn · 2025-04-22T09:10:10Z

大部分代码来自 v2fly/v2ray-core@8ceba34 v2fly/v2ray-core@c8c1120

大部分代码来自 v2fly/v2ray-core@8ceba34 v2fly/v2ray-core@c8c1120 Co-authored-by: Vigilans <vigilans@foxmail.com> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com>

RPRX · 2025-04-23T02:52:53Z

整个 QUIC sniffer 的代码都是从 v2fly 那边搬来的，你要搬就全搬了

j2rong4cn · 2025-04-23T02:55:44Z

整个 QUIC sniffer 的代码都是从 v2fly 那边搬来的，你要搬就全搬了

好

ddatsh · 2025-04-23T03:09:07Z

想提个问题请教啊，测试数据里那些hexData，有没办法是用代码来生成呀

RPRX · 2025-04-23T03:13:05Z

想提个问题请教啊，测试数据里那些hexData，有没办法是用代码来生成呀

~~说实话我没看过~~

j2rong4cn · 2025-04-23T03:14:37Z

想提个问题请教啊，测试数据里那些hexData，有没办法是用代码来生成呀

我是在手机的xray加个出站到电脑端得到的

RPRX · 2025-04-23T03:20:06Z

@j2rong4cn 你现在有空完善这个 PR 吗？我可以等等然后很快合并

j2rong4cn · 2025-04-23T03:31:59Z

@j2rong4cn 你现在有空完善这个 PR 吗？我可以等等然后很快合并

现在身边没电脑

Fangliding · 2025-04-23T03:56:24Z

想提个问题请教啊，测试数据里那些hexData，有没办法是用代码来生成呀

可以的丢个fake conn给QUIC就行了但是好像不是很有必要加之奇奇怪怪的QUIC包主要来自chrome的chaos protection 要生成它们就有点麻烦了(

j2rong4cn · 2025-04-23T04:19:43Z

@RPRX 好了

j2rong4cn · 2025-04-23T13:13:19Z

应该没bug了

common/protocol/quic/sniff_test.go

common/protocol/quic/sniff.go

Fangliding · 2025-04-23T13:43:06Z

最好全部搬过来然后移除掉那个defer recover

j2rong4cn · 2025-04-23T13:46:16Z

最好全部搬过来然后移除掉那个defer recover

搬完了

app/dispatcher/default.go

¿

RPRX · 2025-04-28T08:55:01Z

看了下修改后的 buffer.go，用标识 bytespools 取代 if cap(p) == Size { 是合理的，NewWithSize() Alloc 的也能正确 Free 了

潜在 bug 是 NewExisted() 会把 unmanaged 和 bytespools 转为 managed，然后在 Release() 中被 pool.Put(p)，以前有判断还好

但看了下 NewExisted() 只有 gRPC 传输层有两处调用，随便吧懒得再往上追了，gRPC 传输层都快成弃子了，~~交给众测~~

j2rong4cn · 2025-04-28T09:13:16Z

潜在 bug 是 NewExisted() 会把 unmanaged 和 bytespools 转为 managed，然后在 Release() 中被 pool.Put(p)，以前有判断还好

是直接从v2ray搬来的，没修改这个文件就没怎么看代码

RPRX · 2025-04-28T09:16:16Z

@j2rong4cn 我不确定你这项新的修改合不合适，根据之前的代码，我感觉 NewExisted() 的本意可能就是复用 New() 的 buffer？不然和 FromBytes() 的区别就只剩确保了 capacity

RPRX · 2025-04-28T09:18:32Z

@j2rong4cn 此外 if cap(p) == Size { 这个判断应该没必要加回来了，能 New 的就那五个函数，我之前看了一遍逻辑没有冲突

j2rong4cn · 2025-04-28T09:20:30Z

@j2rong4cn 我不确定你这项新的修改合不合适，根据之前的代码，我感觉 NewExisted() 的本意可能就是复用 New() 的 buffer？不然和 FromBytes() 的区别就只剩确保了 capacity

~~buffer.New之后不都会buffer.Release，除非忘记了Release，应该没问题吧，我去看看代码~~

感觉只加 if cap(p) == Size 判断最合适了

RPRX · 2025-04-28T09:35:49Z

感觉只加 if cap(p) == Size 判断最合适了

这样也行，走原逻辑，~~至少 buffer.go 这种最重要的基础设施之一别改出啥问题~~

至于 QUIC sniffer 的部分我是没有看的，交给众测，以及我计划把针对 UDP/443 的默认 block 扩展至更大范围，还没定插哪合适

这个 PR 的 title 需要 rename 一下以匹配现在的 files changed，不用提及 buffer.go

j2rong4cn · 2025-04-28T09:39:15Z

这个 PR 的 title 需要 rename 一下以匹配现在的 files changed，不用提及 buffer.go

你改吧

RPRX · 2025-04-28T09:40:00Z

~~我没看 QUIC sniffer 的相关 changes 所以改不了，你改吧~~

j2rong4cn · 2025-04-28T09:41:42Z

至于 QUIC sniffer 的部分我是没有看的，交给众测

我在安卓设备上测试了几个chrome内核的主流浏览器都都可以识别了

RPRX · 2025-04-28T10:03:21Z

感谢 PR，以及 v2fly 的三位贡献者

j2rong4cn · 2025-04-28T10:11:41Z

感谢 PR，以及 v2fly 的三位贡献者

又发现潜在bug了😅emm

common/protocol/quic/sniff.go

RPRX · 2025-04-28T10:26:14Z

其实之前我还是简单对比了一下的，我发现 v2fly 的代码没有你这里加的 wipeBytes()，看到你是在 "perf" 那个 commit 加的就没有说什么，而且你给 v2fly 那边也提了一个 PR，所以与它的 main 代码不一致也正常？所以就没提出

你再看看代码，可以开个 PR 修 bug，~~如果没把握的话就改成和 v2fly 的 main 保持一致吧~~

j2rong4cn · 2025-04-28T10:29:48Z

其实之前我还是简单对比了一下的，我发现 v2fly 的代码没有你这里加的 wipeBytes()，看到你是在 "perf" 那个 commit 加的就没有说什么，而且你给 v2fly 那边也提了一个 PR，所以与它的 main 代码不一致也正常？所以就没提出

你再看看代码，可以开个 PR 修 bug，~~如果没把握的话就改成和 v2fly 的 main 保持一致吧~~

是buffer.New()得到了有数据buf，导致数据错乱

RPRX · 2025-04-28T10:41:05Z

是buffer.New()得到了有数据buf，导致数据错乱

按理来说 buf.New() 不是默认 length 0、capacity 8k 吗？为什么还会得到有数据的 buf

j2rong4cn · 2025-04-28T10:44:09Z

是buffer.New()得到了有数据buf，导致数据错乱

按理来说 buf.New() 不是默认 length 0、capacity 8k 吗？为什么还会得到有数据的 buf

因为buf是从pool里拿出来的，有时候会得到有数据的buf

RPRX · 2025-04-28T10:45:51Z

因为buf是从pool里拿出来的，有时候会得到有数据的buf

只要 length 0，capacity 有数据也无所谓啊，~~难道 extend 加的是 length~~

j2rong4cn · 2025-04-28T10:49:21Z

common/protocol/quic/sniff.go

+
 		nonce := cache.Extend(int32(cipher.NonceSize()))
-		binary.BigEndian.PutUint64(nonce[len(nonce)-8:], uint64(packetNumber))
+		_, err = buffer.Read(nonce[len(nonce)-packetNumberLength:])


@RPRX 因为这里把数据读取到nonce末尾

原本的代码就有这个潜在bug

这个 buffer.Read 没问题吧，上面 cache.Extend 可能有问题

RPRX · 2025-04-28T11:24:00Z

~~我看了下 buf.Extend() 真就是只加 length，坏了~~

…S#4642) Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com> Co-authored-by: Vigilans <vigilans@foxmail.com> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com> Co-authored-by: dyhkwong <50692134+dyhkwong@users.noreply.github.com> (cherry picked from commit 58c4866)

…S#4642) Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com> Co-authored-by: Vigilans <vigilans@foxmail.com> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com> Co-authored-by: dyhkwong <50692134+dyhkwong@users.noreply.github.com>

j2rong4cn and others added 2 commits April 22, 2025 17:08

QUIC sniffer: handle PacketNumberLength great 1

73fea54

大部分代码来自 v2fly/v2ray-core@8ceba34 v2fly/v2ray-core@c8c1120 Co-authored-by: Vigilans <vigilans@foxmail.com> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com>

.

01df584

.

2c29525

j2rong4cn added 3 commits April 23, 2025 17:33

优化代码

59274f6

fix bug

a64f263

.

80c6af7

j2rong4cn commented Apr 23, 2025

View reviewed changes

common/protocol/quic/sniff_test.go Show resolved Hide resolved

common/protocol/quic/sniff.go Outdated Show resolved Hide resolved

onediram previously approved these changes Apr 23, 2025

View reviewed changes

app/dispatcher/default.go Show resolved Hide resolved

j2rong4cn added 2 commits April 23, 2025 21:52

.

e623076

perf

2ad92b4

j2rong4cn force-pushed the quic-sniffer branch from 8c2d640 to 2ad92b4 Compare April 23, 2025 15:13

Update buffer.go

f42cd2f

j2rong4cn force-pushed the quic-sniffer branch from 5ddb191 to 995a1f7 Compare April 28, 2025 09:09

fix bug

ac6ba0b

j2rong4cn force-pushed the quic-sniffer branch from 995a1f7 to ac6ba0b Compare April 28, 2025 09:27

j2rong4cn closed this Apr 28, 2025

j2rong4cn reopened this Apr 28, 2025

j2rong4cn changed the title ~~QUIC sniffer: handle PacketNumberLength great 1~~ QUIC sniffer: Full support for handle multiple initial packets Apr 28, 2025

RPRX changed the title ~~QUIC sniffer: Full support for handle multiple initial packets~~ QUIC sniffer: Full support for handling multiple initial packets Apr 28, 2025

RPRX merged commit 58c4866 into XTLS:main Apr 28, 2025
70 checks passed

j2rong4cn commented Apr 28, 2025

View reviewed changes

common/protocol/quic/sniff.go Show resolved Hide resolved

j2rong4cn commented Apr 28, 2025

View reviewed changes

j2rong4cn mentioned this pull request Apr 28, 2025

QUIC sniffer: Optimize the code #4655

Merged

j2rong4cn deleted the quic-sniffer branch April 29, 2025 08:55

BrewTestBot mentioned this pull request May 16, 2025

xray 25.5.16 Homebrew/homebrew-core#223688

Merged

1 task

codeOwlAI mentioned this pull request Jun 30, 2025

Feature implementation from commits 2d3126b..58c4866 codeOwlAI/Xray-core#2

Open

Conversation

j2rong4cn commented Apr 22, 2025

Uh oh!

RPRX commented Apr 23, 2025

Uh oh!

j2rong4cn commented Apr 23, 2025

Uh oh!

ddatsh commented Apr 23, 2025

Uh oh!

RPRX commented Apr 23, 2025

Uh oh!

j2rong4cn commented Apr 23, 2025

Uh oh!

RPRX commented Apr 23, 2025

Uh oh!

j2rong4cn commented Apr 23, 2025

Uh oh!

Fangliding commented Apr 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

j2rong4cn commented Apr 23, 2025

Uh oh!

j2rong4cn commented Apr 23, 2025

Uh oh!

Uh oh!

Uh oh!

Fangliding commented Apr 23, 2025

Uh oh!

j2rong4cn commented Apr 23, 2025

Uh oh!

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

j2rong4cn commented Apr 28, 2025

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

j2rong4cn commented Apr 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

j2rong4cn commented Apr 28, 2025

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

j2rong4cn commented Apr 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

j2rong4cn commented Apr 28, 2025

Uh oh!

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

j2rong4cn commented Apr 28, 2025

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

j2rong4cn commented Apr 28, 2025

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

j2rong4cn Apr 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

j2rong4cn Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

RPRX Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

RPRX commented Apr 28, 2025

Uh oh!

Reviewers

Fangliding commented Apr 23, 2025 •

edited

Loading

j2rong4cn commented Apr 28, 2025 •

edited

Loading

j2rong4cn commented Apr 28, 2025 •

edited

Loading

j2rong4cn Apr 28, 2025 •

edited

Loading