mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-18 20:26:21 +00:00
Jabber Developer
72f4f186da
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>
444 lines
14 KiB
C
444 lines
14 KiB
C
#include "prof_cmocka.h"
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <glib.h>
|
|
|
|
#include "xmpp/xmpp.h"
|
|
|
|
#include "ui/ui.h"
|
|
#include "ui/stub_ui.h"
|
|
|
|
#include "command/cmd_funcs.h"
|
|
#include "config/accounts.h"
|
|
|
|
#define CMD_CONNECT "/connect"
|
|
|
|
static void
|
|
test_with_connection_status(jabber_conn_status_t status)
|
|
{
|
|
will_return(connection_get_status, status);
|
|
|
|
expect_cons_show("You are either connected already, or a login is in process.");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, NULL);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__message_when_disconnecting(void** state)
|
|
{
|
|
test_with_connection_status(JABBER_DISCONNECTING);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__message_when_connecting(void** state)
|
|
{
|
|
test_with_connection_status(JABBER_CONNECTING);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__message_when_connected(void** state)
|
|
{
|
|
test_with_connection_status(JABBER_CONNECTED);
|
|
}
|
|
|
|
void
|
|
cmd_connect__tests__no_account(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(accounts_get_account, name, "user@server.org");
|
|
will_return(accounts_get_account, NULL);
|
|
|
|
will_return(ui_ask_password, g_strdup("password"));
|
|
|
|
expect_cons_show("Connecting as user@server.org");
|
|
|
|
expect_string(session_connect_with_details, jid, "user@server.org");
|
|
expect_string(session_connect_with_details, passwd, "password");
|
|
expect_value(session_connect_with_details, altdomain, NULL);
|
|
expect_value(session_connect_with_details, port, 0);
|
|
will_return(session_connect_with_details, JABBER_CONNECTING);
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__fail_message(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_any(accounts_get_account, name);
|
|
will_return(accounts_get_account, NULL);
|
|
|
|
will_return(ui_ask_password, g_strdup("password"));
|
|
|
|
expect_cons_show("Connecting as user@server.org");
|
|
|
|
expect_any(session_connect_with_details, jid);
|
|
expect_any(session_connect_with_details, passwd);
|
|
expect_any(session_connect_with_details, altdomain);
|
|
expect_any(session_connect_with_details, port);
|
|
will_return(session_connect_with_details, JABBER_DISCONNECTED);
|
|
|
|
expect_cons_show_error("Connection attempt for user@server.org failed.");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__tests__lowercases_argument_with_no_account(void** state)
|
|
{
|
|
gchar* args[] = { "USER@server.ORG", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(accounts_get_account, name, "USER@server.ORG");
|
|
will_return(accounts_get_account, NULL);
|
|
|
|
will_return(ui_ask_password, g_strdup("password"));
|
|
|
|
expect_cons_show("Connecting as user@server.org");
|
|
|
|
expect_string(session_connect_with_details, jid, "user@server.org");
|
|
expect_string(session_connect_with_details, passwd, "password");
|
|
expect_value(session_connect_with_details, altdomain, NULL);
|
|
expect_value(session_connect_with_details, port, 0);
|
|
will_return(session_connect_with_details, JABBER_CONNECTING);
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__tests__lowercases_argument_with_account(void** state)
|
|
{
|
|
gchar* args[] = { "Jabber_org", NULL };
|
|
ProfAccount* account = account_new(g_strdup("Jabber_org"), g_strdup("me@jabber.org"), g_strdup("password"), 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_DISCONNECTED);
|
|
|
|
expect_any(accounts_get_account, name);
|
|
will_return(accounts_get_account, account);
|
|
|
|
expect_cons_show("Connecting with account Jabber_org as me@jabber.org");
|
|
|
|
expect_memory(session_connect_with_account, account, account, sizeof(ProfAccount));
|
|
will_return(session_connect_with_account, JABBER_CONNECTING);
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__tests__asks_password_when_not_in_account(void** state)
|
|
{
|
|
gchar* args[] = { "jabber_org", NULL };
|
|
ProfAccount* account = account_new(g_strdup("jabber_org"), 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_DISCONNECTED);
|
|
|
|
expect_any(accounts_get_account, name);
|
|
will_return(accounts_get_account, account);
|
|
|
|
will_return(ui_ask_password, g_strdup("password"));
|
|
|
|
expect_cons_show("Connecting with account jabber_org as me@jabber.org");
|
|
|
|
expect_any(session_connect_with_account, account);
|
|
will_return(session_connect_with_account, JABBER_CONNECTING);
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__usage_when_no_server_value(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "server", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__usage_when_server_no_port_value(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "server", "aserver", "port", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__usage_when_no_port_value(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "port", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__usage_when_port_no_server_value(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "port", "5678", "server", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__message_when_port_0(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "port", "0", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_cons_show("Value 0 out of range. Must be in 1..65535.");
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__message_when_port_minus1(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "port", "-1", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_cons_show("Value -1 out of range. Must be in 1..65535.");
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__message_when_port_65536(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "port", "65536", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_cons_show("Value 65536 out of range. Must be in 1..65535.");
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__message_when_port_contains_chars(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "port", "52f66", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_cons_show("Could not convert \"52f66\" to a number.");
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__usage_when_server_provided_twice(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "server", "server1", "server", "server2", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__usage_when_port_provided_twice(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "port", "1111", "port", "1111", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__usage_when_invalid_first_property(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "wrong", "server", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__usage_when_invalid_second_property(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "server", "aserver", "wrong", "1234", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT);
|
|
expect_cons_show("");
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__tests__with_server_when_provided(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "server", "aserver", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(accounts_get_account, name, "user@server.org");
|
|
will_return(accounts_get_account, NULL);
|
|
|
|
will_return(ui_ask_password, g_strdup("password"));
|
|
|
|
expect_cons_show("Connecting as user@server.org");
|
|
|
|
expect_string(session_connect_with_details, jid, "user@server.org");
|
|
expect_string(session_connect_with_details, passwd, "password");
|
|
expect_string(session_connect_with_details, altdomain, "aserver");
|
|
expect_value(session_connect_with_details, port, 0);
|
|
will_return(session_connect_with_details, JABBER_CONNECTING);
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__tests__with_port_when_provided(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "port", "5432", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(accounts_get_account, name, "user@server.org");
|
|
will_return(accounts_get_account, NULL);
|
|
|
|
will_return(ui_ask_password, g_strdup("password"));
|
|
|
|
expect_cons_show("Connecting as user@server.org");
|
|
|
|
expect_string(session_connect_with_details, jid, "user@server.org");
|
|
expect_string(session_connect_with_details, passwd, "password");
|
|
expect_value(session_connect_with_details, altdomain, NULL);
|
|
expect_value(session_connect_with_details, port, 5432);
|
|
will_return(session_connect_with_details, JABBER_CONNECTING);
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__tests__with_server_and_port_when_provided(void** state)
|
|
{
|
|
gchar* args[] = { "user@server.org", "port", "5432", "server", "aserver", NULL };
|
|
|
|
will_return(connection_get_status, JABBER_DISCONNECTED);
|
|
|
|
expect_string(accounts_get_account, name, "user@server.org");
|
|
will_return(accounts_get_account, NULL);
|
|
|
|
will_return(ui_ask_password, g_strdup("password"));
|
|
|
|
expect_cons_show("Connecting as user@server.org");
|
|
|
|
expect_string(session_connect_with_details, jid, "user@server.org");
|
|
expect_string(session_connect_with_details, passwd, "password");
|
|
expect_string(session_connect_with_details, altdomain, "aserver");
|
|
expect_value(session_connect_with_details, port, 5432);
|
|
will_return(session_connect_with_details, JABBER_CONNECTING);
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__shows__message_when_connecting_with_account(void** state)
|
|
{
|
|
gchar* args[] = { "jabber_org", NULL };
|
|
ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("user@jabber.org"), g_strdup("password"), NULL,
|
|
TRUE, NULL, 0, g_strdup("laptop"), 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_DISCONNECTED);
|
|
|
|
expect_any(accounts_get_account, name);
|
|
will_return(accounts_get_account, account);
|
|
|
|
expect_cons_show("Connecting with account jabber_org as user@jabber.org/laptop");
|
|
|
|
expect_any(session_connect_with_account, account);
|
|
will_return(session_connect_with_account, JABBER_CONNECTING);
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_connect__tests__connects_with_account(void** state)
|
|
{
|
|
gchar* args[] = { "jabber_org", NULL };
|
|
ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("me@jabber.org"), g_strdup("password"), 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_DISCONNECTED);
|
|
|
|
expect_any(accounts_get_account, name);
|
|
will_return(accounts_get_account, account);
|
|
|
|
expect_cons_show("Connecting with account jabber_org as me@jabber.org");
|
|
|
|
expect_memory(session_connect_with_account, account, account, sizeof(ProfAccount));
|
|
will_return(session_connect_with_account, JABBER_CONNECTING);
|
|
|
|
gboolean result = cmd_connect(NULL, CMD_CONNECT, args);
|
|
assert_true(result);
|
|
}
|