mod_auth_mysql: Fix database table regression.

Commit ab56e96
moved DB_NAME_ARGS from mod_mysql.h to mod_auth_mysql,
but replaced an argument with the hostname instead of
the database hostname, causing database connections to fail.

Fix this, and also add a test for user registration
and authentication using MySQL, which would have caught this.

Author: InterLinked1

modules/mod_auth_mysql.c

@@ -51,7 +51,8 @@ static char *dbusername = buf_dbusername;
 static char *dbpassword = buf_dbpassword;
 static char *dbname = buf_dbname;
 
-#define DB_NAME_ARGS dbhostname, !strlen_zero(dbhostname) ? "." : ""
+/* database.table if database defined, just table otherwise */
+#define DB_NAME_ARGS dbname, !strlen_zero(dbname) ? "." : ""
 
 static int register_phone = 1, register_address = 1, register_zip = 1, register_dob = 1, register_gender = 1, register_howheard = 1;
 static int verifyregisteremail = 0;
@@ -372,7 +373,7 @@ static int user_register(struct bbs_node *node)
 			NONZERO_RETURN(res);
 
 			if (!bbs_str_isprint(fullname)) {
-				NEG_RETURN(bbs_node_writef(node, "\n%sUsername contains disallowed characters%s\n", COLOR(TERM_COLOR_RED), COLOR_RESET));
+				NEG_RETURN(bbs_node_writef(node, "\n%sName contains disallowed characters%s\n", COLOR(TERM_COLOR_RED), COLOR_RESET));
 			} else {
 				break;
 			}

tests/configs/mod_auth_mysql.conf

@@ -0,0 +1,14 @@
+[db]
+hostname=localhost
+username=bbs
+password=P@ssw0rdUShouldChAngE!
+database=bbs
+
+[registration]
+phone=no
+address=no
+zip=no
+dob=no
+gender=no
+howheard=no
+verifyemail=no

tests/test.c

@@ -415,6 +415,7 @@ static const char *bbs_expect_str = NULL;
 /* used extern */
 int test_autorun = 1;
 int rand_alloc_fails = 0;
+int use_static_auth = 1;
 
 static int soft_assertions_failed = 0;
 
@@ -1070,6 +1071,7 @@ static int run_test(const char *filename, int multiple)
 			goto cleanup;
 		}
 		option_autoload_all = option_use_mysql = rand_alloc_fails = 0;
+		use_static_auth = 1;
 		test_autorun = 1;
 		startup_run_unit_tests = 0;
 		if (testmod->pre) {
@@ -1082,7 +1084,9 @@ static int run_test(const char *filename, int multiple)
 				goto cleanup;
 			}
 			fprintf(modulefp, "[general]\r\nautoload=no\r\n\r\n[modules]\r\n");
-			test_load_module("mod_auth_static.so"); /* Always load this module */
+			if (use_static_auth) {
+				test_load_module("mod_auth_static.so"); /* Always load this module, unless told not to */
+			}
 			res = testmod->pre();
 			if (res) {
 				goto cleanup;
@@ -1107,13 +1111,15 @@ static int run_test(const char *filename, int multiple)
 				fprintf(modulefp, "[nodes]\r\naskdimensions=no\r\n"); /* Only needed for test_menus */
 				fclose(modulefp);
 			}
