Merge pull request #1574 from binex-dsk/master

Add in-band account registration
Fix https://github.com/profanity-im/profanity/issues/199

src/command/cmd_defs.c

@@ -2636,6 +2636,32 @@ static struct cmd_t command_defs[] = {
       CMD_NOEXAMPLES
     },
 
+    { "/register",
+      parse_args, 2, 6, NULL,
+      CMD_NOSUBFUNCS
+      CMD_MAINFUNC(cmd_register)
+      CMD_TAGS(
+              CMD_TAG_CONNECTION)
+      CMD_SYN(
+              "/register <username> <server> [port <port>] [tls force|allow|trust|legacy|disable]")
+      CMD_DESC(
+              "Register an account on a server.")
+      CMD_ARGS(
+              { "<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)." },
+              { "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 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 disable", "Disable TLS for the connection." })
+      CMD_EXAMPLES(
+              "/register odin valhalla.edda ",
+              "/register freyr vanaheimr.edda port 5678",
+              "/register me 127.0.0.1 tls disable",
+              "/register someuser my.xmppserv.er port 5443 tls force")
+    },
+
     // NEXT-COMMAND (search helper)
 };
 
@@ -3006,3 +3032,4 @@ command_mangen(void)
     g_free(header);
     g_list_free(cmds);
 }
+

src/command/cmd_funcs.c

@@ -9534,3 +9534,69 @@ cmd_silence(ProfWin* window, const char* const command, gchar** args)
 
     return TRUE;
 }
+
+gboolean
+cmd_register(ProfWin* window, const char* const command, gchar** args)
+{
+    gchar* opt_keys[] = { "port", "tls", "auth", NULL };
+    gboolean parsed;
+
+    GHashTable* options = parse_options(&args[2], opt_keys, &parsed);
+    if (!parsed) {
+        cons_bad_cmd_usage(command);
+        cons_show("");
+        options_destroy(options);
+        return TRUE;
+    }
+
+    char* tls_policy = g_hash_table_lookup(options, "tls");
+    if (tls_policy && (g_strcmp0(tls_policy, "force") != 0) && (g_strcmp0(tls_policy, "allow") != 0) && (g_strcmp0(tls_policy, "trust") != 0) && (g_strcmp0(tls_policy, "disable") != 0) && (g_strcmp0(tls_policy, "legacy") != 0)) {
+        cons_bad_cmd_usage(command);
+        cons_show("");
+        options_destroy(options);
+        return TRUE;
+    }
+
+    int port = 0;
+    if (g_hash_table_contains(options, "port")) {
+        char* port_str = g_hash_table_lookup(options, "port");
+        char* err_msg = NULL;
+        gboolean res = strtoi_range(port_str, &port, 1, 65535, &err_msg);
+        if (!res) {
+            cons_show(err_msg);
+            cons_show("");
+            free(err_msg);
+            port = 0;
+            options_destroy(options);
+            return TRUE;
+        }
+    }
+
+    char* username = args[0];
+    char* server = args[1];
+
+    char* passwd = ui_ask_password(false);
+    char* confirm_passwd = ui_ask_password(true);
+
+    if (g_strcmp0(passwd, confirm_passwd) == 0) {
+        log_info("Attempting to register account %s on server %s.", username, server);
+        connection_register(server, port, tls_policy, username, passwd);
+    } else {
+        cons_show("The two passwords do not match.");
+    }
+
+    if (connection_get_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;
+    }
+
+    free(passwd);
+    free(confirm_passwd);
+
+    options_destroy(options);
+
+    log_info("we are leaving the registration process");
+    return TRUE;
+}
+

src/command/cmd_funcs.h

@@ -247,5 +247,7 @@ gboolean cmd_executable_editor(ProfWin* window, const char* const command, gchar
 gboolean cmd_mam(ProfWin* window, const char* const command, gchar** args);
 gboolean cmd_editor(ProfWin* window, const char* const command, gchar** args);
 gboolean cmd_silence(ProfWin* window, const char* const command, gchar** args);
+gboolean cmd_register(ProfWin* window, const char* const command, gchar** args);
 
 #endif
+