Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve help for on/off identity command #681

Merged
merged 1 commit into from
Jun 16, 2023
Merged

improve help for on/off identity command #681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions programs/ziti-edge-tunnel/ziti-edge-tunnel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,8 @@ static bool process_tunnel_commands(const tunnel_command *tnl_cmd, command_cb cb
cmd_accepted = true;
tunnel_add_identity tunnel_add_identity_cmd = {0};
if (tnl_cmd->data == NULL ||
parse_tunnel_add_identity(&tunnel_add_identity_cmd, tnl_cmd->data, strlen(tnl_cmd->data)) < 0) {
parse_tunnel_add_identity(&tunnel_add_identity_cmd, tnl_cmd->data, strlen(tnl_cmd->data)) < 0 ||
(tunnel_add_identity_cmd.jwtFileName == NULL && tunnel_add_identity_cmd.jwtContent == NULL)) {
result.error = "invalid command";
result.success = false;
free_tunnel_add_identity(&tunnel_add_identity_cmd);
Expand Down Expand Up @@ -2375,6 +2376,7 @@ static int on_off_identity_opts(int argc, char *argv[]) {
}
size_t json_len;
cmd->data = tunnel_on_off_identity_to_json(&on_off_identity_options, MODEL_JSON_COMPACT, &json_len);
on_off_identity_options.identifier = NULL; // don't try to free static memory (`optarg`)
free_tunnel_on_off_identity(&on_off_identity_options);

return optind;
Expand Down Expand Up @@ -2943,9 +2945,9 @@ static CommandLine run_host_cmd = make_command("run-host", "run Ziti tunnel to h
static CommandLine dump_cmd = make_command("dump", "dump the identities information", "[-i <identity>] [-p <dir>]",
"\t-i|--identity\tdump identity info\n"
"\t-p|--dump_path\tdump into path\n", dump_opts, send_message_to_tunnel_fn);
static CommandLine on_off_id_cmd = make_command("on_off_identity", "enable/disable the identities information", "[-i <identity>] [-o <onoff>]",
static CommandLine on_off_id_cmd = make_command("on_off_identity", "enable/disable the identities information", "-i <identity> -o t|f",
"\t-i|--identity\tidentity info that needs to be enabled/disabled\n"
"\t-o|--onoff\tenable/disable the identity\n", on_off_identity_opts, send_message_to_tunnel_fn);
"\t-o|--onoff\t't' or 'f' to enable or disable the identity\n", on_off_identity_opts, send_message_to_tunnel_fn);
static CommandLine enable_id_cmd = make_command("enable", "enable the identities information", "[-i <identity>]",
"\t-i|--identity\tidentity info that needs to be enabled\n", enable_identity_opts, send_message_to_tunnel_fn);
static CommandLine enable_mfa_cmd = make_command("enable_mfa", "Enable MFA function fetches the totp url from the controller", "[-i <identity>]",
Expand Down
Loading