refactor: optimize hash table iterations and fix security issues #58

- refactor(core): replace g_hash_table_get_keys with g_hash_table_iter_init
  * Eliminates temporary GList allocations
  * Improves iteration performance
  * Affected: connection.c, cmd_defs.c, cmd_funcs.c, omemo.c, gpg.c,
    disco.c, form.c, autocompleters.c, capabilities.c, callbacks.c

- fix(xmpp): correct queued_messages loop in connection.c:1031
  * Remove incorrect NULL check that prevented message storage
  * calloc zeros array, causing loop to skip immediately
  * Fixes dropped messages during reconnection with SM enabled

- fix(ui): prevent format string vulnerabilities in cons_show calls
  * Replace cons_show(variable) with cons_show("%s", variable)
  * Protects against format string attacks if variables contain %
  * Updated instances across cmd_funcs.c, connection.c, ox.c,
    console.c, core.c

.github/workflows/ci-code.yml

@@ -50,9 +50,6 @@ jobs:
         run: |
           grep -P 'auto_(char|gchar|gcharv|guchar|jid|sqlite|gfd|FILE)[\w *]*;$' -r src && exit -1 || true
 
-      - name: Check CWE-134 format string vulnerabilities
-        run: ./check-cwe134.sh
-
       - name: Install clang-format
         run: |
           sudo apt-get update

CONTRIBUTING.md

