mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-24 19:16:21 +00:00
merge: sync upstream profanity-im/profanity
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>
This commit is contained in:
57
tests/unittests/plugins/test_callbacks.c
Normal file
57
tests/unittests/plugins/test_callbacks.c
Normal file
@@ -0,0 +1,57 @@
|
||||
#include "prof_cmocka.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <glib.h>
|
||||
|
||||
#include "plugins/callbacks.h"
|
||||
#include "plugins/plugins.h"
|
||||
|
||||
void
|
||||
plugins_get_command_names__returns__no_commands(void** state)
|
||||
{
|
||||
plugins_init();
|
||||
GList* commands = plugins_get_command_names();
|
||||
|
||||
assert_true(commands == NULL);
|
||||
}
|
||||
|
||||
void
|
||||
plugins_get_command_names__returns__commands_when_added(void** state)
|
||||
{
|
||||
plugins_init();
|
||||
PluginCommand* command1 = g_new0(PluginCommand, 1);
|
||||
command1->command_name = g_strdup("command1");
|
||||
callbacks_add_command("plugin1", command1);
|
||||
|
||||
PluginCommand* command2 = g_new0(PluginCommand, 1);
|
||||
command2->command_name = g_strdup("command2");
|
||||
callbacks_add_command("plugin1", command2);
|
||||
|
||||
PluginCommand* command3 = g_new0(PluginCommand, 1);
|
||||
command3->command_name = g_strdup("command3");
|
||||
callbacks_add_command("plugin2", command3);
|
||||
|
||||
GList* names = plugins_get_command_names();
|
||||
assert_true(g_list_length(names) == 3);
|
||||
|
||||
gboolean foundCommand1 = FALSE;
|
||||
gboolean foundCommand2 = FALSE;
|
||||
gboolean foundCommand3 = FALSE;
|
||||
GList* curr = names;
|
||||
while (curr) {
|
||||
if (g_strcmp0(curr->data, "command1") == 0) {
|
||||
foundCommand1 = TRUE;
|
||||
}
|
||||
if (g_strcmp0(curr->data, "command2") == 0) {
|
||||
foundCommand2 = TRUE;
|
||||
}
|
||||
if (g_strcmp0(curr->data, "command3") == 0) {
|
||||
foundCommand3 = TRUE;
|
||||
}
|
||||
curr = g_list_next(curr);
|
||||
}
|
||||
|
||||
assert_true(foundCommand1 && foundCommand2 && foundCommand3);
|
||||
|
||||
g_list_free(names);
|
||||
}
|
||||
7
tests/unittests/plugins/test_callbacks.h
Normal file
7
tests/unittests/plugins/test_callbacks.h
Normal file
@@ -0,0 +1,7 @@
|
||||
#ifndef TESTS_TEST_CALLBACKS_H
|
||||
#define TESTS_TEST_CALLBACKS_H
|
||||
|
||||
void plugins_get_command_names__returns__no_commands(void** state);
|
||||
void plugins_get_command_names__returns__commands_when_added(void** state);
|
||||
|
||||
#endif
|
||||
128
tests/unittests/plugins/test_plugins_disco.c
Normal file
128
tests/unittests/plugins/test_plugins_disco.c
Normal file
@@ -0,0 +1,128 @@
|
||||
#include "prof_cmocka.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "plugins/disco.h"
|
||||
|
||||
void
|
||||
disco_get_features__returns__empty_list_when_none(void** state)
|
||||
{
|
||||
disco_close();
|
||||
GList* features = disco_get_features();
|
||||
|
||||
assert_int_equal(g_list_length(features), 0);
|
||||
|
||||
g_list_free(features);
|
||||
disco_close();
|
||||
}
|
||||
|
||||
void
|
||||
disco_add_feature__updates__added_feature(void** state)
|
||||
{
|
||||
disco_close();
|
||||
disco_add_feature("my_plugin", "some:feature:example");
|
||||
|
||||
GList* features = disco_get_features();
|
||||
assert_int_equal(g_list_length(features), 1);
|
||||
char* feature = features->data;
|
||||
assert_string_equal(feature, "some:feature:example");
|
||||
|
||||
g_list_free(features);
|
||||
disco_close();
|
||||
}
|
||||
|
||||
void
|
||||
disco_close__updates__resets_features(void** state)
|
||||
{
|
||||
disco_close();
|
||||
disco_add_feature("my_plugin", "some:feature:example");
|
||||
|
||||
GList* features = disco_get_features();
|
||||
assert_int_equal(g_list_length(features), 1);
|
||||
g_list_free(features);
|
||||
|
||||
disco_close();
|
||||
features = disco_get_features();
|
||||
assert_int_equal(g_list_length(features), 0);
|
||||
|
||||
g_list_free(features);
|
||||
disco_close();
|
||||
}
|
||||
|
||||
void
|
||||
disco_get_features__returns__all_added_features(void** state)
|
||||
{
|
||||
disco_close();
|
||||
disco_add_feature("first_plugin", "first:feature");
|
||||
disco_add_feature("first_plugin", "second:feature");
|
||||
disco_add_feature("second_plugin", "third:feature");
|
||||
disco_add_feature("third_plugin", "fourth:feature");
|
||||
disco_add_feature("third_plugin", "fifth:feature");
|
||||
|
||||
GList* features = disco_get_features();
|
||||
|
||||
assert_int_equal(g_list_length(features), 5);
|
||||
assert_true(g_list_find_custom(features, "first:feature", (GCompareFunc)g_strcmp0));
|
||||
assert_true(g_list_find_custom(features, "second:feature", (GCompareFunc)g_strcmp0));
|
||||
assert_true(g_list_find_custom(features, "third:feature", (GCompareFunc)g_strcmp0));
|
||||
assert_true(g_list_find_custom(features, "fourth:feature", (GCompareFunc)g_strcmp0));
|
||||
assert_true(g_list_find_custom(features, "fifth:feature", (GCompareFunc)g_strcmp0));
|
||||
|
||||
g_list_free(features);
|
||||
disco_close();
|
||||
}
|
||||
|
||||
void
|
||||
disco_add_feature__updates__not_duplicate_feature(void** state)
|
||||
{
|
||||
disco_close();
|
||||
disco_add_feature("my_plugin", "my:feature");
|
||||
disco_add_feature("some_other_plugin", "my:feature");
|
||||
|
||||
GList* features = disco_get_features();
|
||||
assert_int_equal(g_list_length(features), 1);
|
||||
|
||||
g_list_free(features);
|
||||
disco_close();
|
||||
}
|
||||
|
||||
void
|
||||
disco_remove_features__updates__removes_plugin_features(void** state)
|
||||
{
|
||||
disco_close();
|
||||
disco_add_feature("plugin1", "plugin1:feature1");
|
||||
disco_add_feature("plugin1", "plugin1:feature2");
|
||||
disco_add_feature("plugin2", "plugin2:feature1");
|
||||
|
||||
GList* features = disco_get_features();
|
||||
assert_int_equal(g_list_length(features), 3);
|
||||
g_list_free(features);
|
||||
|
||||
disco_remove_features("plugin1");
|
||||
|
||||
features = disco_get_features();
|
||||
assert_int_equal(g_list_length(features), 1);
|
||||
|
||||
g_list_free(features);
|
||||
disco_close();
|
||||
}
|
||||
|
||||
void
|
||||
disco_remove_features__updates__not_remove_when_more_than_one_reference(void** state)
|
||||
{
|
||||
disco_close();
|
||||
disco_add_feature("plugin1", "feature1");
|
||||
disco_add_feature("plugin1", "feature2");
|
||||
disco_add_feature("plugin2", "feature1");
|
||||
|
||||
GList* features = disco_get_features();
|
||||
assert_int_equal(g_list_length(features), 2);
|
||||
g_list_free(features);
|
||||
|
||||
disco_remove_features("plugin1");
|
||||
|
||||
features = disco_get_features();
|
||||
assert_int_equal(g_list_length(features), 1);
|
||||
|
||||
g_list_free(features);
|
||||
disco_close();
|
||||
}
|
||||
12
tests/unittests/plugins/test_plugins_disco.h
Normal file
12
tests/unittests/plugins/test_plugins_disco.h
Normal file
@@ -0,0 +1,12 @@
|
||||
#ifndef TESTS_TEST_PLUGINS_DISCO_H
|
||||
#define TESTS_TEST_PLUGINS_DISCO_H
|
||||
|
||||
void disco_get_features__returns__empty_list_when_none(void** state);
|
||||
void disco_add_feature__updates__added_feature(void** state);
|
||||
void disco_close__updates__resets_features(void** state);
|
||||
void disco_get_features__returns__all_added_features(void** state);
|
||||
void disco_add_feature__updates__not_duplicate_feature(void** state);
|
||||
void disco_remove_features__updates__removes_plugin_features(void** state);
|
||||
void disco_remove_features__updates__not_remove_when_more_than_one_reference(void** state);
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user