mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-18 22:36: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>
106 lines
2.9 KiB
C
106 lines
2.9 KiB
C
#include <stdlib.h>
|
|
#include <glib.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
#include "prof_cmocka.h"
|
|
#include "command/cmd_ac.h"
|
|
|
|
static void
|
|
_create_test_file(const char* path)
|
|
{
|
|
FILE* f = fopen(path, "w");
|
|
if (f) {
|
|
fprintf(f, "test");
|
|
fclose(f);
|
|
}
|
|
}
|
|
|
|
void
|
|
cmd_ac_complete_filepath__no_segfault_when_empty(void** state)
|
|
{
|
|
char* result = cmd_ac_complete_filepath("/sendfile ", "/sendfile", FALSE);
|
|
|
|
free(result);
|
|
}
|
|
|
|
void
|
|
cmd_ac_complete_filepath__finds_files_in_current_dir(void** state)
|
|
{
|
|
mkdir("test_dir", 0755);
|
|
_create_test_file("test_dir/file1.txt");
|
|
_create_test_file("test_dir/file2.txt");
|
|
|
|
char* result = cmd_ac_complete_filepath("/sendfile test_dir/file", "/sendfile", FALSE);
|
|
assert_non_null(result);
|
|
assert_string_equal(result, "/sendfile test_dir/file1.txt");
|
|
free(result);
|
|
|
|
remove("test_dir/file1.txt");
|
|
remove("test_dir/file2.txt");
|
|
rmdir("test_dir");
|
|
}
|
|
|
|
void
|
|
cmd_ac_complete_filepath__finds_files_with_dot_slash(void** state)
|
|
{
|
|
mkdir("test_dir", 0755);
|
|
_create_test_file("test_dir/file1.txt");
|
|
|
|
char* result = cmd_ac_complete_filepath("/sendfile ./test_dir/file", "/sendfile", FALSE);
|
|
assert_non_null(result);
|
|
assert_string_equal(result, "/sendfile ./test_dir/file1.txt");
|
|
free(result);
|
|
|
|
remove("test_dir/file1.txt");
|
|
rmdir("test_dir");
|
|
}
|
|
|
|
void
|
|
cmd_ac_complete_filepath__cycles_through_files(void** state)
|
|
{
|
|
mkdir("test_dir", 0755);
|
|
_create_test_file("test_dir/file1.txt");
|
|
_create_test_file("test_dir/file2.txt");
|
|
_create_test_file("test_dir/file3.txt");
|
|
|
|
// TAB forward: file1 -> file2 -> file3
|
|
char* res1 = cmd_ac_complete_filepath("/sendfile test_dir/file", "/sendfile", FALSE);
|
|
assert_non_null(res1);
|
|
assert_string_equal(res1, "/sendfile test_dir/file1.txt");
|
|
|
|
char* res2 = cmd_ac_complete_filepath(res1, "/sendfile", FALSE);
|
|
assert_non_null(res2);
|
|
assert_string_equal(res2, "/sendfile test_dir/file2.txt");
|
|
|
|
char* res3 = cmd_ac_complete_filepath(res2, "/sendfile", FALSE);
|
|
assert_non_null(res3);
|
|
assert_string_equal(res3, "/sendfile test_dir/file3.txt");
|
|
|
|
// TAB wraps around: file3 -> file1
|
|
char* res4 = cmd_ac_complete_filepath(res3, "/sendfile", FALSE);
|
|
assert_non_null(res4);
|
|
assert_string_equal(res4, "/sendfile test_dir/file1.txt");
|
|
|
|
// SHIFT-TAB goes backward: file1 -> file3, then file3 -> file2
|
|
char* res5 = cmd_ac_complete_filepath(res4, "/sendfile", TRUE);
|
|
assert_non_null(res5);
|
|
assert_string_equal(res5, "/sendfile test_dir/file3.txt");
|
|
|
|
char* res6 = cmd_ac_complete_filepath(res5, "/sendfile", TRUE);
|
|
assert_non_null(res6);
|
|
assert_string_equal(res6, "/sendfile test_dir/file2.txt");
|
|
|
|
free(res1);
|
|
free(res2);
|
|
free(res3);
|
|
free(res4);
|
|
free(res5);
|
|
free(res6);
|
|
|
|
remove("test_dir/file1.txt");
|
|
remove("test_dir/file2.txt");
|
|
remove("test_dir/file3.txt");
|
|
rmdir("test_dir");
|
|
}
|