feat: hysteria draft #217

eauxxs · 2023-12-16T11:21:59Z

🤔 This is a ...

New feature

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self-Check before Merge

⚠️ Please check all items below before requesting a reviewing. ⚠️

Doc is updated/provided or not needed
Changelog is provided or not needed

ibigbug · 2023-12-17T10:57:21Z

clash_lib/src/proxy/hysteria2/convert.rs

@@ -0,0 +1,43 @@
+use std::sync::Arc;


you can put this under clash_lib/src/proxy/converters

eauxxs · 2023-12-17T13:39:36Z

At present, hysteria2 can already perform tcp proxy, mainly udp proxy, brutal congestion, ports hopping has not been implemented, port hopping may be just a small problem.
In the process of implementing salamander, I encountered a very confusing problem. The obfuscation can be correctly encrypted and decrypted by both parties, and the quic connection can be established. But when sending h3 authentication, an error will occur. I don’t know if it’s a problem with the h3 library or the obfuscation algorithm itself or something else. I don’t know if you know more about quic and if you have any ideas.
@ibigbug @greenhat616 @xmh0511

greenhat616 · 2023-12-18T18:56:03Z

I'm busy these days. while I am spare, I could take a look.

eauxxs · 2023-12-19T03:17:39Z

I'm busy these days. while I am spare, I could take a look.

thanks, salamander obfs have been fixed, it work now

ibigbug · 2023-12-25T10:21:52Z

Hey thank you guys.

I see that you've fixed the problem, is there anything left to be done for this PR?

ibigbug · 2023-12-25T10:58:36Z

@eauxxs the build is failed on Windows

ibigbug · 2023-12-25T12:19:11Z

clash/tests/data/config/ss.yaml

@@ -60,5 +60,5 @@ proxies:
    udp: true

 rules:
-  - MATCH, ss
+  - MATCH, ss-01


Suggested change

- MATCH, ss-01

- MATCH, ss

ibigbug · 2023-12-25T12:19:32Z

clash/tests/data/config/hysteria2.yaml

+
+proxies:
+  - name: "local"
+    type: Hysteria2


Suggested change

type: Hysteria2

type: hysteria2

ibigbug · 2023-12-25T12:20:05Z

clash_lib/src/app/logging.rs

@@ -6,6 +6,7 @@ use serde::Serialize;
 use tokio::sync::broadcast::Sender;

 use tracing::debug;
+use tracing::Level;


Suggested change

use tracing::Level;

ibigbug · 2023-12-25T12:20:50Z

clash_lib/src/app/logging.rs

@@ -103,6 +104,11 @@ pub fn setup_logging(
        )
        .from_env_lossy();

+    // let trace = tracing_subscriber::filter::targets::Targets::new()


you can do something like this to enable the level RUST_LOG=h2=trace,clash=debug

ibigbug · 2023-12-25T12:21:26Z

clash_lib/src/config/internal/proxy.rs

@@ -53,6 +53,7 @@ pub enum OutboundProxyProtocol {
    Trojan(OutboundTrojan),
    #[serde(rename = "vmess")]
    Vmess(OutboundVmess),
+    Hysteria2(OutboundHysteria2),


Suggested change

Hysteria2(OutboundHysteria2),

#[serde(rename = "hysteria2")]

Hysteria2(OutboundHysteria2),

ibigbug · 2023-12-25T12:23:37Z

clash_lib/src/proxy/hysteria2/udp_hop.rs

+
+use crate::proxy::converters::hysteria2::PortGenrateor;
+
+pub struct UdpHop {


could you please add a short description for this struct, such as what part it plays in the protocol

https://v2.hysteria.network/docs/advanced/Port-Hopping/

ibigbug · 2023-12-25T12:24:04Z

clash_lib/src/proxy/hysteria2/salamander.rs

+    }
+
+    println!("done");
+    // std::thread::sleep(std::time::Duration::from_secs(100000));


Suggested change

// std::thread::sleep(std::time::Duration::from_secs(100000));

ibigbug · 2023-12-25T12:26:18Z

clash_lib/src/config/internal/proxy.rs

@@ -368,3 +371,53 @@ impl TryFrom<HashMap<String, Value>> for OutboundProxyProviderDef {
            .map_err(map_serde_error)
    }
 }
+
+//   #hysteria2


would be great if you can convert these into the standard doc comment https://doc.rust-lang.org/rust-by-example/meta/doc.html

