hex/wstunnel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow loading http upgrade path prefix from env

Browse source
This commit is contained in:
Σrebe - Romain GERARD 2023-12-19 23:22:07 +01:00
parent 001759afac
commit 27f16984e0
No known key found for this signature in database
GPG key ID: 7A42B4B97E0332F4
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "wstunnel" name = "wstunnel"
version = "8.4.0" version = "8.4.1"
edition = "2021" edition = "2021"
repository = "https://github.com/erebe/wstunnel.git" repository = "https://github.com/erebe/wstunnel.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -13,7 +13,7 @@ base64 = "0.21.5"
bb8 = { version = "0.8", features = [] } bb8 = { version = "0.8", features = [] }
bytes = { version = "1.5.0", features = [] } bytes = { version = "1.5.0", features = [] }
clap = { version = "4.4.11", features = ["derive"] } clap = { version = "4.4.11", features = ["derive", "env"] }
fast-socks5 = { version = "0.9.2", features = [] } fast-socks5 = { version = "0.9.2", features = [] }
fastwebsockets = { version = "0.6.0", features = ["upgrade", "simd", "unstable-split"] } fastwebsockets = { version = "0.6.0", features = ["upgrade", "simd", "unstable-split"] }
futures-util = { version = "0.3.29" } futures-util = { version = "0.3.29" }

4
src/dns.rs
View file

@ -10,9 +10,7 @@ pub enum DnsResolver {
impl DnsResolver { impl DnsResolver {
pub async fn lookup_host(&self, domain: &str, port: u16) -> anyhow::Result<Vec<SocketAddr>> { pub async fn lookup_host(&self, domain: &str, port: u16) -> anyhow::Result<Vec<SocketAddr>> {
let addrs: Vec<SocketAddr> = match self { let addrs: Vec<SocketAddr> = match self {
DnsResolver::System => tokio::net::lookup_host(format!("{}:{}", domain, port)) DnsResolver::System => tokio::net::lookup_host(format!("{}:{}", domain, port)).await?.collect(),
.await?
.collect(),
DnsResolver::TrustDns(dns_resolver) => dns_resolver DnsResolver::TrustDns(dns_resolver) => dns_resolver
.lookup_ip(domain) .lookup_ip(domain)
.await? .await?

14
src/main.rs
View file

@ -105,7 +105,12 @@ struct Client {
/// Use a specific prefix that will show up in the http path during the upgrade request. /// Use a specific prefix that will show up in the http path during the upgrade request.
/// Useful if you need to route requests server side but don't have vhosts /// Useful if you need to route requests server side but don't have vhosts
#[arg(long, default_value = "morille", verbatim_doc_comment)] #[arg(
long,
default_value = "morille",
verbatim_doc_comment,
env = "WSTUNNEL_HTTP_UPGRADE_PATH_PREFIX"
)]
http_upgrade_path_prefix: String, http_upgrade_path_prefix: String,
/// Pass authorization header with basic auth credentials during the upgrade request. /// Pass authorization header with basic auth credentials during the upgrade request.
@ -174,7 +179,12 @@ struct Server {
/// Useful if you specify in the client a custom path prefix and you want the server to only allow this one. /// Useful if you specify in the client a custom path prefix and you want the server to only allow this one.
/// The path prefix act as a secret to authenticate clients /// The path prefix act as a secret to authenticate clients
/// Disabled by default. Accept all path prefix. Can be specified multiple time /// Disabled by default. Accept all path prefix. Can be specified multiple time
#[arg(short = 'r', long, verbatim_doc_comment)] #[arg(
short = 'r',
long,
verbatim_doc_comment,
env = "WSTUNNEL_RESTRICT_HTTP_UPGRADE_PATH_PREFIX"
)]
restrict_http_upgrade_path_prefix: Option<Vec<String>>, restrict_http_upgrade_path_prefix: Option<Vec<String>>,
/// [Optional] Use custom certificate (.crt) instead of the default embedded self signed certificate. /// [Optional] Use custom certificate (.crt) instead of the default embedded self signed certificate.