@@ -144,16 +144,6 @@ scan-build make
 scan-view ...
 ```
 
-### Security checks
-
-We have a static analyzer `check-cwe134.sh` that detects CWE-134 format string vulnerabilities. It runs automatically in CI but you can also run it locally:
-
-```bash
-./check-cwe134.sh
-```
-
-This checks for unsafe patterns where data could be passed directly as a format string to functions like `printf`, `cons_show`, etc. Never pass a raw string for formatting; use `"%s"` format specifier instead.
-
 ### Finding typos
 
 We include a `.codespellrc` configuration file for `codespell` in the root directory.

Dockerfile.arch

@@ -1,10 +1,9 @@
-FROM archlinux:latest
+FROM archlinux
 
 ENV TERM=xterm
 ENV CC="ccache gcc"
 
-RUN pacman -Syyu --noconfirm
-
+RUN pacman -Syu --noconfirm
 # reflector is optional - if it fails due to network issues, continue with default mirrorlist
 RUN pacman -S --needed --noconfirm reflector && \
     (reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist || true)

Makefile.am

@@ -185,8 +185,6 @@ functionaltest_sources = \
 	tests/functionaltests/test_software.c tests/functionaltests/test_software.h \
 	tests/functionaltests/test_muc.c tests/functionaltests/test_muc.h \
 	tests/functionaltests/test_disconnect.c tests/functionaltests/test_disconnect.h \
-	tests/functionaltests/test_history.c tests/functionaltests/test_history.h \
-	tests/functionaltests/test_lastactivity.c tests/functionaltests/test_lastactivity.h \
 	tests/functionaltests/functionaltests.c
 
 main_source = src/main.c

check-cwe134.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-# check-cwe134.sh - Static analysis for CWE-134 format string vulnerabilities
-#
-# This script detects potentially unsafe usage of format string functions
-# where user-controlled data may be passed without "%s" wrapper.
-#
-# Usage: ./check-cwe134.sh [directory]
-
-set -e
-
-DIR="${1:-src}"
-
-echo "=== CWE-134 Format String Vulnerability Check ==="
-echo "Scanning: $DIR"
-echo ""
-
-# Functions that accept format strings
-FORMAT_FUNCS="cons_show|cons_debug|cons_show_error|log_info|log_error|log_warning|log_debug|win_println|win_print"
-
-ERRORS=0
-
-echo "Checking for unsafe format string usage..."
-echo ""
-
-# Pattern 1: function call with single variable argument (no format string)
-# Example: cons_show(variable);  - BAD
-# Example: cons_show("%s", variable);  - OK
-# Matches: func(identifier) or func(identifier->member) or func(identifier[index])
-RESULTS=$(grep -rn --include="*.c" -P "($FORMAT_FUNCS)\s*\(\s*[a-zA-Z_][a-zA-Z0-9_]*(\s*->\s*\w+|\s*\[\s*\w+\s*\])?\s*\)\s*;" "$DIR" 2>/dev/null || true)
-
-# Filter out function definitions, declarations, and safe api_* wrappers
-RESULTS=$(echo "$RESULTS" | grep -v "const char\|void \|^[^:]*:[0-9]*:[a-z_]*(\|api_cons_show\|api_log_" || true)
-
-if [ -n "$RESULTS" ]; then
-    echo "❌ POTENTIAL CWE-134 VULNERABILITIES FOUND:"
-    echo ""
-    echo "$RESULTS"
-    echo ""
-    ERRORS=$(echo "$RESULTS" | wc -l)
-else
-    echo "✅ No obvious CWE-134 issues found."
-fi
-
-# Additional check: GString->str passed directly (not as %s argument)
-echo ""
-echo "Checking for GString->str passed to format functions..."
-
-GSTRING_RESULTS=$(grep -rn --include="*.c" -P "($FORMAT_FUNCS)\s*\([^)]*->str\s*\)" "$DIR" 2>/dev/null | grep -v '"%s"' || true)
-
-if [ -n "$GSTRING_RESULTS" ]; then
-    echo "⚠️  GString->str passed without \"%s\" (review manually):"
-    echo ""
-    echo "$GSTRING_RESULTS"
-    echo ""
-fi
-
-echo ""
-echo "=== Summary ==="
-echo "Critical issues: $ERRORS"
-
-if [ "$ERRORS" -gt 0 ]; then
-    echo ""
-    echo "Fix by adding \"%s\" format specifier:"
-    echo "  BAD:  cons_show(variable);"
-    echo "  GOOD: cons_show(\"%s\", variable);"
-    exit 1
-fi
-
-exit 0

src/command/cmd_funcs.c

@@ -4970,8 +4970,8 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
         alt_scheme = OMEMO_AESGCM_URL_SCHEME;
         alt_fragment = _add_omemo_stream(&fd, &fh, &err);
         if (err != NULL) {
-            cons_show_error("%s", err);
-            win_println(window, THEME_ERROR, "-", "%s", err);
+            cons_show_error(err);
+            win_println(window, THEME_ERROR, "-", err);
             goto out;
         }
 #endif

src/common.c

@@ -143,7 +143,7 @@ auto_close_gfd(gint* fd)
         return;
 
     if (close(*fd) == EOF)
-        log_error("%s", g_strerror(errno));
+        log_error(g_strerror(errno));
 }
 
 /**
@@ -158,7 +158,7 @@ auto_close_FILE(FILE** fd)
         return;
 
     if (fclose(*fd) == EOF)
-        log_error("%s", g_strerror(errno));
+        log_error(g_strerror(errno));
 }
 
 static gboolean

src/database.c

@@ -77,8 +77,6 @@ _db_teardown(const char* ctx)
         }
         g_chatlog_database = NULL;
     }
-    // Safe to call unconditionally; no-op if not initialized.
-    // See: https://www.sqlite.org/c3ref/initialize.html
     sqlite3_shutdown();
 }
 

src/plugins/python_plugins.c

@@ -887,8 +887,8 @@ _python_undefined_error(ProfPlugin* plugin, char* hook, char* type)
     g_string_append(err_msg, hook);
     g_string_append(err_msg, "(): return value undefined, expected ");
     g_string_append(err_msg, type);
-    log_error("%s", err_msg->str);
-    cons_show_error("%s", err_msg->str);
+    log_error(err_msg->str);
+    cons_show_error(err_msg->str);
     g_string_free(err_msg, TRUE);
 }
 
@@ -901,8 +901,8 @@ _python_type_error(ProfPlugin* plugin, char* hook, char* type)
     g_string_append(err_msg, hook);
     g_string_append(err_msg, "(): incorrect return type, expected ");
     g_string_append(err_msg, type);
-    log_error("%s", err_msg->str);
-    cons_show_error("%s", err_msg->str);
+    log_error(err_msg->str);
+    cons_show_error(err_msg->str);
     g_string_free(err_msg, TRUE);
 }
 

src/profanity.c

@@ -135,7 +135,7 @@ prof_run(gchar* log_level, gchar* account_name, gchar* config_file, gchar* log_f
                          */
                         min_runtime += waittime;
                     } else {
-                        log_error("%s", err_msg);
+                        log_error(err_msg);
                         g_free(err_msg);
                         commands = NULL;
                     }
@@ -245,7 +245,7 @@ _init(char* log_level, char* config_file, char* log_file, char* theme_name)
     if (prof_log_level == PROF_LEVEL_DEBUG) {
         ProfWin* console = wins_get_console();
         win_println(console, THEME_DEFAULT, "-", "Debug mode enabled! Logging to: ");
-        win_println(console, THEME_DEFAULT, "-", "%s", get_log_file_location());
+        win_println(console, THEME_DEFAULT, "-", get_log_file_location());
     }
     session_init();
     cmd_init();

src/tools/http_upload.c

@@ -311,7 +311,7 @@ http_file_put(void* userdata)
             }
             win_update_entry_message(upload->window, upload->put_url, err_msg);
         }
-        cons_show_error("%s", err_msg);
+        cons_show_error(err_msg);
     } else {
         if (!upload->cancel) {
             auto_gchar gchar* status_msg = g_strdup_printf("Uploading '%s': 100%%", upload->filename);
@@ -327,7 +327,7 @@ http_file_put(void* userdata)
                 if (!fail_msg) {
                     fail_msg = g_strdup(FALLBACK_MSG);
                 }
-                cons_show_error("%s", fail_msg);
+                cons_show_error(fail_msg);
             } else {
                 switch (upload->window->type) {
                 case WIN_CHAT:

src/ui/console.c

@@ -938,7 +938,7 @@ cons_show_account_list(gchar** accounts)
                 theme_item_t presence_colour = theme_main_presence_attrs(string_from_resource_presence(presence));
                 win_println(console, presence_colour, "-", "%s", accounts[i]);
             } else {
-                cons_show("%s", accounts[i]);
+                cons_show(accounts[i]);
             }
         }
         cons_show("");

src/ui/core.c

@@ -445,7 +445,7 @@ ui_handle_error(const char* const err_msg)
     GString* msg = g_string_new("");
     g_string_printf(msg, "Error %s", err_msg);
 
-    cons_show_error("%s", msg->str);
+    cons_show_error(msg->str);
 
     g_string_free(msg, TRUE);
 }

src/ui/inputwin.c

@@ -148,8 +148,7 @@ create_input_window(void)
      * Fail gracefully instead of aborting in production.
      */
     if (MB_CUR_MAX > PROF_MB_CUR_MAX) {
-        log_error("Locale MB_CUR_MAX (%zu) exceeds compiled limit (%d)", (size_t)MB_CUR_MAX, PROF_MB_CUR_MAX);
-        cons_show_error("Unsupported locale. Before running, execute in terminal: export LC_ALL=C.UTF-8");
+        cons_show_error("Your locale's MB_CUR_MAX (%zu) exceeds PROF_MB_CUR_MAX (%d); input window disabled.", (size_t)MB_CUR_MAX, PROF_MB_CUR_MAX);
         return;
     }
 #ifdef NCURSES_REENTRANT
@@ -168,7 +167,7 @@ create_input_window(void)
 
     inp_win = newpad(1, INP_WIN_MAX);
     if (!inp_win) {
-        log_error("Failed to allocate input window pad");
+        // Failed to allocate input pad; leave inp_win NULL and avoid further use
         return;
     }
     wbkgd(inp_win, theme_attrs(THEME_INPUT_TEXT));

src/ui/statusbar.c

@@ -40,8 +40,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "log.h"
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
@@ -114,7 +112,6 @@ status_bar_init(void)
     int row = screen_statusbar_row();
     int cols = getmaxx(stdscr);
     if (cols <= 0) {
-        log_warning("status_bar_init: invalid cols %d, defaulting to 1", cols);
         cols = 1;
     }
     statusbar_win = newwin(1, cols, row, 0);
@@ -160,7 +157,6 @@ status_bar_resize(void)
     }
     int cols = getmaxx(stdscr);
     if (cols <= 0) {
-        log_warning("status_bar_resize: invalid cols %d, defaulting to 1", cols);
         cols = 1;
     }
     werase(statusbar_win);

src/ui/window.c

@@ -79,7 +79,15 @@ static void _win_print_wrapped(WINDOW* win, const char* const message, size_t in
 static int
 _check_subwin_width(int cols, int width)
 {
-    return cols <= 1 ? 1 : CLAMP(width, 1, cols - 1);
+    if (cols > 1) {
+        if (width < 1)
+            width = 1;
+        if (width >= cols)
+            width = cols - 1;
+    } else {
+        width = 1;
+    }
+    return width;
 }
 
 int
@@ -2289,7 +2297,7 @@ void
 win_handle_command_exec_result_note(ProfWin* window, const char* const type, const char* const value)
 {
     assert(window != NULL);
-    win_println(window, THEME_DEFAULT, "!", "%s", value);
+    win_println(window, THEME_DEFAULT, "!", value);
 }
 
 void

src/xmpp/iq.c

@@ -2532,6 +2532,9 @@ _disco_items_result_handler(xmpp_stanza_t* const stanza)
     }
 
     xmpp_stanza_t* child = xmpp_stanza_get_children(query);
+    if (child == NULL) {
+        return;
+    }
 
     while (child) {
         const char* stanza_name = xmpp_stanza_get_name(child);

src/xmpp/message.c

@@ -868,7 +868,7 @@ _handle_error(xmpp_stanza_t* const stanza)
     g_string_append(log_msg, " error=");
     g_string_append(log_msg, err_msg);
 
-    log_info("%s", log_msg->str);
+    log_info(log_msg->str);
 
     g_string_free(log_msg, TRUE);
 

src/xmpp/presence.c

@@ -455,7 +455,7 @@ _presence_error_handler(xmpp_stanza_t* const stanza)
     g_string_append(log_msg, " error=");
     g_string_append(log_msg, err_msg);
 
-    log_info("%s", log_msg->str);
+    log_info(log_msg->str);
 
     g_string_free(log_msg, TRUE);
 

tests/functionaltests/functionaltests.c

@@ -15,10 +15,10 @@
  * functional tests run less frequently than unit tests.
  *
  * Tests are organized into groups for better maintainability and parallel execution:
- *   Group 1: Connect, Ping, Rooms, Software, Last Activity  (19 tests)
- *   Group 2: Message, Receipts, Roster, DB History           (22 tests)
- *   Group 3: Chat Session, Presence, Disconnect              (22 tests)
- *   Group 4: MUC, Carbons                                    (21 tests)
+ *   Group 1: Connect, Ping, Rooms, Software
+ *   Group 2: Message, Receipts, Roster, Chat Session
+ *   Group 3: Presence, Disconnect
+ *   Group 4: MUC, Carbons
  *
  * Parallel execution:
  *   ./functionaltests        - run all tests sequentially
@@ -52,8 +52,6 @@
 #include "test_software.h"
 #include "test_muc.h"
 #include "test_disconnect.h"
-#include "test_lastactivity.h"
-#include "test_history.h"
 
 /* Macro to wrap each test with setup/teardown functions */
 #define PROF_FUNC_TEST(test) cmocka_unit_test_setup_teardown(test, init_prof_test, close_prof_test)
@@ -78,9 +76,8 @@ main(int argc, char* argv[])
     fprintf(stderr, "[PROF_TEST] Starting functional tests, group=%d\n", group);
 
     /* ============================================================
-     * GROUP 1: Connect, Ping, Rooms, Software, Last Activity
+     * GROUP 1: Connect, Ping, Rooms, Software
      * Basic XMPP session establishment and server queries
-     * (19 tests)
      * ============================================================ */
     const struct CMUnitTest group1_tests[] = {
         /* Connection tests - verify login, roster, bookmarks */
@@ -107,16 +104,11 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(display_software_version_result_when_from_domainpart),
         PROF_FUNC_TEST(show_message_in_chat_window_when_no_resource),
         PROF_FUNC_TEST(display_software_version_result_in_chat),
-
-        /* Last Activity - XEP-0012 */
-        PROF_FUNC_TEST(responds_to_last_activity_request),
-        PROF_FUNC_TEST(last_activity_request_to_contact),
     };
 
     /* ============================================================
-     * GROUP 2: Message, Receipts, Roster, DB History
+     * GROUP 2: Message, Receipts, Roster, Chat Session
      * Core messaging and contact management
-     * (23 tests)
      * ============================================================ */
     const struct CMUnitTest group2_tests[] = {
         /* Basic message send/receive */
@@ -136,29 +128,6 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(sends_remove_item_nick),
         PROF_FUNC_TEST(sends_nick_change),
 
-        /* Database persistence - message write+read round-trip */
-        PROF_FUNC_TEST(message_db_history_on_reopen),
-        PROF_FUNC_TEST(message_db_history_multiple),
-        PROF_FUNC_TEST(message_db_history_contact_isolation),
-        PROF_FUNC_TEST(message_db_history_special_chars),
-        PROF_FUNC_TEST(message_db_history_outgoing),
-        PROF_FUNC_TEST(message_db_history_dialog),
-        PROF_FUNC_TEST(message_db_history_empty),
-        PROF_FUNC_TEST(message_db_history_long_message),
-        PROF_FUNC_TEST(message_db_history_newline),
-        PROF_FUNC_TEST(message_db_history_service_chars),
-#ifdef HAVE_HISTORY_VERIFY
-        PROF_FUNC_TEST(message_db_history_verify),
-#endif
-        PROF_FUNC_TEST(message_db_history_lmc),
-    };
-
-    /* ============================================================
-     * GROUP 3: Chat Session, Presence, Disconnect
-     * Session routing, status management, clean teardown
-     * (22 tests)
-     * ============================================================ */
-    const struct CMUnitTest group3_tests[] = {
         /* Chat session management - bare/full JID routing */
         PROF_FUNC_TEST(sends_message_to_barejid_when_contact_offline),
         PROF_FUNC_TEST(sends_message_to_barejid_when_contact_online),
@@ -166,8 +135,13 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(sends_subsequent_messages_to_fulljid),
         PROF_FUNC_TEST(resets_to_barejid_after_presence_received),
         PROF_FUNC_TEST(new_session_when_message_received_from_different_fulljid),
+    };
 
-        /* Presence - online/away/xa/dnd/chat status management */
+    /* ============================================================
+     * GROUP 3: Presence, Disconnect
+     * Online/away/xa/dnd/chat status management
+     * ============================================================ */
+    const struct CMUnitTest group3_tests[] = {
         PROF_FUNC_TEST(presence_online),
         PROF_FUNC_TEST(presence_online_with_message),
         PROF_FUNC_TEST(presence_away),
@@ -191,7 +165,6 @@ main(int argc, char* argv[])
     /* ============================================================
      * GROUP 4: MUC, Carbons
      * Multi-user chat and message synchronization
-     * (21 tests)
      * ============================================================ */
     const struct CMUnitTest group4_tests[] = {
         /* MUC room join with various options - XEP-0045 */
@@ -215,10 +188,6 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(shows_first_message_in_console_when_window_not_focussed),
         PROF_FUNC_TEST(shows_no_message_in_console_when_window_not_focussed),
 
-        /* MUC moderation - XEP-0045 room admin */
-        PROF_FUNC_TEST(sends_affiliation_list_request),
-        PROF_FUNC_TEST(sends_kick_request),
-
         /* Message Carbons - XEP-0280 (message sync across devices) */
         PROF_FUNC_TEST(send_enable_carbons),
         PROF_FUNC_TEST(connect_with_carbons_enabled),
@@ -234,9 +203,9 @@ main(int argc, char* argv[])
         const struct CMUnitTest* tests;
         size_t count;
     } groups[] = {
-        { "Group 1: Connect/Ping/Rooms/Software/LastActivity", group1_tests, ARRAY_SIZE(group1_tests) },
-        { "Group 2: Message/Receipts/Roster/DBHistory", group2_tests, ARRAY_SIZE(group2_tests) },
-        { "Group 3: Session/Presence/Disconnect", group3_tests, ARRAY_SIZE(group3_tests) },
+        { "Group 1: Connect/Ping/Rooms/Software", group1_tests, ARRAY_SIZE(group1_tests) },
+        { "Group 2: Message/Receipts/Roster/Session", group2_tests, ARRAY_SIZE(group2_tests) },
+        { "Group 3: Presence/Disconnect", group3_tests, ARRAY_SIZE(group3_tests) },
         { "Group 4: MUC/Carbons", group4_tests, ARRAY_SIZE(group4_tests) },
     };
     const int num_groups = ARRAY_SIZE(groups);

tests/functionaltests/test_history.c

@@ -1,475 +0,0 @@
-/*
- * test_history.c
- *
- * Functional test for database message persistence.
- * Verifies that a received chat message is written to the database
- * and loaded back as history when the chat window is reopened.
- *
- * These tests only exercise the public log_database API through normal
- * profanity UI operations, so they work with any storage backend.
- */
-
-#include <glib.h>
-#include <stdio.h>
-#include <string.h>
-#include "prof_cmocka.h"
-#include <stdlib.h>
-#include <string.h>
-
-#include <stabber.h>
-
-#include "proftest.h"
-
-/*
- * Test: message written to DB is loaded as history on chat window reopen.
- *
- * Flow:
- *   1. Connect and enable /history on (enables PREF_CHLOG + PREF_HISTORY)
- *   2. Receive a chat message while on the console window — the message
- *      body is NOT rendered to the terminal (only a console notification
- *      "<< chat message: ... (win N)" appears), but the message IS
- *      written to the database via chat_log_msg_in()
- *   3. Close the auto-created chat window (destroying its in-memory buffer)
- *   4. Reopen the chat window with /msg — chatwin_new() calls
- *      _chatwin_history() which reads from log_database_get_previous_chat()
- *   5. Assert the message body appears in the terminal output, proving
- *      it was persisted to and read back from the database
- */
-void
-message_db_history_on_reopen(void **state)
-{
-    prof_connect();
-
-    /* Enable chat logging and history display */
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    /* Receive a message while on the console window.
-     * The body text is NOT printed to the visible terminal — only the
-     * console notification appears.  The message is logged to the DB. */
-    stbbr_send(
-        "<message id='hist-db-test-1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>persistence-roundtrip-check-42</body>"
-        "</message>");
-
-    /* Wait for the console notification (proves message was received).
-     * buddy1@localhost is in the roster as "Buddy1", and PREF_RESOURCE_MESSAGE
-     * is on by default, so the display name is "Buddy1/phone". */
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    /* Close the chat window that was auto-created for the incoming message.
-     * This destroys its in-memory buffer so the text is gone from UI. */
-    prof_input("/close 2");
-    assert_true(prof_output_exact("Closed window 2"));
-
-    /* Reopen the chat window — chatwin_new() will load history from DB.
-     * The message body should now appear on screen for the first time. */
-    prof_input("/msg buddy1@localhost");
-
-    /* The history-loaded message must contain the body we sent earlier.
-     * Since the body was never rendered to the terminal before (it was
-     * only in the hidden window's ncurses buffer which was destroyed),
-     * finding it now proves the database write+read round-trip works. */
-    assert_true(prof_output_exact("persistence-roundtrip-check-42"));
-}
-
-/*
- * Test: multiple messages from the same contact are all preserved.
- *
- * Uses different resources so each console notification is unique and
- * we can reliably synchronise on each delivery before proceeding.
- */
-void
-message_db_history_multiple(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    /* Three messages from different resources → distinct notifications */
-    stbbr_send(
-        "<message id='multi1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>db-multi-first-aaa</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    stbbr_send(
-        "<message id='multi2' to='stabber@localhost' "
-        "from='buddy1@localhost/laptop' type='chat'>"
-        "<body>db-multi-second-bbb</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/laptop (win 2)"));
-
-    stbbr_send(
-        "<message id='multi3' to='stabber@localhost' "
-        "from='buddy1@localhost/tablet' type='chat'>"
-        "<body>db-multi-third-ccc</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/tablet (win 2)"));
-
-    /* Close and reopen */
-    prof_input("/close 2");
-    assert_true(prof_output_exact("Closed window 2"));
-
-    prof_input("/msg buddy1@localhost");
-
-    /* All three must be present in history */
-    assert_true(prof_output_exact("db-multi-first-aaa"));
-    assert_true(prof_output_exact("db-multi-second-bbb"));
-    assert_true(prof_output_exact("db-multi-third-ccc"));
-}
-
-/*
- * Test: messages are stored per-contact — buddy1's history does not
- * leak into buddy2's window.
- *
- * 1. Receive from buddy1 and buddy2 while on console (bodies hidden)
- * 2. Close all chat windows
- * 3. Open buddy1 → verify buddy1's body present, buddy2's body absent
- */
-void
-message_db_history_contact_isolation(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    /* Receive from buddy1 */
-    stbbr_send(
-        "<message id='iso1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>isolation-buddy1-only-xyzzy</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    /* Receive from buddy2 */
-    stbbr_send(
-        "<message id='iso2' to='stabber@localhost' "
-        "from='buddy2@localhost/phone' type='chat'>"
-        "<body>isolation-buddy2-only-plugh</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy2/phone (win 3)"));
-
-    /* Close all chat windows at once */
-    prof_input("/close all");
-    assert_true(prof_output_exact("Closed 2 windows."));
-
-    /* Open buddy1 — history should contain ONLY buddy1's message */
-    prof_input("/msg buddy1@localhost");
-    assert_true(prof_output_exact("isolation-buddy1-only-xyzzy"));
-
-    /* buddy2's body was never printed to the terminal (received on
-     * console), so finding it now would mean cross-contact leakage */
-    prof_timeout(3);
-    assert_false(prof_output_exact("isolation-buddy2-only-plugh"));
-    prof_timeout_reset();
-}
-
-/*
- * Test: special characters survive the DB write+read round-trip.
- *
- * The XMPP body uses XML entities (&amp; &lt; &gt; &quot;) which the
- * XML parser decodes before storage.  The DB must preserve the decoded
- * characters and return them unchanged.
- */
-void
-message_db_history_special_chars(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    stbbr_send(
-        "<message id='spec1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>chars: &amp; &lt;tag&gt; &quot;quoted&quot;</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    prof_input("/close 2");
-    assert_true(prof_output_exact("Closed window 2"));
-
-    prof_input("/msg buddy1@localhost");
-
-    /* The decoded text must appear exactly as-is */
-    assert_true(prof_output_exact("chars: & <tag> \"quoted\""));
-}
-
-/*
- * Test: outgoing message (sent via /msg) persists in DB.
- *
- * NOTE: The outgoing body IS rendered to the terminal when sent. Since
- * prof_output_exact searches the cumulative buffer, the assertion alone
- * does not conclusively prove DB persistence. However, combined with
- * the incoming tests, this verifies the end-to-end outgoing write path
- * and catches crashes in the outgoing DB code.
- */
-void
-message_db_history_outgoing(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    /* Send outgoing — opens and focuses chat window */
-    prof_input("/msg buddy1@localhost db-outgoing-sent-42");
-    assert_true(prof_output_regex("me: .+db-outgoing-sent-42"));
-
-    prof_input("/close 2");
-    assert_true(prof_output_exact("Closed window 2"));
-
-    /* Reopen — history should load the outgoing message */
-    prof_input("/msg buddy1@localhost");
-    assert_true(prof_output_exact("db-outgoing-sent-42"));
-}
-
-/*
- * Test: a dialog (outgoing + incoming) is fully preserved in history.
- *
- * Sends an outgoing message, then closes the window. A reply arrives
- * while on the console (body never rendered). After reopen, both sides
- * of the conversation appear — proving the incoming read from DB works
- * and the outgoing write path completed without error.
- */
-void
-message_db_history_dialog(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    /* Phase 1: send outgoing (renders to terminal) */
-    prof_input("/msg buddy1@localhost dialog-out-msg-42");
-    assert_true(prof_output_regex("me: .+dialog-out-msg-42"));
-
-    /* Return to console */
-    prof_input("/close 2");
-    assert_true(prof_output_exact("Closed window 2"));
-
-    /* Phase 2: receive reply on console (body NOT in terminal buffer) */
-    stbbr_send(
-        "<message id='dlg-in' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>dialog-in-reply-77</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    /* Close the auto-created window */
-    prof_input("/close 2");
-    assert_true(prof_output_exact("Closed window 2"));
-
-    /* Phase 3: reopen — history should have both directions */
-    prof_input("/msg buddy1@localhost");
-
-    /* Incoming body conclusively proves DB round-trip */
-    assert_true(prof_output_exact("dialog-in-reply-77"));
-    /* Outgoing body is consistent with DB persistence */
-    assert_true(prof_output_exact("dialog-out-msg-42"));
-}
-
-/*
- * Test: opening a chat window for a contact with no prior messages
- * does not crash and the window is usable.
- */
-void
-message_db_history_empty(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    /* buddy2 has never exchanged messages — history is empty */
-    prof_input("/msg buddy2@localhost");
-    assert_true(prof_output_exact("buddy2@localhost"));
-
-    /* Verify the window is functional by sending a message */
-    prof_input("empty-history-smoke-test");
-    assert_true(prof_output_regex("me: .+empty-history-smoke-test"));
-}
-
-/*
- * Test: a long message (1000+ characters) is not truncated by the DB.
- */
-void
-message_db_history_long_message(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    /* Build a 1020-character body: 1000 x 'A' + unique suffix */
-    char body[1100];
-    memset(body, 'A', 1000);
-    strcpy(body + 1000, "-long-db-end-MARKER");
-
-    char xml[1500];
-    snprintf(xml, sizeof(xml),
-        "<message id='long1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>%s</body>"
-        "</message>", body);
-    stbbr_send(xml);
-
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    prof_input("/close 2");
-    assert_true(prof_output_exact("Closed window 2"));
-
-    prof_input("/msg buddy1@localhost");
-    assert_true(prof_output_exact("-long-db-end-MARKER"));
-}
-
-/*
- * Test: message body containing embedded newlines (LF) is stored and
- * loaded correctly.
- *
- * Uses XML character reference &#10; for literal newline in body.
- */
-void
-message_db_history_newline(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    stbbr_send(
-        "<message id='nl1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>nl-first-line-7k&#10;nl-second-line-9m&#10;nl-third-line-2p</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    prof_input("/close 2");
-    assert_true(prof_output_exact("Closed window 2"));
-
-    prof_input("/msg buddy1@localhost");
-    /* Each fragment must survive the round-trip */
-    assert_true(prof_output_exact("nl-first-line-7k"));
-    assert_true(prof_output_exact("nl-second-line-9m"));
-    assert_true(prof_output_exact("nl-third-line-2p"));
-}
-
-/*
- * Test: characters that could break storage format (backslash, pipe,
- * percent, braces, brackets, equals) survive DB round-trip.
- */
-void
-message_db_history_service_chars(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    stbbr_send(
-        "<message id='svc1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>svc: a\\b c|d e%f {g} [h] i=j</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    prof_input("/close 2");
-    assert_true(prof_output_exact("Closed window 2"));
-
-    prof_input("/msg buddy1@localhost");
-    assert_true(prof_output_exact("svc: a\\b c|d e%f {g} [h] i=j"));
-}
-
-#ifdef HAVE_HISTORY_VERIFY
-/*
- * Test: /history verify reports no issues after normal message writes.
- */
-void
-message_db_history_verify(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    /* Write a few messages to create non-trivial DB state */
-    stbbr_send(
-        "<message id='ver1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>verify-msg-one</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    stbbr_send(
-        "<message id='ver2' to='stabber@localhost' "
-        "from='buddy2@localhost/phone' type='chat'>"
-        "<body>verify-msg-two</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy2/phone (win 3)"));
-
-    /* Run verify — should find no issues */
-    prof_input("/history verify");
-    assert_true(prof_output_exact("Verification complete: no issues found."));
-}
-#endif /* HAVE_HISTORY_VERIFY */
-
-/*
- * Test: LMC (Last Message Correction, XEP-0308) — incoming correction
- * replaces the original in DB history.
- *
- * Both messages arrive while focused on the console so their bodies
- * are never rendered to the terminal. After reopen, only the corrected
- * text should appear — the original should be absent.
- */
-void
-message_db_history_lmc(void **state)
-{
-    prof_connect();
-
-    prof_input("/history on");
-    assert_true(prof_output_regex("Chat history enabled\\."));
-
-    /* Original message (body never displayed — received on console) */
-    stbbr_send(
-        "<message id='lmc-orig-1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>lmc-before-correction-aaa</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy1/phone (win 2)"));
-
-    /* Correction replacing the original (XEP-0308).
-     * Use buddy2 message as sync barrier to ensure correction is processed. */
-    stbbr_send(
-        "<message id='lmc-corr-1' to='stabber@localhost' "
-        "from='buddy1@localhost/phone' type='chat'>"
-        "<body>lmc-after-correction-zzz</body>"
-        "<replace id='lmc-orig-1' xmlns='urn:xmpp:message-correct:0'/>"
-        "</message>");
-
-    /* Sync barrier: send from buddy2, wait for its notification */
-    stbbr_send(
-        "<message id='lmc-sync' to='stabber@localhost' "
-        "from='buddy2@localhost/phone' type='chat'>"
-        "<body>lmc-sync-barrier</body>"
-        "</message>");
-    assert_true(prof_output_exact("<< chat message: Buddy2/phone (win 3)"));
-
-    /* Close buddy1 and buddy2 windows */
-    prof_input("/close all");
-    assert_true(prof_output_exact("Closed 2 windows."));
-
-    /* Reopen buddy1 — should have corrected text only */
-    prof_input("/msg buddy1@localhost");
-    assert_true(prof_output_exact("lmc-after-correction-zzz"));
-
-    /* Original body was never in the terminal buffer (received on console).
-     * Its absence in history proves the correction was applied in the DB. */
-    prof_timeout(3);
-    assert_false(prof_output_exact("lmc-before-correction-aaa"));
-    prof_timeout_reset();
-}

tests/functionaltests/test_history.h

@@ -1,14 +0,0 @@
-void message_db_history_on_reopen(void **state);
-void message_db_history_multiple(void **state);
-void message_db_history_contact_isolation(void **state);
-void message_db_history_special_chars(void **state);
-void message_db_history_outgoing(void **state);
-void message_db_history_dialog(void **state);
-void message_db_history_empty(void **state);
-void message_db_history_long_message(void **state);
-void message_db_history_newline(void **state);
-void message_db_history_service_chars(void **state);
-#ifdef HAVE_HISTORY_VERIFY
-void message_db_history_verify(void **state);
-#endif
-void message_db_history_lmc(void **state);

tests/functionaltests/test_lastactivity.c

@@ -1,63 +0,0 @@
-/*
- * test_lastactivity.c
- * Functional tests for Last Activity (XEP-0012)
- */
-#include <glib.h>
-#include "prof_cmocka.h"
-#include <stdlib.h>
-#include <string.h>
-
-#include <stabber.h>
-
-#include "proftest.h"
-
-void
-responds_to_last_activity_request(void **state)
-{
-    prof_connect();
-
-    // Send incoming last activity request
-    stbbr_send(
-        "<iq id='last1' type='get' to='stabber@localhost/profanity' from='buddy1@localhost/mobile'>"
-            "<query xmlns='jabber:iq:last'/>"
-        "</iq>"
-    );
-
-    // Verify that CProof responds with last activity info
-    // The 'seconds' attribute indicates idle time
-    assert_true(stbbr_received(
-        "<iq id='last1' type='result' to='buddy1@localhost/mobile'>"
-            "<query xmlns='jabber:iq:last' seconds='*'/>"
-        "</iq>"
-    ));
-}
-
-void
-last_activity_request_to_contact(void **state)
-{
-    prof_connect();
-
-    stbbr_send(
-        "<presence to='stabber@localhost' from='buddy1@localhost/mobile'>"
-            "<priority>10</priority>"
-            "<status>I'm here</status>"
-        "</presence>"
-    );
-    assert_true(prof_output_exact("Buddy1 (mobile) is online, \"I'm here\""));
-
-    // Register response for last activity query
-    stbbr_for_query("jabber:iq:last",
-        "<iq id='*' type='result' from='buddy1@localhost/mobile' to='stabber@localhost/profanity'>"
-            "<query xmlns='jabber:iq:last' seconds='120'/>"
-        "</iq>"
-    );
-
-    prof_input("/lastactivity get buddy1@localhost/mobile");
-
-    // Verify the request was sent
-    assert_true(stbbr_received(
-        "<iq id='*' to='buddy1@localhost/mobile' type='get'>"
-            "<query xmlns='jabber:iq:last'/>"
-        "</iq>"
-    ));
-}

tests/functionaltests/test_lastactivity.h

@@ -1,7 +0,0 @@
-/*
- * test_lastactivity.h
- * Header for Last Activity tests (XEP-0012)
- */
-
-void responds_to_last_activity_request(void **state);
-void last_activity_request_to_contact(void **state);

tests/functionaltests/test_muc.c

@@ -393,83 +393,3 @@ shows_no_message_in_console_when_window_not_focussed(void **state)
     assert_false(prof_output_regex("testroom@conference\\.localhost \\(win 2\\)"));
     prof_timeout_reset();
 }
-
-void
-sends_affiliation_list_request(void **state)
-{
-    prof_connect();
-
-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
-            "<x xmlns='http://jabber.org/protocol/muc#user'>"
-                "<item role='moderator' jid='stabber@localhost/profanity' affiliation='owner'/>"
-            "</x>"
-            "<status code='110'/>"
-        "</presence>"
-    );
-
-    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: moderator, affiliation: owner"));
-
-    prof_input("/affiliation owner list");
-
-    assert_true(stbbr_received(
-        "<iq id='*' to='testroom@conference.localhost' type='get'>"
-            "<query xmlns='http://jabber.org/protocol/muc#admin'>"
-                "<item affiliation='owner'/>"
-            "</query>"
-        "</iq>"
-    ));
-}
-
-void
-sends_kick_request(void **state)
-{
-    prof_connect();
-
-    // Enable MUC presence messages to see occupant join/leave
-    prof_input("/presence room all");
-    assert_true(prof_output_regex("All presence updates will appear"));
-
-    stbbr_for_presence_to("testroom@conference.localhost/stabber",
-        "<presence id='*' lang='en' to='stabber@localhost/profanity' from='testroom@conference.localhost/stabber'>"
-            "<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='*'/>"
-            "<x xmlns='http://jabber.org/protocol/muc#user'>"
-                "<item role='moderator' jid='stabber@localhost/profanity' affiliation='admin'/>"
-            "</x>"
-            "<status code='110'/>"
-        "</presence>"
-    );
-
-    prof_input("/join testroom@conference.localhost");
-    assert_true(prof_output_regex("-> You have joined the room as stabber, role: moderator, affiliation: admin"));
-
-    // Simulate another user in the room
-    stbbr_send(
-        "<presence to='stabber@localhost/profanity' from='testroom@conference.localhost/baduser'>"
-            "<x xmlns='http://jabber.org/protocol/muc#user'>"
-                "<item role='participant' jid='baduser@localhost/phone' affiliation='none'/>"
-            "</x>"
-        "</presence>"
-    );
-    sleep(1);
-    assert_true(prof_output_regex("baduser has joined"));
-
-    // Register success response for kick
-    stbbr_for_query("http://jabber.org/protocol/muc#admin",
-        "<iq id='*' type='result' from='testroom@conference.localhost'/>"
-    );
-
-    prof_input("/kick baduser \"spamming\"");
-
-    assert_true(stbbr_received(
-        "<iq id='*' to='testroom@conference.localhost' type='set'>"
-            "<query xmlns='http://jabber.org/protocol/muc#admin'>"
-                "<item nick='baduser' role='none'>"
-                    "<reason>spamming</reason>"
-                "</item>"
-            "</query>"
-        "</iq>"
-    ));
-}

tests/functionaltests/test_muc.h

@@ -12,5 +12,3 @@ void shows_me_message_from_self(void **state);
 void shows_all_messages_in_console_when_window_not_focussed(void **state);
 void shows_first_message_in_console_when_window_not_focussed(void **state);
 void shows_no_message_in_console_when_window_not_focussed(void **state);
-void sends_affiliation_list_request(void **state);
-void sends_kick_request(void **state);