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>
296 lines
10 KiB
C
296 lines
10 KiB
C
/*
|
|
* client_events.c
|
|
* vim: expandtab:ts=4:sts=4:sw=4
|
|
*
|
|
* Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
|
|
* Copyright (C) 2019 - 2026 Michael Vetter <jubalh@iodoru.org>
|
|
*
|
|
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <assert.h>
|
|
#include <glib.h>
|
|
|
|
#include "ai/ai_client.h"
|
|
#include "log.h"
|
|
#include "chatlog.h"
|
|
#include "database.h"
|
|
#include "client_events.h"
|
|
#include "config/preferences.h"
|
|
#include "event/common.h"
|
|
#include "plugins/plugins.h"
|
|
#include "ui/inputwin.h"
|
|
#include "ui/window.h"
|
|
#include "xmpp/chat_session.h"
|
|
#include "xmpp/session.h"
|
|
#include "xmpp/xmpp.h"
|
|
|
|
#ifdef HAVE_LIBOTR
|
|
#include "otr/otr.h"
|
|
#endif
|
|
|
|
#ifdef HAVE_LIBGPGME
|
|
#include "pgp/gpg.h"
|
|
#endif
|
|
|
|
#ifdef HAVE_OMEMO
|
|
#include "omemo/omemo.h"
|
|
#endif
|
|
|
|
jabber_conn_status_t
|
|
cl_ev_connect_jid(const char* const jid, const char* const passwd, const char* const altdomain, const int port, const char* const tls_policy, const char* const auth_policy)
|
|
{
|
|
cons_show("Connecting as %s", jid);
|
|
return session_connect_with_details(jid, passwd, altdomain, port, tls_policy, auth_policy);
|
|
}
|
|
|
|
jabber_conn_status_t
|
|
cl_ev_connect_account(ProfAccount* account)
|
|
{
|
|
if (account->resource) {
|
|
cons_show("Connecting with account %s as %s/%s", account->name, account->jid, account->resource);
|
|
} else if (g_strcmp0(account->name, account->jid) == 0) {
|
|
cons_show("Connecting with account %s", account->name);
|
|
} else {
|
|
cons_show("Connecting with account %s as %s", account->name, account->jid);
|
|
}
|
|
|
|
return session_connect_with_account(account);
|
|
}
|
|
|
|
void
|
|
cl_ev_disconnect(void)
|
|
{
|
|
cons_show("%s logged out successfully.", connection_get_barejid());
|
|
|
|
ui_close_all_wins();
|
|
ev_disconnect_cleanup();
|
|
// on intentional disconnect reset the counter
|
|
ev_reset_connection_counter();
|
|
}
|
|
|
|
void
|
|
cl_ev_reconnect(void)
|
|
{
|
|
jabber_conn_status_t conn_status = connection_get_status();
|
|
if (conn_status == JABBER_CONNECTING) {
|
|
cons_show_error("Reconnection aborted: Connection attempt is already in progress");
|
|
return;
|
|
}
|
|
|
|
cons_show("Reconnecting now.");
|
|
if (conn_status != JABBER_DISCONNECTED && conn_status != JABBER_DISCONNECTING) {
|
|
connection_disconnect();
|
|
ev_disconnect_cleanup();
|
|
// on intentional disconnect reset the counter
|
|
ev_reset_connection_counter();
|
|
}
|
|
session_reconnect_now();
|
|
}
|
|
|
|
void
|
|
cl_ev_presence_send(const resource_presence_t presence_type, const int idle_secs)
|
|
{
|
|
auto_gchar gchar* signed_status = NULL;
|
|
|
|
#ifdef HAVE_LIBGPGME
|
|
ProfAccount* account = accounts_get_account(session_get_account_name());
|
|
if (account->pgp_keyid) {
|
|
signed_status = p_gpg_sign(connection_get_presence_msg(), account->pgp_keyid);
|
|
}
|
|
account_free(account);
|
|
#endif
|
|
|
|
presence_send(presence_type, idle_secs, signed_status);
|
|
}
|
|
|
|
void
|
|
cl_ev_send_msg_correct(ProfChatWin* chatwin, const char* const msg, const char* const oob_url, gboolean correct_last_msg)
|
|
{
|
|
chat_state_active(chatwin->state);
|
|
|
|
gboolean request_receipt = prefs_get_boolean(PREF_RECEIPTS_REQUEST);
|
|
if (request_receipt) {
|
|
auto_char char* jid = chat_session_get_jid(chatwin->barejid);
|
|
EntityCapabilities* caps = caps_lookup(jid);
|
|
if (caps != NULL) {
|
|
GSList* found = g_slist_find_custom(caps->features, XMPP_FEATURE_RECEIPTS, (GCompareFunc)g_strcmp0);
|
|
request_receipt = (found != NULL);
|
|
caps_destroy(caps);
|
|
}
|
|
}
|
|
|
|
auto_char char* plugin_msg = plugins_pre_chat_message_send(chatwin->barejid, msg);
|
|
auto_gchar gchar* sanitized_msg = str_xml_sanitize(plugin_msg ?: msg);
|
|
const char* message = sanitized_msg;
|
|
|
|
char* replace_id = NULL;
|
|
if (correct_last_msg) {
|
|
replace_id = chatwin->last_msg_id;
|
|
}
|
|
|
|
if (chatwin->is_omemo) {
|
|
#ifdef HAVE_OMEMO
|
|
auto_char char* id = omemo_on_message_send((ProfWin*)chatwin, message, request_receipt, FALSE, replace_id);
|
|
if (id != NULL) {
|
|
chat_log_omemo_msg_out(chatwin->barejid, message, NULL);
|
|
log_database_add_outgoing_chat(id, chatwin->barejid, message, replace_id, PROF_MSG_ENC_OMEMO);
|
|
chatwin_outgoing_msg(chatwin, message, id, PROF_MSG_ENC_OMEMO, request_receipt, replace_id);
|
|
}
|
|
#endif
|
|
} else if (chatwin->is_ox) {
|
|
#ifdef HAVE_LIBGPGME
|
|
// XEP-0373: OpenPGP for XMPP
|
|
auto_char char* id = message_send_chat_ox(chatwin->barejid, message, request_receipt, replace_id);
|
|
if (id != NULL) {
|
|
chat_log_pgp_msg_out(chatwin->barejid, message, NULL);
|
|
log_database_add_outgoing_chat(id, chatwin->barejid, message, replace_id, PROF_MSG_ENC_OX);
|
|
chatwin_outgoing_msg(chatwin, message, id, PROF_MSG_ENC_OX, request_receipt, replace_id);
|
|
}
|
|
#endif
|
|
} else if (chatwin->pgp_send) {
|
|
#ifdef HAVE_LIBGPGME
|
|
auto_char char* id = message_send_chat_pgp(chatwin->barejid, message, request_receipt, replace_id);
|
|
if (id != NULL) {
|
|
chat_log_pgp_msg_out(chatwin->barejid, message, NULL);
|
|
log_database_add_outgoing_chat(id, chatwin->barejid, message, replace_id, PROF_MSG_ENC_PGP);
|
|
chatwin_outgoing_msg(chatwin, message, id, PROF_MSG_ENC_PGP, request_receipt, replace_id);
|
|
}
|
|
#endif
|
|
} else {
|
|
gboolean handled = FALSE;
|
|
#ifdef HAVE_LIBOTR
|
|
handled = otr_on_message_send(chatwin, message, request_receipt, replace_id);
|
|
#endif
|
|
if (!handled && allow_unencrypted_message(chatwin, message)) {
|
|
auto_char char* id = message_send_chat(chatwin->barejid, message, oob_url, request_receipt, replace_id);
|
|
chat_log_msg_out(chatwin->barejid, message, NULL);
|
|
log_database_add_outgoing_chat(id, chatwin->barejid, message, replace_id, PROF_MSG_ENC_NONE);
|
|
chatwin_outgoing_msg(chatwin, message, id, PROF_MSG_ENC_NONE, request_receipt, replace_id);
|
|
}
|
|
}
|
|
|
|
plugins_post_chat_message_send(chatwin->barejid, message);
|
|
return;
|
|
}
|
|
|
|
void
|
|
cl_ev_send_msg(ProfChatWin* chatwin, const char* const msg, const char* const oob_url)
|
|
{
|
|
cl_ev_send_msg_correct(chatwin, msg, oob_url, FALSE);
|
|
}
|
|
|
|
void
|
|
cl_ev_send_muc_msg_corrected(ProfMucWin* mucwin, const char* const msg, const char* const oob_url, gboolean correct_last_msg)
|
|
{
|
|
auto_char char* plugin_msg = plugins_pre_room_message_send(mucwin->roomjid, msg);
|
|
auto_gchar gchar* sanitized_msg = str_xml_sanitize(plugin_msg ?: msg);
|
|
const char* message = sanitized_msg;
|
|
|
|
char* replace_id = NULL;
|
|
if (correct_last_msg) {
|
|
replace_id = mucwin->last_msg_id;
|
|
}
|
|
|
|
#ifdef HAVE_OMEMO
|
|
if (mucwin->is_omemo) {
|
|
auto_char char* id = omemo_on_message_send((ProfWin*)mucwin, message, FALSE, TRUE, replace_id);
|
|
groupchat_log_omemo_msg_out(mucwin->roomjid, message);
|
|
log_database_add_outgoing_muc(id, mucwin->roomjid, message, replace_id, PROF_MSG_ENC_OMEMO);
|
|
mucwin_outgoing_msg(mucwin, message, id, PROF_MSG_ENC_OMEMO, replace_id);
|
|
} else
|
|
#endif
|
|
{
|
|
auto_char char* id = message_send_groupchat(mucwin->roomjid, message, oob_url, replace_id);
|
|
groupchat_log_msg_out(mucwin->roomjid, message);
|
|
log_database_add_outgoing_muc(id, mucwin->roomjid, message, replace_id, PROF_MSG_ENC_NONE);
|
|
mucwin_outgoing_msg(mucwin, message, id, PROF_MSG_ENC_NONE, replace_id);
|
|
}
|
|
|
|
plugins_post_room_message_send(mucwin->roomjid, message);
|
|
return;
|
|
}
|
|
|
|
void
|
|
cl_ev_send_muc_msg(ProfMucWin* mucwin, const char* const msg, const char* const oob_url)
|
|
{
|
|
cl_ev_send_muc_msg_corrected(mucwin, msg, oob_url, FALSE);
|
|
}
|
|
|
|
void
|
|
cl_ev_send_priv_msg(ProfPrivateWin* privwin, const char* const msg, const char* const oob_url)
|
|
{
|
|
if (privwin->occupant_offline) {
|
|
privwin_message_occupant_offline(privwin);
|
|
} else if (privwin->room_left) {
|
|
privwin_message_left_room(privwin);
|
|
} else {
|
|
auto_char char* plugin_msg = plugins_pre_priv_message_send(privwin->fulljid, msg);
|
|
auto_gchar gchar* sanitized_msg = str_xml_sanitize(plugin_msg ?: msg);
|
|
const char* message = sanitized_msg;
|
|
auto_jid Jid* jidp = jid_create(privwin->fulljid);
|
|
|
|
auto_char char* id = message_send_private(privwin->fulljid, message, oob_url);
|
|
chat_log_msg_out(jidp->barejid, message, jidp->resourcepart);
|
|
log_database_add_outgoing_muc_pm(id, privwin->fulljid, message, NULL, PROF_MSG_ENC_NONE);
|
|
privwin_outgoing_msg(privwin, message);
|
|
|
|
plugins_post_priv_message_send(privwin->fulljid, message);
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
allow_unencrypted_message(ProfChatWin* chatwin, const char* const msg)
|
|
{
|
|
if (!prefs_get_boolean(PREF_FORCE_ENCRYPTION)) {
|
|
return TRUE; // Encryption not enforced
|
|
}
|
|
|
|
auto_gchar gchar* force_enc_mode = prefs_get_string(PREF_FORCE_ENCRYPTION_MODE);
|
|
|
|
if (g_strcmp0(force_enc_mode, "block") == 0) {
|
|
win_println((ProfWin*)chatwin, THEME_ERROR, "-", "Message not sent: encryption required. Enable (omemo/pgp/otr) encryption or /force-encryption off.");
|
|
return FALSE;
|
|
}
|
|
|
|
if (g_strcmp0(force_enc_mode, "resend-to-confirm") == 0) {
|
|
// We do not use chatwin->last_message because it should be set only if it's sent.
|
|
guint msg_hash = g_str_hash(msg);
|
|
if (msg_hash == chatwin->last_attempted_msg_hash) {
|
|
chatwin->last_attempted_msg_hash = 0; // reset hash
|
|
return TRUE;
|
|
}
|
|
win_println((ProfWin*)chatwin, THEME_ERROR, "-", "Message not sent: encryption required. Enable (omemo/pgp/otr) encryption or press Enter again to send without encryption. Use /force-encryption off to disable this protection.");
|
|
chatwin->last_attempted_msg_hash = msg_hash;
|
|
inp_set_line(msg); // reset message to prevent the need to retype it
|
|
return FALSE;
|
|
}
|
|
|
|
win_println((ProfWin*)chatwin, THEME_ERROR, "-", "Message not sent: invalid encryption mode (%s). Use '/force-encryption policy resend-to-confirm'.", force_enc_mode);
|
|
return FALSE;
|
|
}
|
|
|
|
void
|
|
cl_ev_send_ai_msg(ProfAiWin* aiwin, const char* const message, const char* const id)
|
|
{
|
|
if (!aiwin || !message) {
|
|
return;
|
|
}
|
|
|
|
assert(aiwin->memcheck == PROFAIWIN_MEMCHECK);
|
|
|
|
if (!aiwin->session) {
|
|
log_error("[AI] AI session not initialized");
|
|
return;
|
|
}
|
|
|
|
// Display user message in AI window.
|
|
win_print_outgoing(&aiwin->window, ">>", id, NULL, message);
|
|
|
|
// Send to AI provider.
|
|
ai_send_prompt(aiwin->session, message, aiwin);
|
|
}
|