so that we might use them in future to generate the API references

ibigbug · 2023-12-25T12:27:24Z

clash_lib/src/proxy/hysteria2/congestion.rs

+
+struct Burtal;
+
+impl Controller for Burtal {


is this used any where?

ibigbug · 2023-12-25T12:28:08Z

clash_lib/src/proxy/hysteria2/congestion.rs

+
+use quinn_proto::congestion::{Bbr, BbrConfig, Controller, ControllerFactory};
+
+pub struct DynCongestion;


is this file used at all?

The current protocol still needs to implement the congestion algorithm and udp proxy. I will fix this part of the code next week.

can not wait it

can not wait it

哥们尽快吧，主要是最近比较忙，还生病了。
另外rust的quinn拥塞算法接口和go的那边还不一样，go这边有现成的，rust没有，工作还比较多。

身体要紧。
如果有什么问题可以分享出来大家一起看。

谢谢关心。目前就是拥塞算法，对照着go版本hysteria的brutal拥塞算法，它那里是计算丢包个数再进行调整发送速率，quinn接口只有丢包字节数，我问一下这个issue，目前还在看，不知道是否有更好的方法

我看有回复，如果他的说法可行，提个PR？

can not wait it

eauxxs · 2023-12-28T09:49:53Z

@eauxxs the build is failed on Windows

It looks like the problem is with borrowing-ssl, can we remove deps directory, and use boring crate directly, why it is necessary?

ibigbug · 2023-12-31T16:02:05Z

@eauxxs the build is failed on Windows

It looks like the problem is with borrowing-ssl, can we remove deps directory, and use boring crate directly, why it is necessary?

the forked boring added aes and this #240 removes it

ibigbug · 2024-09-11T13:30:38Z

@eauxxs Any blockers for this ?

eauxxs · 2024-09-16T08:46:35Z

@ibigbug I'm very sorry that I just saw this news now. One is the problem of my work, and the other is the congestion control algorithm of quic. The other aspects of the protocol have been implemented. . . Regarding congestion control, I can only refer to the implementation of go, but I still don't know how to implement it. If you only use bbr, you can use it directly.

ibigbug · 2024-09-16T17:02:31Z

No worries. Thanks for the update. I might be able to take it over when I get some time.

eauxxs · 2024-09-17T02:50:16Z

I'm very sorry for taking so long. It's okay, I will rebase to the latest branch first. Then try to make a usable version. I like this project very much. . . I will give you feedback in time if I encounter any problems later.

ibigbug · 2024-09-17T07:31:54Z

Much appreciated!

lmmqxyx404 · 2024-09-19T14:40:25Z

6e4b2a8 这个分支的代码我在我本地 ubuntu22.04 机器上跑了下 hysteria2 代理，发现建立连接时就报错。
通过 wireshaek 抓包后发现，
Initial 连接时的 Crypto Frame 包含了 handshake 握手信息，其中 Extension::signature_algorithms 为空，导致 client 发出的信息不正常。分析了代码后，我发现可能是 tls_config 这个变量初始化有问题。
在我改了supported_verify_schemes 这个函数后。客户端发出的 handshake 正常，但是服务端的响应，客户端无法正常解析。
[Failed to create decryption context: Secrets are not available]

I ran the hysteria2 proxy on my local Ubuntu 22.04 machine using the code from branch 6e4b2a8, and encountered an error when establishing a connection.

After capturing packets, I found that during the initial connection, the Crypto frame contained handshake information, but the Extension::signature_algorithms field was empty. This caused the client to send abnormal information. After analyzing the code, I found that the issue might be with the initialization of the tls_config variable.

After modifying the supported_verify_schemes function, the handshake sent by the client became normal, but the server’s response could not be correctly parsed by the client. The error message is:

[Failed to create decryption context: Secrets are not available]

eauxxs · 2024-09-19T16:25:04Z

@lmmqxyx404 谢谢你的review。目前这个最新的提交只是基于最新的分支进行rebase。因为rustls，h3-quinn，quinn版本的更新，所以以前的代码也不可用了。这次pr也更新到了相关依赖的最新版本，而且有些方法重写了，但是我还没有时间来得及测试，如果你那边发现了问题，可以在这个分支上提交，一起工作。也可以另开一个分支，重用一些这个pr的代码，如果能用的到的话。

lmmqxyx404 · 2024-09-20T04:32:16Z

@eauxxs 我倒是挺想把这个功能实现的，不过主要是我能力有限。不知道改的方向，只好做一些琐碎的工作。

如果大哥有什么好的思路，就在这一起讨论下吧，万望不吝赐教。

lmmqxyx404 · 2024-09-21T01:52:30Z

我对于服务端的响应理解有误，原始go实现的 hysteria2 服务端响应被抓包后，也是一样会报错。这个问题还需要继续分析

lmmqxyx404 · 2024-10-12T03:34:04Z

@eauxxs @ibigbug 我这边修改代码已经让hysteria2 协议跑起来了
总的来说只要改动两处代码。

supported_verify_schemes 前面已经说过了

let any = session
           .congestion_state()
           .into_any()
           .downcast::<DynController>()
           .unwrap();
       any.set_controller(Box::new(Burtal::new(0, session.clone())));

改为

match session
            .congestion_state()
            .into_any()
            .downcast::<DynController>()
        {
            Ok(any) => {
                any.set_controller(Box::new(Burtal::new(0, session.clone())));
            }
            Err(err) => {
                tracing::error!("Failed to downcast congestion controller");
            }
        }

ibigbug · 2024-10-12T07:17:58Z

@eauxxs 看看？

eauxxs · 2024-10-15T15:53:23Z

@lmmqxyx404 @ibigbug 这些都是些小问题，主要的问题是拥塞控制，还有一个问题是端口跳跃的问题。目前拥塞控制需要帮助。。

Signed-off-by: Yuwei Ba <[email protected]>

lmmqxyx404 · 2024-10-16T10:33:28Z

@lmmqxyx404 @ibigbug 这些都是些小问题，主要的问题是拥塞控制，还有一个问题是端口跳跃的问题。目前拥塞控制需要帮助。。

具体是什么问题呢？能不能具体说说，如果容易解决，我最近有空，可以再试着去解决下。

ibigbug reviewed Dec 17, 2023

View reviewed changes

eauxxs mentioned this pull request Dec 18, 2023

hysteria2有在支持的计划内吗 #218

Open

ibigbug requested changes Dec 25, 2023

View reviewed changes

ibigbug mentioned this pull request Dec 31, 2023

known transports/protocols (unimplemented) #190

Open

ibigbug changed the title ~~hysteria draft~~ feat: hysteria draft May 10, 2024

rebase

6e4b2a8

eauxxs force-pushed the hysteria2-draft branch from 42bd7f2 to 6e4b2a8 Compare September 18, 2024 16:02

Merge branch 'master' into hysteria2-draft

2286468

Signed-off-by: Yuwei Ba <[email protected]>

ibigbug merged commit 6f15468 into Watfaq:master Oct 16, 2024
2 of 24 checks passed

ibigbug mentioned this pull request Oct 16, 2024

feat(proxy): plain hysteria2 #626

Merged

12 tasks

	Hysteria2(OutboundHysteria2),
	#[serde(rename = "hysteria2")]
	Hysteria2(OutboundHysteria2),


		use crate::proxy::converters::hysteria2::PortGenrateor;

		pub struct UdpHop {


		use quinn_proto::congestion::{Bbr, BbrConfig, Controller, ControllerFactory};

		pub struct DynCongestion;

feat: hysteria draft #217

feat: hysteria draft #217

Conversation

eauxxs commented Dec 16, 2023

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self-Check before Merge

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eauxxs commented Dec 17, 2023

greenhat616 commented Dec 18, 2023

eauxxs commented Dec 19, 2023

ibigbug commented Dec 25, 2023

ibigbug commented Dec 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eauxxs commented Dec 28, 2023

ibigbug commented Dec 31, 2023 • edited Loading

ibigbug commented Sep 11, 2024

eauxxs commented Sep 16, 2024

ibigbug commented Sep 16, 2024

eauxxs commented Sep 17, 2024

ibigbug commented Sep 17, 2024

lmmqxyx404 commented Sep 19, 2024

eauxxs commented Sep 19, 2024

lmmqxyx404 commented Sep 20, 2024

lmmqxyx404 commented Sep 21, 2024

lmmqxyx404 commented Oct 12, 2024 • edited Loading

ibigbug commented Oct 12, 2024

eauxxs commented Oct 15, 2024

lmmqxyx404 commented Oct 16, 2024

ibigbug commented Dec 31, 2023 •

edited

Loading

lmmqxyx404 commented Oct 12, 2024 •

edited

Loading