refactor: address PR #105 review feedback

Apply fixes, refactors and test additions requested by reviewer on PR #105.

Fixes:
- database: warn and notify user on duplicate archive_id instead of
  silently debug-logging it (R05).
- database: add missing '[' in "[DB Migration]" log prefix (R06).
- xmpp/resource: NULL-out name/status after g_free to avoid double-free
  via roster_list.c cleanup path (R09, R23).
- common: widen strtoi_range internal storage from int to long so that
  values in (INT_MAX, LONG_MAX] are rejected as out-of-range instead of
  being silently truncated on 64-bit platforms (R25).

Refactors:
- xmpp/message: extract _receive_omemo helper, removing three copies of
  the OMEMO receive block in groupchat / MUC-PM / chat handlers (R04).
- omemo: flatten deeply nested device-list processing via guard-clause
  continues (R11).
- tools/autocomplete: merge two nested ifs into a single && condition
  (R13).
- ui/titlebar: extract _show_trust_indicator and inline _wprintw_withattr
  wrapper, collapsing three near-identical trust-indicator blocks (R22).
- config/tlscerts: drop _checked_g_strdup wrapper; g_strdup is
  NULL-safe per glib documentation (R19).
- ui/inputwin: use auto_gchar for spellcheck word instead of manual
  g_free (R20).
- tools/editor: drop outdated "Deprecated synchronous" comment that
  no longer matches the callback-based implementation (R28).

Tests:
- tests/command/cmd_ac: rename segfaults_when_empty ->
  no_segfault_when_empty; expand cycling coverage to three files plus
  backward SHIFT-TAB traversal (R16, R17).
- tests/common: add strtoi_range overflow/underflow and strtol-parsing
  consistency tests (R25).
- tests/xmpp/jid: add test for '@' inside resourcepart per RFC 6122
  section 2.4 (R26).

Misc:
- xmpp/omemo: change omemo_error_to_string return type from char* to
  gchar* for glib consistency (R01).
- subprojects/libstrophe: point wrap-git at our fork at
  git.jabber.space/devs/libstrophe-gh (R24).
- RELEASE_GUIDE: drop "Updating website" section referring to an
  upstream site that is not ours (R18).
This commit is contained in:
2026-04-24 15:13:38 +03:00
parent a5fe32b245
commit 4401e817d0
21 changed files with 181 additions and 165 deletions

View File

@@ -17,7 +17,7 @@ _create_test_file(const char* path)
}
void
cmd_ac_complete_filepath__segfaults_when_empty(void** state)
cmd_ac_complete_filepath__no_segfault_when_empty(void** state)
{
char* result = cmd_ac_complete_filepath("/sendfile ", "/sendfile", FALSE);
@@ -62,33 +62,44 @@ 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");
// 1st TAB
// 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");
// 2nd TAB
char* res2 = cmd_ac_complete_filepath(res1, "/sendfile", FALSE);
assert_non_null(res2);
assert_string_equal(res2, "/sendfile test_dir/file2.txt");
// 3rd TAB
char* res3 = cmd_ac_complete_filepath(res2, "/sendfile", FALSE);
assert_non_null(res3);
assert_string_equal(res3, "/sendfile test_dir/file1.txt");
assert_string_equal(res3, "/sendfile test_dir/file3.txt");
// SHIFT-TAB
char* res4 = cmd_ac_complete_filepath(res3, "/sendfile", TRUE);
// 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/file2.txt");
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");
}

View File

@@ -1,7 +1,7 @@
#ifndef TESTS_TEST_CMD_AC_H
#define TESTS_TEST_CMD_AC_H
void cmd_ac_complete_filepath__segfaults_when_empty(void** state);
void cmd_ac_complete_filepath__no_segfault_when_empty(void** state);
void cmd_ac_complete_filepath__finds_files_in_current_dir(void** state);
void cmd_ac_complete_filepath__finds_files_with_dot_slash(void** state);
void cmd_ac_complete_filepath__cycles_through_files(void** state);

View File

