cuprated: Generic SOCKS5 proxy support + ClearNet over Daemon
#549
+165
−23
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
A-p2p
SyntheticBird45
changed the title
cuprated: Generic SOCKS5 proxy support + ClearNet over Daemon
Boog900
reviewed
Feb 9, 2026
Comment on lines
+50
to
+78
| impl TryFrom<ProxySettings> for SocksClientConfig { | ||
| type Error = anyhow::Error; | ||
|
|
||
| fn try_from(value: ProxySettings) -> Result<Self, Self::Error> { | ||
| let ProxySettings::Socks(url) = value else { | ||
| panic!("Tor proxy setting should not be parsed!") | ||
| }; | ||
|
|
||
| let Some((_, url)) = url.split_once("socks5://") else { | ||
| return Err(anyhow!("Invalid proxy url header.")); | ||
| }; | ||
|
|
||
| let (authentication, addr) = url | ||
| .split_once('@') | ||
| .map(|(up, ad)| { | ||
| ( | ||
| up.split_once(':') | ||
| .map(|(a, b)| (a.to_string(), b.to_string())), | ||
| ad, | ||
| ) | ||
| }) | ||
| .unwrap_or((None, url)); | ||
|
|
||
| Ok(Self { | ||
| proxy: addr.parse()?, | ||
| authentication, | ||
| }) | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Can this be a free function that takes a proxy string?
Comment on lines
+293
to
+299
| /// Gets the transport config for [`ClearNet`] over [`Socks`]. | ||
| pub fn socks_transport_config(&self) -> TransportConfig<ClearNet, Socks> { | ||
| TransportConfig { | ||
| client_config: self.proxy.clone().try_into().unwrap(), | ||
| server_config: None, | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
making that other function a free function means we don't need this
| context_svc.clone(), | ||
| txpool_read_handle.clone(), | ||
| config.clearnet_p2p_config(), | ||
| config.p2p.clear_net.socks_transport_config(), |
Member
There was a problem hiding this comment.
we can just call the free function here
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Add support to pass P2P traffic to a specific SOCKS5 proxy. Authentication is supported. This is also used to implement
ClearNetoverDaemontor anonymization of clearnet traffic.Follows: #509
Changelog
In
cuprate-p2p-transport:socks.rsfile containingSocksthatimpl Transport<ClearNet>. As well asSocksClientConfig(socks5 proxy settings).In
cuprated:TryFrom<ProxySettings> for SocksClientConfigto parse socks5 URL in user configuration. The urls are in the form of:socks5://username:password@host:port.socks_transport_configandtransport_clearnet_daemon_confighelpers.initialize_zones_p2paccordingly.