mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-18 13:26:22 +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>
139 lines
3.1 KiB
C
139 lines
3.1 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 "config/preferences.h"
|
|
|
|
#include "command/cmd_defs.h"
|
|
#include "command/cmd_funcs.h"
|
|
#include "command/cmd_ac.h"
|
|
|
|
#define CMD_ALIAS "/alias"
|
|
|
|
void
|
|
cmd_alias__shows__usage_when_add_no_args(void** state)
|
|
{
|
|
gchar* args[] = { "add", NULL };
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_ALIAS);
|
|
|
|
gboolean result = cmd_alias(NULL, CMD_ALIAS, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_alias__shows__usage_when_add_no_value(void** state)
|
|
{
|
|
gchar* args[] = { "add", "alias", NULL };
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_ALIAS);
|
|
|
|
gboolean result = cmd_alias(NULL, CMD_ALIAS, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_alias__shows__usage_when_remove_no_args(void** state)
|
|
{
|
|
gchar* args[] = { "remove", NULL };
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_ALIAS);
|
|
|
|
gboolean result = cmd_alias(NULL, CMD_ALIAS, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_alias__shows__usage_when_invalid_subcmd(void** state)
|
|
{
|
|
gchar* args[] = { "blah", NULL };
|
|
|
|
expect_string(cons_bad_cmd_usage, cmd, CMD_ALIAS);
|
|
|
|
gboolean result = cmd_alias(NULL, CMD_ALIAS, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_alias__updates__adds_alias(void** state)
|
|
{
|
|
gchar* args[] = { "add", "hc", "/help commands", NULL };
|
|
|
|
expect_cons_show("Command alias added /hc -> /help commands");
|
|
|
|
gboolean result = cmd_alias(NULL, CMD_ALIAS, args);
|
|
assert_true(result);
|
|
|
|
gchar* returned_val = prefs_get_alias("hc");
|
|
assert_string_equal("/help commands", returned_val);
|
|
|
|
g_free(returned_val);
|
|
}
|
|
|
|
void
|
|
cmd_alias__shows__message_when_add_exists(void** state)
|
|
{
|
|
gchar* args[] = { "add", "hc", "/help commands", NULL };
|
|
|
|
prefs_add_alias("hc", "/help commands");
|
|
cmd_ac_add("/hc");
|
|
|
|
expect_cons_show("Command or alias '/hc' already exists.");
|
|
|
|
gboolean result = cmd_alias(NULL, CMD_ALIAS, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_alias__updates__removes_alias(void** state)
|
|
{
|
|
gchar* args[] = { "remove", "hn", NULL };
|
|
|
|
prefs_add_alias("hn", "/help navigation");
|
|
|
|
expect_cons_show("Command alias removed -> /hn");
|
|
|
|
gboolean result = cmd_alias(NULL, CMD_ALIAS, args);
|
|
assert_true(result);
|
|
|
|
gchar* returned_val = prefs_get_alias("hn");
|
|
assert_null(returned_val);
|
|
|
|
g_free(returned_val);
|
|
}
|
|
|
|
void
|
|
cmd_alias__shows__message_when_remove_no_alias(void** state)
|
|
{
|
|
gchar* args[] = { "remove", "hn", NULL };
|
|
|
|
expect_cons_show("No such command alias /hn");
|
|
|
|
gboolean result = cmd_alias(NULL, CMD_ALIAS, args);
|
|
assert_true(result);
|
|
}
|
|
|
|
void
|
|
cmd_alias__shows__all_aliases(void** state)
|
|
{
|
|
gchar* args[] = { "list", NULL };
|
|
|
|
prefs_add_alias("vy", "/vercheck on");
|
|
prefs_add_alias("q", "/quit");
|
|
prefs_add_alias("hn", "/help navigation");
|
|
prefs_add_alias("hc", "/help commands");
|
|
prefs_add_alias("vn", "/vercheck off");
|
|
|
|
// write a custom checker to check the correct list is passed
|
|
expect_any(cons_show_aliases, aliases);
|
|
|
|
gboolean result = cmd_alias(NULL, CMD_ALIAS, args);
|
|
assert_true(result);
|
|
}
|