mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-18 20:06: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>
85 lines
2.4 KiB
C
85 lines
2.4 KiB
C
#include <glib.h>
|
|
#include "prof_cmocka.h"
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <stabber.h>
|
|
|
|
#include "proftest.h"
|
|
|
|
void
|
|
does_not_send_receipt_request_to_barejid(void **state)
|
|
{
|
|
prof_input("/receipts request on");
|
|
|
|
prof_connect();
|
|
|
|
prof_input("/msg somejid@someserver.com Hi there");
|
|
|
|
assert_true(stbbr_received(
|
|
"<message id='*' type='chat' to='somejid@someserver.com'>"
|
|
"<body>Hi there</body>"
|
|
"</message>"
|
|
));
|
|
}
|
|
|
|
void
|
|
send_receipt_request(void **state)
|
|
{
|
|
prof_input("/receipts request on");
|
|
|
|
prof_connect();
|
|
|
|
// Register disco#info response for capabilities query (receipts support)
|
|
stbbr_for_query("http://jabber.org/protocol/disco#info",
|
|
"<iq from='buddy1@localhost/laptop' to='stabber@localhost' id='*' type='result'>"
|
|
"<query xmlns='http://jabber.org/protocol/disco#info' node='http://profanity-im.github.io#JNkIRQChhYM8+Co3IypmMtMJnOE='>"
|
|
"<identity category='client' name='Profanity 0.5.0' type='console'/>"
|
|
"<feature var='urn:xmpp:receipts'/>"
|
|
"</query>"
|
|
"</iq>"
|
|
);
|
|
|
|
stbbr_send(
|
|
"<presence to='stabber@localhost' from='buddy1@localhost/laptop'>"
|
|
"<priority>15</priority>"
|
|
"<status>My status</status>"
|
|
"<c hash='sha-1' xmlns='http://jabber.org/protocol/caps' node='http://profanity-im.github.io' ver='JNkIRQChhYM8+Co3IypmMtMJnOE='/>"
|
|
"</presence>"
|
|
);
|
|
|
|
assert_true(prof_output_exact("Buddy1 (laptop) is online, \"My status\""));
|
|
|
|
prof_input("/msg Buddy1");
|
|
prof_input("/resource set laptop");
|
|
prof_input("Hi there, where is my receipt?");
|
|
|
|
assert_true(stbbr_received(
|
|
"<message id='*' type='chat' to='buddy1@localhost/laptop'>"
|
|
"<body>Hi there, where is my receipt?</body>"
|
|
"<request xmlns='urn:xmpp:receipts'/>"
|
|
"</message>"
|
|
));
|
|
}
|
|
|
|
void
|
|
send_receipt_on_request(void **state)
|
|
{
|
|
prof_input("/receipts send on");
|
|
|
|
prof_connect();
|
|
|
|
stbbr_send(
|
|
"<message id='msg12213' type='chat' to='stabber@localhost/profanity' from='someuser@server.org/profanity'>"
|
|
"<body>Wants a receipt</body>"
|
|
"<request xmlns='urn:xmpp:receipts'/>"
|
|
"</message>"
|
|
);
|
|
|
|
assert_true(stbbr_received(
|
|
"<message id='*' to='someuser@server.org/profanity'>"
|
|
"<received id='msg12213' xmlns='urn:xmpp:receipts'/>"
|
|
"</message>"
|
|
));
|
|
}
|