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

Mark unsupported configurations as conflicting (#273)

Browse source 
This change marks combining the yaml restrictions file together with arguments such as `--restrict-http-upgrade-path-prefix` as conflicting in clap. Since wstunnel will only use the yaml restrictions file when it is supplied and ignore the other arguments. This change makes this more obvious for users (since wstunnel will exit with an error).

The reason for still allowing the client `--http-upgrade-path-prefix` is that one could be using a proxy server in front of wstunnel which does mTLS. This is a pretty specific corner case though. A warning was added so it's clear to users that this will only work in specific scenarios.
This commit is contained in:
Jasper Siepkes 2024-05-16 10:48:24 +02:00 committed by GitHub
parent a89d4da2b0
commit 054460ad3e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -183,6 +183,8 @@ struct Client {
/// 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
/// When using mTLS this option overrides the default behavior of using the common name of the
/// client's certificate. This will likely result in the wstunnel server rejecting the connection.
#[arg(
short = 'P',
long,
@ -282,7 +284,12 @@ struct Server {
/// Server will only accept connection from the specified tunnel information.
/// Can be specified multiple time
/// Example: --restrict-to "google.com:443" --restrict-to "localhost:22"
#[arg(long, value_name = "DEST:PORT", verbatim_doc_comment)]
#[arg(
long,
value_name = "DEST:PORT",
verbatim_doc_comment,
conflicts_with = "restrict_config",
)]
restrict_to: Option<Vec<String>>,
/// Server will only accept connection from if this specific path prefix is used during websocket upgrade.
@ -293,6 +300,7 @@ struct Server {
short = 'r',
long,
verbatim_doc_comment,
conflicts_with = "restrict_config",
env = "WSTUNNEL_RESTRICT_HTTP_UPGRADE_PATH_PREFIX"
)]
restrict_http_upgrade_path_prefix: Option<Vec<String>>,