Jabber Developer
72f4f186da
All checks were successful
CI Code / Check spelling (push) Successful in 18s
CI Code / Check coding style (push) Successful in 34s
CI Code / Code Coverage (push) Successful in 2m36s
CI Code / Linux (debian) (push) Successful in 4m41s
CI Code / Linux (ubuntu) (push) Successful in 4m52s
CI Code / Linux (arch) (push) Successful in 5m40s
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>
429 lines
14 KiB
C
429 lines
14 KiB
C
#include <glib.h>
|
|
#include <string.h>
|
|
#include "prof_cmocka.h"
|
|
#include <stdlib.h>
|
|
|
|
#include "xmpp/contact.h"
|
|
|
|
void
|
|
p_contact_in_group__is__true_when_in_group(void** state)
|
|
{
|
|
GSList* groups = NULL;
|
|
groups = g_slist_append(groups, g_strdup("somegroup"));
|
|
PContact contact = p_contact_new("bob@server.com", "bob", groups, "both",
|
|
"is offline", FALSE);
|
|
|
|
gboolean result = p_contact_in_group(contact, "somegroup");
|
|
|
|
assert_true(result);
|
|
|
|
p_contact_free(contact);
|
|
// g_slist_free(groups);
|
|
}
|
|
|
|
void
|
|
p_contact_in_group__is__false_when_not_in_group(void** state)
|
|
{
|
|
GSList* groups = NULL;
|
|
groups = g_slist_append(groups, g_strdup("somegroup"));
|
|
PContact contact = p_contact_new("bob@server.com", "bob", groups, "both",
|
|
"is offline", FALSE);
|
|
|
|
gboolean result = p_contact_in_group(contact, "othergroup");
|
|
|
|
assert_false(result);
|
|
|
|
p_contact_free(contact);
|
|
// g_slist_free(groups);
|
|
}
|
|
|
|
void
|
|
p_contact_name_or_jid__returns__name_when_exists(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
const char* name = p_contact_name_or_jid(contact);
|
|
|
|
assert_string_equal("bob", name);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_name_or_jid__returns__jid_when_name_not_exists(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", NULL, NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
const char* jid = p_contact_name_or_jid(contact);
|
|
|
|
assert_string_equal("bob@server.com", jid);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_create_display_string__returns__name_and_resource_when_name_exists(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
char* str = p_contact_create_display_string(contact, "laptop");
|
|
|
|
assert_string_equal("bob (laptop)", str);
|
|
|
|
p_contact_free(contact);
|
|
g_free(str);
|
|
}
|
|
|
|
void
|
|
p_contact_create_display_string__returns__jid_and_resource_when_name_not_exists(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", NULL, NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
char* str = p_contact_create_display_string(contact, "laptop");
|
|
|
|
assert_string_equal("bob@server.com (laptop)", str);
|
|
|
|
p_contact_free(contact);
|
|
g_free(str);
|
|
}
|
|
|
|
void
|
|
p_contact_create_display_string__returns__name_when_default_resource(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
char* str = p_contact_create_display_string(contact, "__prof_default");
|
|
|
|
assert_string_equal("bob", str);
|
|
|
|
p_contact_free(contact);
|
|
g_free(str);
|
|
}
|
|
|
|
void
|
|
p_contact_presence__returns__offline_when_no_resources(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
const char* presence = p_contact_presence(contact);
|
|
|
|
assert_string_equal("offline", presence);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_presence__returns__highest_priority_presence(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource10 = resource_new("resource10", RESOURCE_ONLINE, NULL, 10);
|
|
Resource* resource20 = resource_new("resource20", RESOURCE_CHAT, NULL, 20);
|
|
Resource* resource30 = resource_new("resource30", RESOURCE_AWAY, NULL, 30);
|
|
Resource* resource1 = resource_new("resource1", RESOURCE_XA, NULL, 1);
|
|
Resource* resource2 = resource_new("resource2", RESOURCE_DND, NULL, 2);
|
|
p_contact_set_presence(contact, resource10);
|
|
p_contact_set_presence(contact, resource20);
|
|
p_contact_set_presence(contact, resource30);
|
|
p_contact_set_presence(contact, resource1);
|
|
p_contact_set_presence(contact, resource2);
|
|
|
|
const char* presence = p_contact_presence(contact);
|
|
|
|
assert_string_equal("away", presence);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_presence__returns__chat_when_same_priority(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
|
|
Resource* resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
|
|
Resource* resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
|
|
Resource* resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
|
|
p_contact_set_presence(contact, resource_online);
|
|
p_contact_set_presence(contact, resource_chat);
|
|
p_contact_set_presence(contact, resource_away);
|
|
p_contact_set_presence(contact, resource_xa);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
const char* presence = p_contact_presence(contact);
|
|
|
|
assert_string_equal("chat", presence);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_presence__returns__online_when_same_priority(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
|
|
Resource* resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
|
|
Resource* resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
|
|
p_contact_set_presence(contact, resource_online);
|
|
p_contact_set_presence(contact, resource_away);
|
|
p_contact_set_presence(contact, resource_xa);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
const char* presence = p_contact_presence(contact);
|
|
|
|
assert_string_equal("online", presence);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_presence__returns__away_when_same_priority(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
|
|
Resource* resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
|
|
p_contact_set_presence(contact, resource_away);
|
|
p_contact_set_presence(contact, resource_xa);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
const char* presence = p_contact_presence(contact);
|
|
|
|
assert_string_equal("away", presence);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_presence__returns__xa_when_same_priority(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
|
|
p_contact_set_presence(contact, resource_xa);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
const char* presence = p_contact_presence(contact);
|
|
|
|
assert_string_equal("xa", presence);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_presence__returns__dnd(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
const char* presence = p_contact_presence(contact);
|
|
|
|
assert_string_equal("dnd", presence);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_subscribed__is__true_when_to(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "to",
|
|
"is offline", FALSE);
|
|
|
|
gboolean result = p_contact_subscribed(contact);
|
|
|
|
assert_true(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_subscribed__is__true_when_both(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both",
|
|
"is offline", FALSE);
|
|
|
|
gboolean result = p_contact_subscribed(contact);
|
|
|
|
assert_true(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_subscribed__is__false_when_from(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, "from",
|
|
"is offline", FALSE);
|
|
|
|
gboolean result = p_contact_subscribed(contact);
|
|
|
|
assert_false(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_subscribed__is__false_when_no_subscription_value(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
|
|
"is offline", FALSE);
|
|
|
|
gboolean result = p_contact_subscribed(contact);
|
|
|
|
assert_false(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_is_available__is__false_when_offline(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
|
|
"is offline", FALSE);
|
|
|
|
gboolean result = p_contact_is_available(contact);
|
|
|
|
assert_false(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_is_available__is__false_when_highest_priority_away(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
|
|
Resource* resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
|
|
Resource* resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 20);
|
|
Resource* resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
|
|
p_contact_set_presence(contact, resource_online);
|
|
p_contact_set_presence(contact, resource_chat);
|
|
p_contact_set_presence(contact, resource_away);
|
|
p_contact_set_presence(contact, resource_xa);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
gboolean result = p_contact_is_available(contact);
|
|
|
|
assert_false(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_is_available__is__false_when_highest_priority_xa(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
|
|
Resource* resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
|
|
Resource* resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
|
|
Resource* resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 20);
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
|
|
p_contact_set_presence(contact, resource_online);
|
|
p_contact_set_presence(contact, resource_chat);
|
|
p_contact_set_presence(contact, resource_away);
|
|
p_contact_set_presence(contact, resource_xa);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
gboolean result = p_contact_is_available(contact);
|
|
|
|
assert_false(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_is_available__is__false_when_highest_priority_dnd(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
|
|
Resource* resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
|
|
Resource* resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
|
|
Resource* resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 20);
|
|
p_contact_set_presence(contact, resource_online);
|
|
p_contact_set_presence(contact, resource_chat);
|
|
p_contact_set_presence(contact, resource_away);
|
|
p_contact_set_presence(contact, resource_xa);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
gboolean result = p_contact_is_available(contact);
|
|
|
|
assert_false(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_is_available__is__true_when_highest_priority_online(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 20);
|
|
Resource* resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 10);
|
|
Resource* resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
|
|
Resource* resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
|
|
p_contact_set_presence(contact, resource_online);
|
|
p_contact_set_presence(contact, resource_chat);
|
|
p_contact_set_presence(contact, resource_away);
|
|
p_contact_set_presence(contact, resource_xa);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
gboolean result = p_contact_is_available(contact);
|
|
|
|
assert_true(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|
|
|
|
void
|
|
p_contact_is_available__is__true_when_highest_priority_chat(void** state)
|
|
{
|
|
PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL,
|
|
"is offline", FALSE);
|
|
|
|
Resource* resource_online = resource_new("resource_online", RESOURCE_ONLINE, NULL, 10);
|
|
Resource* resource_chat = resource_new("resource_chat", RESOURCE_CHAT, NULL, 20);
|
|
Resource* resource_away = resource_new("resource_away", RESOURCE_AWAY, NULL, 10);
|
|
Resource* resource_xa = resource_new("resource_xa", RESOURCE_XA, NULL, 10);
|
|
Resource* resource_dnd = resource_new("resource_dnd", RESOURCE_DND, NULL, 10);
|
|
p_contact_set_presence(contact, resource_online);
|
|
p_contact_set_presence(contact, resource_chat);
|
|
p_contact_set_presence(contact, resource_away);
|
|
p_contact_set_presence(contact, resource_xa);
|
|
p_contact_set_presence(contact, resource_dnd);
|
|
|
|
gboolean result = p_contact_is_available(contact);
|
|
|
|
assert_true(result);
|
|
|
|
p_contact_free(contact);
|
|
}
|