aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

/register: parameter updates

Browse Source 
add auth param, switch host and username params, rename host param to server
This commit is contained in:
swirl 2021-07-01 21:29:09 -04:00
parent d9366a26d6
commit 5ea1ccbb46
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/command/cmd_defs.c
View File

@ -2649,23 +2649,25 @@ static struct cmd_t command_defs[] = {
CMD_TAGS( CMD_TAGS(
CMD_TAG_CONNECTION) CMD_TAG_CONNECTION)
CMD_SYN( CMD_SYN(
"/register <host> <username> [port <port>] [tls force|allow|trust|legacy|disable]") "/register <username> <server> [port <port>] [tls force|allow|trust|legacy|disable] [auth default|legacy]")
CMD_DESC( CMD_DESC(
"Register an account on a server.") "Register an account on a server.")
CMD_ARGS( CMD_ARGS(
{ "<host>", "Server to register account on." },
{ "<username>", "Username to register with." }, { "<username>", "Username to register with." },
{ "<server>", "Server to register account on." },
{ "port <port>", "The port to use if different to the default (5222, or 5223 for SSL)." }, { "port <port>", "The port to use if different to the default (5222, or 5223 for SSL)." },
{ "tls force", "Force TLS connection, and fail if one cannot be established. This is the default behavior." }, { "tls force", "Force TLS connection, and fail if one cannot be established. This is the default behavior." },
{ "tls allow", "Use TLS for the connection if it is available." }, { "tls allow", "Use TLS for the connection if it is available." },
{ "tls trust", "Force TLS connection and trust server's certificate." }, { "tls trust", "Force TLS connection and trust the server's certificate." },
{ "tls legacy", "Use legacy TLS for the connection. This forces TLS just after the TCP connection is established. Use when a server doesn't support STARTTLS." }, { "tls legacy", "Use legacy TLS for the connection. This forces TLS just after the TCP connection is established. Use when a server doesn't support STARTTLS." },
{ "tls disable", "Disable TLS for the connection." }) { "tls disable", "Disable TLS for the connection." },
{ "auth default", "Default authentication process." },
{ "auth legacy", "Allow legacy authentication." })
CMD_EXAMPLES( CMD_EXAMPLES(
"/register valhalla.edda odin", "/register odin valhalla.edda ",
"/register vanaheimr.edda freyr port 5678", "/register freyr vanaheimr.edda port 5678",
"/register 127.0.0.1 me tls disable", "/register me 127.0.0.1 tls disable",
"/register my.xmppserv.er someuser port 5443 tls force") "/register someuser my.xmppserv.er port 5443 tls force")
}, },
// NEXT-COMMAND (search helper) // NEXT-COMMAND (search helper)

26
src/command/cmd_funcs.c
View File

@ -9545,7 +9545,7 @@ cmd_silence(ProfWin* window, const char* const command, gchar** args)
gboolean gboolean
cmd_register(ProfWin* window, const char* const command, gchar** args) cmd_register(ProfWin* window, const char* const command, gchar** args)
{ {
gchar* opt_keys[] = { "port", "tls", NULL }; gchar* opt_keys[] = { "port", "tls", "auth", NULL };
gboolean parsed; gboolean parsed;
GHashTable* options = parse_options(&args[2], opt_keys, &parsed); GHashTable* options = parse_options(&args[2], opt_keys, &parsed);
@ -9579,17 +9579,25 @@ cmd_register(ProfWin* window, const char* const command, gchar** args)
} }
} }
char* host = args[0]; char* auth_policy = g_hash_table_lookup(options, "auth");
if (auth_policy && (g_strcmp0(auth_policy, "default") != 0) && (g_strcmp0(auth_policy, "legacy") != 0)) {
jabber_conn_status_t conn_status = connection_connect_raw(host, port, tls_policy, "default"); cons_bad_cmd_usage(command);
cons_show("");
if (conn_status == JABBER_DISCONNECTED) { options_destroy(options);
cons_show_error("Connection attempt to server %s port %d failed.", host, port);
log_info("Connection attempt to server %s port %d failed.", host, port);
return TRUE; return TRUE;
} }
char* username = args[1]; char* server = args[1];
jabber_conn_status_t conn_status = connection_connect_raw(server, port, tls_policy, auth_policy);
if (conn_status == JABBER_DISCONNECTED) {
cons_show_error("Connection attempt to server %s port %d failed.", server, port);
log_info("Connection attempt to server %s port %d failed.", server, port);
return TRUE;
}
char* username = args[0];
char* passwd = ui_ask_password(false); char* passwd = ui_ask_password(false);
char* confirm_passwd = ui_ask_password(true); char* confirm_passwd = ui_ask_password(true);