@@ -9,6 +9,8 @@
#include "xmpp/resource.h"
#include "common.h"
#include "prof_cmocka.h"
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include "tests/unittests/ui/stub_ui.h" // Include for mocking cons_show
@@ -519,6 +521,63 @@ strtoi_range__returns__correct_values_when_err_msg_null(void** state)
assert_false(result);
}
void
strtoi_range__returns__false_for_integer_overflow_underflow(void** state)
{
int value;
gchar* err_msg = NULL;
gboolean result;
char buf[64];
// INT_MAX + 1 overflows
snprintf(buf, sizeof(buf), "%lld", (long long)INT_MAX + 1);
result = strtoi_range(buf, &value, INT_MIN, INT_MAX, &err_msg);
assert_false(result);
g_free(err_msg);
err_msg = NULL;
// INT_MIN - 1 underflows
snprintf(buf, sizeof(buf), "%lld", (long long)INT_MIN - 1);
result = strtoi_range(buf, &value, INT_MIN, INT_MAX, &err_msg);
assert_false(result);
g_free(err_msg);
err_msg = NULL;
// Extreme overflow, larger than `long`
result = strtoi_range("9999999999999999999999999999999999", &value, INT_MIN, INT_MAX, &err_msg);
assert_false(result);
g_free(err_msg);
err_msg = NULL;
}
void
strtoi_range__returns_consistent_with_strtol_parsing(void** state)
{
int value;
gchar* err_msg = NULL;
gboolean result;
// Hexadecimal: "0x10" -> 16
result = strtoi_range("0x10", &value, 0, 100, &err_msg);
assert_true(result);
assert_int_equal(16, value);
g_free(err_msg);
err_msg = NULL;
// Octal: "010" -> 8
result = strtoi_range("010", &value, 0, 100, &err_msg);
assert_true(result);
assert_int_equal(8, value);
g_free(err_msg);
err_msg = NULL;
// Floating point "0.8" should fail: '.' is not a valid integer char
result = strtoi_range("0.8", &value, -10, 10, &err_msg);
assert_false(result);
g_free(err_msg);
err_msg = NULL;
}
void
string_to_verbosity__returns__correct_values(void** state)
{

View File

@@ -57,6 +57,8 @@ void strtoi_range__returns__false_for_out_of_range(void** state);
void strtoi_range__returns__false_for_invalid_input(void** state);
void strtoi_range__returns__false_for_null_empty_input(void** state);
void strtoi_range__returns__correct_values_when_err_msg_null(void** state);
void strtoi_range__returns__false_for_integer_overflow_underflow(void** state);
void strtoi_range__returns_consistent_with_strtol_parsing(void** state);
void string_matches_one_of__tests__edge_cases(void** state);
void valid_tls_policy_option__is__correct_for_various_inputs(void** state);
void get_mentions__tests__various(void** state);

View File

@@ -107,7 +107,7 @@ main(int argc, char* argv[])
cmocka_unit_test(unique_filename_from_url__tests__table_driven),
cmocka_unit_test(string_to_verbosity__returns__correct_values),
cmocka_unit_test(get_expanded_path__returns__expanded),
cmocka_unit_test_setup_teardown(cmd_ac_complete_filepath__segfaults_when_empty, load_preferences, close_preferences),
cmocka_unit_test_setup_teardown(cmd_ac_complete_filepath__no_segfault_when_empty, load_preferences, close_preferences),
cmocka_unit_test_setup_teardown(cmd_ac_complete_filepath__finds_files_in_current_dir, load_preferences, close_preferences),
cmocka_unit_test_setup_teardown(cmd_ac_complete_filepath__finds_files_with_dot_slash, load_preferences, close_preferences),
cmocka_unit_test_setup_teardown(cmd_ac_complete_filepath__cycles_through_files, load_preferences, close_preferences),
@@ -116,6 +116,8 @@ main(int argc, char* argv[])
cmocka_unit_test(strtoi_range__returns__false_for_invalid_input),
cmocka_unit_test(strtoi_range__returns__false_for_null_empty_input),
cmocka_unit_test(strtoi_range__returns__correct_values_when_err_msg_null),
cmocka_unit_test(strtoi_range__returns__false_for_integer_overflow_underflow),
cmocka_unit_test(strtoi_range__returns_consistent_with_strtol_parsing),
cmocka_unit_test(string_matches_one_of__tests__edge_cases),
cmocka_unit_test(valid_tls_policy_option__is__correct_for_various_inputs),
cmocka_unit_test(autocomplete_complete__returns__null_when_empty),
@@ -175,6 +177,7 @@ main(int argc, char* argv[])
cmocka_unit_test(jid_create__returns__null_from_multiple_at_in_bare),
cmocka_unit_test(jid_create__returns__correct_parts_with_at_in_resource_only),
cmocka_unit_test(jid_is_valid_user_jid__is__true_for_valid_user_jid),
cmocka_unit_test(jid_is_valid_user_jid__is__true_for_at_in_resource),
cmocka_unit_test(jid_is_valid_user_jid__is__false_for_domain_jid),
cmocka_unit_test(jid_is_valid_user_jid__is__false_for_invalid_jid),
cmocka_unit_test(jid_is_valid__is__true_for_valid_jid),

View File

@@ -319,6 +319,14 @@ jid_is_valid_user_jid__is__true_for_valid_user_jid(void** state)
assert_true(jid_is_valid_user_jid("myuser@mydomain"));
}
void
jid_is_valid_user_jid__is__true_for_at_in_resource(void** state)
{
// RFC 6122 section 2.4: '@' is allowed in the resourcepart.
assert_true(jid_is_valid_user_jid("myuser@mydomain/user@laptop"));
assert_true(jid_is_valid_user_jid("room@conference.example.org/user@host.example.org"));
}
void
jid_is_valid_user_jid__is__false_for_domain_jid(void** state)
{

View File

@@ -32,6 +32,7 @@ void jid_create__returns__null_from_empty_parts(void** state);
void jid_create__returns__null_from_multiple_at_in_bare(void** state);
void jid_create__returns__correct_parts_with_at_in_resource_only(void** state);
void jid_is_valid_user_jid__is__true_for_valid_user_jid(void** state);
void jid_is_valid_user_jid__is__true_for_at_in_resource(void** state);
void jid_is_valid_user_jid__is__false_for_domain_jid(void** state);
void jid_is_valid_user_jid__is__false_for_invalid_jid(void** state);
void jid_is_valid__is__true_for_valid_jid(void** state);