mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-19 18:26:22 +00:00
Sync with upstream profanity-im/profanity.
Major upstream changes incorporated:
Memory management
- Replace malloc+memset with g_new0 throughout codebase
- Adopt auto_gchar / auto_gcharv / auto_gerror / auto_jid cleanup macros
- Replace free() with g_free() for GAlloc'd memory
Editor rewrite
- Remove pthread-based async editor; use GChildWatch callback API
- New launch_editor(initial_content, callback, user_data) interface
- Proper signal handling (SIGINT, SIGTSTP, SIGPIPE reset in child)
- ui_suspend()/ui_resume() integration for TTY management
OMEMO improvements
- Dual backend support: libsignal-protocol-c and libomemo-c
- Proper pre-key removal after use (XEP-0384 compliance)
- Automatic pre-key regeneration when store drops below threshold
- New functions: omemo_is_device_active(), omemo_is_jid_trusted()
- omemo_get_jid_untrusted_fingerprints() for better error messages
- Fingerprint notifications on new device identity discovery
- Deterministic pre-key ID generation tracking max_pre_key_id
- omemo_trust_changed() UI updates on trust state changes
JID validation
- RFC 6122-compliant validation in jid_is_valid()
- Character-level checks (RFC 6122 forbidden chars: & ' / : < > @)
- Length limits: 1023 per component, 3071 total
- New jid_is_valid_user_jid() for user vs. service JID distinction
Database
- Schema migration v3: UNIQUE constraint on archive_id for deduplication
- Triggers for corrected message tracking (replaces_db_id / replaced_by_db_id)
- db_history_result_t return type, _truncate_datetime_suffix()
UI / console
- win_warn_needed() / win_warn_sent() warning deduplication hash table
- PAD_MIN_HEIGHT dynamic pad sizing with PAD_THRESHOLD auto-cleanup
- Spellcheck integration in input field with Unicode word detection
- cons_spellcheck_setting() for /settings ui output
- /[command]? shortcut for command help
Account config
- Account name sanitization for GKeyFile special chars ([ ] = # \n \r)
- Replace popen() with g_spawn_sync() for eval_password
- TLS policy: add "direct" option alongside legacy
Connection
- Port validation with g_assert (0–65535)
- SHA-256 certificate fingerprint support (XMPP_CERT_PUBKEY_FINGERPRINT_SHA256)
- "direct" TLS policy alias for legacy SSL
Common utilities
- str_xml_sanitize() for XML 1.0 illegal character removal
- string_matches_one_of() with formatted error messages
- valid_tls_policy_option() helper
- prof_date_time_format_iso8601() utility
- Improved strip_arg_quotes() with backslash unescaping
- prof_occurrences() uses g_slist_prepend + reverse for performance
PGP / OX
- Proper GPGME resource cleanup with goto-cleanup pattern
- g_string_free(xmppuri) leak fix in _ox_key_lookup
CSV export
- Use GString + g_file_set_contents instead of raw write() syscalls
Tests
- Restructured into subdirectories: command/, config/, xmpp/, ui/, omemo/, otr/, pgp/
- New test_cmd_ac.c for autocompleter unit tests
- Updated stubs for new UI suspend/resume functions
License headers
- Migrate to SPDX-3.0 identifiers (GPL-3.0-or-later WITH OpenSSL-exception)
────────────────────────────────────────────────────
cproof-specific preservations:
- XEP-0308 LMC: replace_id ?: id logic in message/stanza/omemo
- Force encryption: cmd_force_encryption, test_forced_encryption
- CWE-134: format string protection (cons_show("%s", ...))
- y_start_pos-based paging in window.c
- db_history_result_t return type, _truncate_datetime_suffix()
Merge-time fixes:
- common.c: format-security (-Werror) — cons_show(errmsg) → cons_show("%s", errmsg)
- database.c: null-deref guard — !msg->timestamp → msg && !msg->timestamp
- console.c: implicit size_t → int cast — (int)(maxlen + 1)
- tlscerts.c: %d for size_t — %zu
Build system:
- Kept autotools (Makefile.am, configure.ac); upstream uses Meson
- Restored deleted files: bootstrap.sh, autogen.sh, ax_valgrind_check.m4, configure-debug
- Updated Makefile.am test paths for subdirectory structure
- Added test_cmd_ac, test_forced_encryption to test sources
Functional tests:
- Use cproof version; upstream requires stbbr_for_xmlns from updated stabber
- Not yet available in devs/stabber fork
Closes #64
Merge author: jabber.developer2
Commits authors:
Michael Vetter <jubalh@iodoru.org>
& Steffen Jaeckel <s@jaeckel.eu>
488 lines
13 KiB
C
488 lines
13 KiB
C
#include "prof_cmocka.h"
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <glib.h>
|
|
|
|
#include "config.h"
|
|
|
|
#ifdef HAVE_LIBOTR
|
|
#include <libotr/proto.h>
|
|
#include "otr/otr.h"
|
|
#endif
|
|
|
|
#include "config/preferences.h"
|
|
|
|
#include "command/cmd_defs.h"
|
|
#include "command/cmd_funcs.h"
|
|
#include "ui/window_list.h"
|
|
#include "xmpp/xmpp.h"
|
|
|
|
#include "ui/ui.h"
|
|
#include "ui/stub_ui.h"
|
|
|
|
#define CMD_OTR "/otr"
|
|
|
|
#ifdef HAVE_LIBOTR
|
|
void
|
|
cmd_otr_log__shows__usage_when_no_args(void** state)
|
|
{
|
|
gchar* args[] = { "log", NULL };
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_OTR);
|
|
|
|
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_log__shows__usage_when_invalid_subcommand(void** state)
|
|
{
|
|
gchar* args[] = { "log", "wrong", NULL };
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_OTR);
|
|
|
|
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_log__updates__enables_logging(void** state)
|
|
{
|
|
gchar* args[] = { "log", "on", NULL };
|
|
prefs_set_string(PREF_OTR_LOG, "off");
|
|
prefs_set_boolean(PREF_CHLOG, TRUE);
|
|
|
|
expect_cons_show("OTR messages will be logged as plaintext.");
|
|
|
|
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
|
|
auto_gchar gchar* pref_otr_log = prefs_get_string(PREF_OTR_LOG);
|
|
|
|
assert_true(result);
|
|
assert_string_equal("on", pref_otr_log);
|
|
}
|
|
|
|
void
|
|
cmd_otr_log__shows__warning_when_chlog_disabled(void** state)
|
|
{
|
|
gchar* args[] = { "log", "on", NULL };
|
|
prefs_set_string(PREF_OTR_LOG, "off");
|
|
prefs_set_boolean(PREF_CHLOG, FALSE);
|
|
|
|
expect_cons_show("OTR messages will be logged as plaintext.");
|
|
expect_cons_show("Chat logging is currently disabled, use '/history on' to enable.");
|
|
|
|
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_log__updates__disables_logging(void** state)
|
|
{
|
|
gchar* args[] = { "log", "off", NULL };
|
|
prefs_set_string(PREF_OTR_LOG, "on");
|
|
prefs_set_boolean(PREF_CHLOG, TRUE);
|
|
|
|
expect_cons_show("OTR message logging disabled.");
|
|
|
|
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
|
|
auto_gchar gchar* pref_otr_log = prefs_get_string(PREF_OTR_LOG);
|
|
|
|
assert_true(result);
|
|
assert_string_equal("off", pref_otr_log);
|
|
}
|
|
|
|
void
|
|
cmd_otr_log__updates__redacts_logging(void** state)
|
|
{
|
|
gchar* args[] = { "log", "redact", NULL };
|
|
prefs_set_string(PREF_OTR_LOG, "on");
|
|
prefs_set_boolean(PREF_CHLOG, TRUE);
|
|
|
|
expect_cons_show("OTR messages will be logged as '[redacted]'.");
|
|
|
|
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
|
|
auto_gchar gchar* pref_otr_log = prefs_get_string(PREF_OTR_LOG);
|
|
|
|
assert_true(result);
|
|
assert_string_equal("redact", pref_otr_log);
|
|
}
|
|
|
|
void
|
|
cmd_otr_log__shows__redact_warning_when_chlog_disabled(void** state)
|
|
{
|
|
gchar* args[] = { "log", "redact", NULL };
|
|
prefs_set_string(PREF_OTR_LOG, "off");
|
|
prefs_set_boolean(PREF_CHLOG, FALSE);
|
|
|
|
expect_cons_show("OTR messages will be logged as '[redacted]'.");
|
|
expect_cons_show("Chat logging is currently disabled, use '/history on' to enable.");
|
|
|
|
gboolean result = cmd_otr_log(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_libver__shows__libotr_version(void** state)
|
|
{
|
|
gchar* args[] = { "libver", NULL };
|
|
char* version = "9.9.9";
|
|
GString* message = g_string_new("Using libotr version ");
|
|
g_string_append(message, version);
|
|
|
|
will_return(otr_libotr_version, version);
|
|
|
|
expect_cons_show(message->str);
|
|
|
|
gboolean result = cmd_otr_libver(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
|
|
g_string_free(message, TRUE);
|
|
}
|
|
|
|
void
|
|
cmd_otr_gen__shows__message_when_not_connected(void** state)
|
|
{
|
|
gchar* args[] = { "gen", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_cons_show("You must be connected with an account to load OTR information.");
|
|
|
|
gboolean result = cmd_otr_gen(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
static void
|
|
test_with_command_and_connection_status(char* command, void* cmd_func, jabber_conn_status_t status)
|
|
{
|
|
gchar* args[] = { command, NULL };
|
|
|
|
will_return(connection_get_status, status);
|
|
|
|
expect_cons_show("You must be connected with an account to load OTR information.");
|
|
|
|
gboolean (*func)(ProfWin* window, const char* const command, gchar** args) = cmd_func;
|
|
gboolean result = func(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_gen__shows__message_when_disconnected(void** state)
|
|
{
|
|
test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_DISCONNECTED);
|
|
}
|
|
|
|
void
|
|
cmd_otr_gen__shows__message_when_connecting(void** state)
|
|
{
|
|
test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_CONNECTING);
|
|
}
|
|
|
|
void
|
|
cmd_otr_gen__shows__message_when_disconnecting(void** state)
|
|
{
|
|
test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_DISCONNECTING);
|
|
}
|
|
|
|
void
|
|
cmd_otr_gen__tests__generates_key_for_connected_account(void** state)
|
|
{
|
|
gchar* args[] = { "gen", NULL };
|
|
gchar* account_name = g_strdup("myaccount");
|
|
ProfAccount* account = account_new(account_name, g_strdup("me@jabber.org"), NULL, NULL,
|
|
TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
will_return(session_get_account_name, account_name);
|
|
|
|
expect_string(accounts_get_account, name, account_name);
|
|
|
|
will_return(accounts_get_account, account);
|
|
|
|
expect_memory(otr_keygen, account, account, sizeof(ProfAccount));
|
|
|
|
gboolean result = cmd_otr_gen(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_myfp__shows__message_when_disconnected(void** state)
|
|
{
|
|
test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_DISCONNECTED);
|
|
}
|
|
|
|
void
|
|
cmd_otr_myfp__shows__message_when_connecting(void** state)
|
|
{
|
|
test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_CONNECTING);
|
|
}
|
|
|
|
void
|
|
cmd_otr_myfp__shows__message_when_disconnecting(void** state)
|
|
{
|
|
test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_DISCONNECTING);
|
|
}
|
|
|
|
void
|
|
cmd_otr_myfp__shows__message_when_no_key(void** state)
|
|
{
|
|
gchar* args[] = { "myfp", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
will_return(otr_key_loaded, FALSE);
|
|
|
|
expect_win_println("You have not generated or loaded a private key, use '/otr gen'");
|
|
|
|
gboolean result = cmd_otr_myfp(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_myfp__shows__my_fingerprint(void** state)
|
|
{
|
|
char* fingerprint = "AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD EEEEEEEE";
|
|
gchar* args[] = { "myfp", NULL };
|
|
GString* message = g_string_new("Your OTR fingerprint: ");
|
|
g_string_append(message, fingerprint);
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
will_return(otr_key_loaded, TRUE);
|
|
will_return(otr_get_my_fingerprint, g_strdup(fingerprint));
|
|
|
|
expect_win_println(message->str);
|
|
|
|
gboolean result = cmd_otr_myfp(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
|
|
g_string_free(message, TRUE);
|
|
}
|
|
|
|
static void
|
|
test_cmd_otr_theirfp_from_wintype(win_type_t wintype)
|
|
{
|
|
gchar* args[] = { "theirfp", NULL };
|
|
ProfWin window;
|
|
window.type = wintype;
|
|
window.layout = NULL;
|
|
window.urls_ac = NULL;
|
|
window.quotes_ac = NULL;
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
|
|
expect_win_println("You must be in a regular chat window to view a recipient's fingerprint.");
|
|
|
|
gboolean result = cmd_otr_theirfp(&window, CMD_OTR, args);
|
|
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_theirfp__shows__message_when_in_console(void** state)
|
|
{
|
|
test_cmd_otr_theirfp_from_wintype(WIN_CONSOLE);
|
|
}
|
|
|
|
void
|
|
cmd_otr_theirfp__shows__message_when_in_muc(void** state)
|
|
{
|
|
test_cmd_otr_theirfp_from_wintype(WIN_MUC);
|
|
}
|
|
|
|
void
|
|
cmd_otr_theirfp__shows__message_when_in_private(void** state)
|
|
{
|
|
test_cmd_otr_theirfp_from_wintype(WIN_PRIVATE);
|
|
}
|
|
|
|
void
|
|
cmd_otr_theirfp__shows__message_when_non_otr_chat_window(void** state)
|
|
{
|
|
gchar* args[] = { "theirfp", NULL };
|
|
|
|
ProfWin window;
|
|
window.type = WIN_CHAT;
|
|
window.layout = NULL;
|
|
window.urls_ac = NULL;
|
|
window.quotes_ac = NULL;
|
|
ProfChatWin chatwin;
|
|
chatwin.window = window;
|
|
chatwin.memcheck = PROFCHATWIN_MEMCHECK;
|
|
chatwin.pgp_send = FALSE;
|
|
chatwin.is_otr = FALSE;
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
|
|
expect_win_println("You are not currently in an OTR session.");
|
|
|
|
gboolean result = cmd_otr_theirfp((ProfWin*)&chatwin, CMD_OTR, args);
|
|
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_theirfp__shows__fingerprint(void** state)
|
|
{
|
|
char* recipient = "someone@chat.com";
|
|
char* fingerprint = "AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD EEEEEEEE";
|
|
gchar* args[] = { "theirfp", NULL };
|
|
GString* message = g_string_new(recipient);
|
|
g_string_append(message, "'s OTR fingerprint: ");
|
|
g_string_append(message, fingerprint);
|
|
|
|
ProfWin window;
|
|
window.type = WIN_CHAT;
|
|
window.layout = NULL;
|
|
window.urls_ac = NULL;
|
|
window.quotes_ac = NULL;
|
|
ProfChatWin chatwin;
|
|
chatwin.window = window;
|
|
chatwin.barejid = recipient;
|
|
chatwin.memcheck = PROFCHATWIN_MEMCHECK;
|
|
chatwin.pgp_send = FALSE;
|
|
chatwin.is_otr = TRUE;
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
|
|
expect_string(otr_get_their_fingerprint, recipient, recipient);
|
|
will_return(otr_get_their_fingerprint, g_strdup(fingerprint));
|
|
|
|
expect_win_println(message->str);
|
|
|
|
gboolean result = cmd_otr_theirfp((ProfWin*)&chatwin, CMD_OTR, args);
|
|
assert_true(result);
|
|
|
|
g_string_free(message, TRUE);
|
|
}
|
|
|
|
static void
|
|
test_cmd_otr_start_from_wintype(win_type_t wintype)
|
|
{
|
|
gchar* args[] = { "start", NULL };
|
|
ProfWin window;
|
|
window.type = wintype;
|
|
window.layout = NULL;
|
|
window.urls_ac = NULL;
|
|
window.quotes_ac = NULL;
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
|
|
expect_win_println("You must be in a regular chat window to start an OTR session.");
|
|
|
|
gboolean result = cmd_otr_start(&window, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_start__shows__message_when_in_console(void** state)
|
|
{
|
|
test_cmd_otr_start_from_wintype(WIN_CONSOLE);
|
|
}
|
|
|
|
void
|
|
cmd_otr_start__shows__message_when_in_muc(void** state)
|
|
{
|
|
test_cmd_otr_start_from_wintype(WIN_MUC);
|
|
}
|
|
|
|
void
|
|
cmd_otr_start__shows__message_when_in_private(void** state)
|
|
{
|
|
test_cmd_otr_start_from_wintype(WIN_PRIVATE);
|
|
}
|
|
|
|
void
|
|
cmd_otr_start__shows__message_when_already_started(void** state)
|
|
{
|
|
char* recipient = "someone@server.org";
|
|
gchar* args[] = { "start", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
|
|
ProfWin window;
|
|
window.type = WIN_CHAT;
|
|
window.layout = NULL;
|
|
window.urls_ac = NULL;
|
|
window.quotes_ac = NULL;
|
|
ProfChatWin chatwin;
|
|
chatwin.window = window;
|
|
chatwin.barejid = recipient;
|
|
chatwin.memcheck = PROFCHATWIN_MEMCHECK;
|
|
chatwin.pgp_send = FALSE;
|
|
chatwin.is_otr = TRUE;
|
|
|
|
expect_win_println("You are already in an OTR session.");
|
|
|
|
gboolean result = cmd_otr_start((ProfWin*)&chatwin, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_start__shows__message_when_no_key(void** state)
|
|
{
|
|
char* recipient = "someone@server.org";
|
|
gchar* args[] = { "start", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
will_return(otr_key_loaded, FALSE);
|
|
|
|
ProfWin window;
|
|
window.type = WIN_CHAT;
|
|
window.layout = NULL;
|
|
window.urls_ac = NULL;
|
|
window.quotes_ac = NULL;
|
|
ProfChatWin chatwin;
|
|
chatwin.window = window;
|
|
chatwin.barejid = recipient;
|
|
chatwin.memcheck = PROFCHATWIN_MEMCHECK;
|
|
chatwin.pgp_send = FALSE;
|
|
chatwin.is_otr = FALSE;
|
|
|
|
expect_win_println("You have not generated or loaded a private key, use '/otr gen'");
|
|
|
|
gboolean result = cmd_otr_start((ProfWin*)&chatwin, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_otr_start__tests__sends_otr_query_message_to_current_recipeint(void** state)
|
|
{
|
|
char* recipient = "buddy@chat.com";
|
|
char* query_message = "?OTR?";
|
|
gchar* args[] = { "start", NULL };
|
|
|
|
ProfWin window;
|
|
window.type = WIN_CHAT;
|
|
window.layout = NULL;
|
|
window.urls_ac = NULL;
|
|
window.quotes_ac = NULL;
|
|
ProfChatWin chatwin;
|
|
chatwin.window = window;
|
|
chatwin.barejid = recipient;
|
|
chatwin.memcheck = PROFCHATWIN_MEMCHECK;
|
|
chatwin.pgp_send = FALSE;
|
|
chatwin.is_otr = FALSE;
|
|
|
|
will_return(connection_get_status, JABBER_CONNECTED);
|
|
will_return(otr_key_loaded, TRUE);
|
|
will_return(otr_start_query, query_message);
|
|
|
|
expect_string(message_send_chat_otr, barejid, recipient);
|
|
expect_string(message_send_chat_otr, msg, query_message);
|
|
|
|
gboolean result = cmd_otr_start((ProfWin*)&chatwin, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
#else
|
|
void
|
|
cmd_otr__shows__message_when_otr_unsupported(void** state)
|
|
{
|
|
gchar* args[] = { "gen", NULL };
|
|
|
|
expect_cons_show("This version of Profanity has not been built with OTR support enabled");
|
|
|
|
gboolean result = cmd_otr_gen(NULL, CMD_OTR, args);
|
|
assert_true(result);
|
|
}
|
|
#endif
|