mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-18 22:36: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>
376 lines
8.9 KiB
C
376 lines
8.9 KiB
C
#include <glib.h>
|
|
#include "prof_cmocka.h"
|
|
#include <stdlib.h>
|
|
|
|
#include "xmpp/contact.h"
|
|
#include "tools/autocomplete.h"
|
|
|
|
void
|
|
autocomplete_complete__returns__null_when_empty(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
char* result = autocomplete_complete(ac, "test", TRUE, FALSE);
|
|
assert_null(result);
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_reset__updates__after_create(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_reset(ac);
|
|
autocomplete_free(ac);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__null_after_create(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
char* result = autocomplete_complete(ac, "hello", TRUE, FALSE);
|
|
assert_null(result);
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_create_list__returns__null_after_create(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
GList* result = autocomplete_create_list(ac);
|
|
|
|
assert_null(result);
|
|
|
|
autocomplete_free(ac);
|
|
g_list_free_full(result, free);
|
|
}
|
|
|
|
void
|
|
autocomplete_add__updates__one_and_complete(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Hello");
|
|
char* result = autocomplete_complete(ac, "Hel", TRUE, FALSE);
|
|
|
|
assert_string_equal("Hello", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__first_of_two(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Hello");
|
|
autocomplete_add(ac, "Help");
|
|
char* result = autocomplete_complete(ac, "Hel", TRUE, FALSE);
|
|
|
|
assert_string_equal("Hello", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__second_of_two(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Hello");
|
|
autocomplete_add(ac, "Help");
|
|
char* result1 = autocomplete_complete(ac, "Hel", TRUE, FALSE);
|
|
char* result2 = autocomplete_complete(ac, result1, TRUE, FALSE);
|
|
|
|
assert_string_equal("Help", result2);
|
|
|
|
autocomplete_free(ac);
|
|
free(result1);
|
|
free(result2);
|
|
}
|
|
|
|
void
|
|
autocomplete_add__updates__two_elements(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Hello");
|
|
autocomplete_add(ac, "Help");
|
|
GList* result = autocomplete_create_list(ac);
|
|
|
|
assert_int_equal(2, g_list_length(result));
|
|
|
|
autocomplete_free(ac);
|
|
g_list_free_full(result, free);
|
|
}
|
|
|
|
void
|
|
autocomplete_add__updates__only_once_for_same_value(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Hello");
|
|
autocomplete_add(ac, "Hello");
|
|
GList* result = autocomplete_create_list(ac);
|
|
|
|
assert_int_equal(1, g_list_length(result));
|
|
|
|
autocomplete_free(ac);
|
|
g_list_free_full(result, free);
|
|
}
|
|
|
|
void
|
|
autocomplete_add__updates__existing_value(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Hello");
|
|
autocomplete_add(ac, "Hello");
|
|
GList* result = autocomplete_create_list(ac);
|
|
|
|
GList* first = g_list_nth(result, 0);
|
|
|
|
char* str = first->data;
|
|
|
|
assert_string_equal("Hello", str);
|
|
|
|
autocomplete_free(ac);
|
|
g_list_free_full(result, free);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__accented_with_accented(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "èâîô");
|
|
|
|
char* result = autocomplete_complete(ac, "èâ", TRUE, FALSE);
|
|
|
|
assert_string_equal("èâîô", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__accented_with_base(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "èâîô");
|
|
|
|
char* result = autocomplete_complete(ac, "ea", TRUE, FALSE);
|
|
|
|
assert_string_equal("èâîô", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__both_with_accented(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "eaooooo");
|
|
autocomplete_add(ac, "èâîô");
|
|
|
|
char* result1 = autocomplete_complete(ac, "èâ", TRUE, FALSE);
|
|
char* result2 = autocomplete_complete(ac, result1, TRUE, FALSE);
|
|
|
|
assert_string_equal("èâîô", result2);
|
|
|
|
autocomplete_free(ac);
|
|
free(result1);
|
|
free(result2);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__both_with_base(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "eaooooo");
|
|
autocomplete_add(ac, "èâîô");
|
|
|
|
char* result1 = autocomplete_complete(ac, "ea", TRUE, FALSE);
|
|
char* result2 = autocomplete_complete(ac, result1, TRUE, FALSE);
|
|
|
|
assert_string_equal("èâîô", result2);
|
|
|
|
autocomplete_free(ac);
|
|
|
|
free(result1);
|
|
free(result2);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__is__case_insensitive(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "MyBuddy");
|
|
|
|
char* result = autocomplete_complete(ac, "myb", TRUE, FALSE);
|
|
|
|
assert_string_equal("MyBuddy", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__previous(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "MyBuddy1");
|
|
autocomplete_add(ac, "MyBuddy2");
|
|
autocomplete_add(ac, "MyBuddy3");
|
|
|
|
char* result1 = autocomplete_complete(ac, "myb", TRUE, FALSE);
|
|
char* result2 = autocomplete_complete(ac, result1, TRUE, FALSE);
|
|
char* result3 = autocomplete_complete(ac, result2, TRUE, FALSE);
|
|
char* result4 = autocomplete_complete(ac, result3, TRUE, TRUE);
|
|
|
|
assert_string_equal("MyBuddy2", result4);
|
|
|
|
autocomplete_free(ac);
|
|
|
|
free(result1);
|
|
free(result2);
|
|
free(result3);
|
|
free(result4);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__greek_false_match(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
// Σωκράτης (Socrates) and Πλάτων (Plato)
|
|
autocomplete_add(ac, "Σωκράτης");
|
|
autocomplete_add(ac, "Πλάτων");
|
|
|
|
char* result = autocomplete_complete(ac, "Π", TRUE, FALSE);
|
|
|
|
assert_string_equal("Πλάτων", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__greek(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Αριστοτέλης");
|
|
|
|
char* result = autocomplete_complete(ac, "Αριστ", TRUE, FALSE);
|
|
|
|
assert_non_null(result);
|
|
assert_string_equal("Αριστοτέλης", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__greek_case_insensitive(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Σωκράτης");
|
|
|
|
// Case insensitive search for Socrates
|
|
// σω is the lowercase of Σω
|
|
char* result = autocomplete_complete(ac, "σω", TRUE, FALSE);
|
|
|
|
assert_non_null(result);
|
|
assert_string_equal("Σωκράτης", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__russian(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Достоевский");
|
|
autocomplete_add(ac, "Толстой");
|
|
autocomplete_add(ac, "Пушкин");
|
|
|
|
char* result = autocomplete_complete(ac, "дост", TRUE, FALSE);
|
|
|
|
assert_non_null(result);
|
|
assert_string_equal("Достоевский", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__chinese(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "孙子");
|
|
autocomplete_add(ac, "诸葛亮");
|
|
|
|
char* result = autocomplete_complete(ac, "孙", TRUE, FALSE);
|
|
|
|
assert_non_null(result);
|
|
assert_string_equal("孙子", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__transliterated(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "München");
|
|
|
|
// Match 'ü' with 'u'
|
|
char* result = autocomplete_complete(ac, "mun", TRUE, FALSE);
|
|
|
|
assert_non_null(result);
|
|
assert_string_equal("München", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__returns__regular_ascii(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "London");
|
|
|
|
char* result = autocomplete_complete(ac, "lon", TRUE, FALSE);
|
|
|
|
assert_non_null(result);
|
|
assert_string_equal("London", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__handles__escaped_spaces(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Thor Odinson");
|
|
|
|
char* result = autocomplete_complete(ac, "Thor\\ ", TRUE, FALSE);
|
|
|
|
assert_string_equal("\"Thor Odinson\"", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
autocomplete_complete__handles__escaped_quotes(void** state)
|
|
{
|
|
Autocomplete ac = autocomplete_new();
|
|
autocomplete_add(ac, "Thor \"The Thunderer\" Odinson");
|
|
|
|
char* result = autocomplete_complete(ac, "Thor \\\"", TRUE, FALSE);
|
|
|
|
assert_string_equal("\"Thor \\\"The Thunderer\\\" Odinson\"", result);
|
|
|
|
autocomplete_free(ac);
|
|
free(result);
|
|
}
|