-			modulefp = fopen(TEST_CONFIG_DIR "/mod_auth_static.conf", "w");
-			if (modulefp) {
-				fprintf(modulefp, "[users]\r\n%s=%s\r\n", TEST_USER, TEST_HASH);
-				fprintf(modulefp, "%s=%s\r\n", TEST_USER2, TEST_HASH2);
-				fprintf(modulefp, "%s=%s\r\n", TEST_USER3, TEST_HASH3);
-				fprintf(modulefp, "%s=%s\r\n", TEST_USER4, TEST_HASH4);
-				fclose(modulefp);
+			if (use_static_auth) {
+				modulefp = fopen(TEST_CONFIG_DIR "/mod_auth_static.conf", "w");
+				if (modulefp) {
+					fprintf(modulefp, "[users]\r\n%s=%s\r\n", TEST_USER, TEST_HASH);
+					fprintf(modulefp, "%s=%s\r\n", TEST_USER2, TEST_HASH2);
+					fprintf(modulefp, "%s=%s\r\n", TEST_USER3, TEST_HASH3);
+					fprintf(modulefp, "%s=%s\r\n", TEST_USER4, TEST_HASH4);
+					fclose(modulefp);
+				}
 			}
 			if (option_autoload_all) {
 				if (system("cp " TEST_CONFIGS_SRC_DIR "/*.conf " TEST_CONFIG_DIR)) {

tests/test_auth_mysql.c

@@ -0,0 +1,131 @@
+/*
+ * LBBS -- The Lightweight Bulletin Board System
+ *
+ * Copyright (C) 2025, Naveen Albert
+ *
+ * Naveen Albert <bbs@phreaknet.org>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief MySQL User Registration/Authentication Tests
+ *
+ * \author Naveen Albert <bbs@phreaknet.org>
+ */
+
+#include "test.h"
+#include "ansi.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+extern int use_static_auth;
+
+static int pre(void)
+{
+	test_preload_module("mod_mysql.so");
+	test_load_module("mod_auth_mysql.so");
+	test_load_module("mod_menu_handlers.so");
+	test_load_module("mod_node_callbacks.so");
+	test_load_module("net_telnet.so");
+
+	test_use_mysql(); /* Run the database for this test */
+	use_static_auth = 0; /* Use database for authentication, don't load mod_auth_static */
+
+	/* no net_telnet.conf needed, defaults are sufficient */
+	TEST_ADD_CONFIG("menus.conf");
+	TEST_ADD_CONFIG("mod_mysql.conf");
+	TEST_ADD_CONFIG("mod_auth_mysql.conf");
+	return 0;
+}
+
+static int run(void)
+{
+	int clientfd;
+	int res = -1;
+
+	clientfd = test_make_socket(23);
+	REQUIRE_FD(clientfd);
+
+	if (test_ansi_handshake(clientfd)) {
+		goto cleanup;
+	}
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "Hit a key");
+	SWRITE(clientfd, " "); /* Hit a key */
+
+#define CRLF "\r\n"
+
+	/* New User */
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "Login:");
+	SWRITE(clientfd, "New");
+	SWRITE(clientfd, CRLF); /* CR NUL -> CR logic in pty.c only handles if the sequence is by itself */
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "full real name");
+	SWRITE(clientfd, "John Smith");
+	SWRITE(clientfd, CRLF);
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "username");
+	SWRITE(clientfd, TEST_USER);
+	SWRITE(clientfd, CRLF);
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "Password");
+	SWRITE(clientfd, TEST_PASS);
+	SWRITE(clientfd, CRLF);
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "Confirm Password");
+	SWRITE(clientfd, TEST_PASS);
+	SWRITE(clientfd, CRLF);
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "Network mail address");
+	SWRITE(clientfd, TEST_EMAIL);
+	SWRITE(clientfd, CRLF);
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "City");
+	SWRITE(clientfd, "Anytown");
+	SWRITE(clientfd, CRLF);
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "State");
+	SWRITE(clientfd, "NY");
+	SWRITE(clientfd, CRLF);
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "information correct?");
+	SWRITE(clientfd, "y");
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "Registration successful");
+	SWRITE(clientfd, " ");
+
+	/* Now, log in fresh */
+	close(clientfd);
+	clientfd = test_make_socket(23);
+	REQUIRE_FD(clientfd);
+
+	if (test_ansi_handshake(clientfd)) {
+		goto cleanup;
+	}
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "Hit a key");
+	SWRITE(clientfd, " "); /* Hit a key */
+
+	/* Must always use CLIENT_EXPECT_EVENTUALLY since our input is also echoed back to us */
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "Login");
+	SWRITE(clientfd, TEST_USER "\n");
+
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "Password");
+	SWRITE(clientfd, TEST_PASS "\n");
+	CLIENT_EXPECT_EVENTUALLY(clientfd, "at welcome menu via T");
+
+	res = 0;
+
+cleanup:
+	close_if(clientfd);
+	return res;
+}
+
+TEST_MODULE_INFO_STANDARD("MySQL User Authentication Tests");