summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src/cmds/api_access.rs
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2023-10-27 08:55:21 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2023-10-27 08:55:21 +0200
commit36f2fad7e34ab4a87f371278e5416ff5cea00971 (patch)
tree661345bfeda4c9fdef798a2472e6a49d38725b79 /mullvad-cli/src/cmds/api_access.rs
parent1de3f4efb1c6fd5d506353811f6a74b09c5bc172 (diff)
parent2c007aa39106cfbeddaa9e3640f0b61f403e5f8a (diff)
downloadmullvadvpn-36f2fad7e34ab4a87f371278e5416ff5cea00971.tar.xz
mullvadvpn-36f2fad7e34ab4a87f371278e5416ff5cea00971.zip
Merge branch 'fix/user-and-pass-optional-socks5-remote'
Diffstat (limited to 'mullvad-cli/src/cmds/api_access.rs')
-rw-r--r--mullvad-cli/src/cmds/api_access.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/mullvad-cli/src/cmds/api_access.rs b/mullvad-cli/src/cmds/api_access.rs
index 441c549c71..dc736c71c6 100644
--- a/mullvad-cli/src/cmds/api_access.rs
+++ b/mullvad-cli/src/cmds/api_access.rs
@@ -321,12 +321,13 @@ pub enum AddSocks5Commands {
}
#[derive(Args, Debug, Clone)]
+#[group(requires_all = ["username", "password"])] // https://github.com/clap-rs/clap/issues/5092
pub struct SocksAuthentication {
/// Username for authentication against a remote SOCKS5 proxy
- #[arg(short, long)]
+ #[arg(short, long, required = false)]
username: String,
/// Password for authentication against a remote SOCKS5 proxy
- #[arg(short, long)]
+ #[arg(short, long, required = false)]
password: String,
}