Improves tor flag logic in watchtower-plugin #160
Conversation
sr-gi
added
feature request
sr-gi
force-pushed
the
cln-tor-flag
branch
4 times, most recently
from
e4a9e7b to
3be8ccb
Compare
watchtower-plugin/src/net/http.rs
Outdated
| let client = if url.host_str().unwrap().ends_with(".onion") { | ||
| if let Some(proxy) = proxy { | ||
| let proxy = reqwest::Proxy::http(format!("socks5h://{}", proxy)) | ||
| let proxy = reqwest::Proxy::http(proxy.get_socks_addr()) | ||
| .map_err(|e| RequestError::ConnectionError(format!("{}", e)))?; | ||
| reqwest::Client::builder() | ||
| .proxy(proxy) |
There was a problem hiding this comment.
So this checks if the host is a .onion url and uses the proxy for it.
But we don't make use of the always_use_proxy option flag that CLN provides. We should prioritize that first, i.e.: if always_use_proxy flag is set and the url isn't a .onion we should still use the proxy, as not using it in such a case will expose the node's IP address.
Something along the lines of:
if let Some(proxy) = proxy {
if proxy.always_use || url.is_onion() {
// construct a proxied client.
} else {
// construct a non-proxied client.
}
} else {
if url.is_onion() {
return Err("url is onion but no proxy")
}
// construct a non-proxid client.
}There was a problem hiding this comment.
This should be covered now, alongside some minor improvements.
I've added an endpoint param to some of the http functions. A followup would be nice defining the tower endpoints as an enum and replacing all string endpoint with the proper variant (I'm already working on this).
The `watchtower-plugin` was specifying a custom tor flag to signal whether Tor may be used by the client. This was due to `cln-plugin (v0.1.1-)` not allowing plugins to access the CoreLN configuration options and, therefore, our plugin was unable to fetch the `proxy` / `always-use-proxy` options. This fetches the aforementioned options and revamps the logic to comply with the `always-use-proxy` requirements, that is, if the flag is set all communications must be performed using Tor. Also, it replaces some of the currently used `String`s for more meaningful types to store network data (such as `AddressType`, `NetAddress`, or `ProxyInfo`). This drops our custom `watchtower-proxy` config option
|
Rebased to squash all changes |
Changes
The
watchtower-pluginwas specifying a custom tor flag to signal whether Tor may be used by the client. This was due tocln-plugin (v0.1.1-)not allowing plugins to access the CoreLN configuration options and, therefore, our plugin was unable to fetch theproxy/always-use-proxyoptions.This fetches the aforementioned options and revamps the logic to comply with the
always-use-proxyrequirements, that is, if the flag is set all communications must be performed using Tor. Also, it replaces some of the currently usedStrings for more meaningful types to store network data (such asAddressType,NetAddress, orProxyInfo).This drops our custom
watchtower-proxyconfig option