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>
414 lines
12 KiB
C
414 lines
12 KiB
C
/*
|
|
* blocking.c
|
|
* vim: expandtab:ts=4:sts=4:sw=4
|
|
*
|
|
* Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <strophe.h>
|
|
|
|
#include <glib.h>
|
|
|
|
#include "log.h"
|
|
#include "common.h"
|
|
#include "ui/ui.h"
|
|
#include "xmpp/session.h"
|
|
#include "xmpp/connection.h"
|
|
#include "xmpp/stanza.h"
|
|
#include "xmpp/iq.h"
|
|
|
|
static int _blocklist_result_handler(xmpp_stanza_t* const stanza, void* const userdata);
|
|
static int _block_add_result_handler(xmpp_stanza_t* const stanza, void* const userdata);
|
|
static int _block_remove_result_handler(xmpp_stanza_t* const stanza, void* const userdata);
|
|
|
|
static GList* blocked;
|
|
static Autocomplete blocked_ac;
|
|
|
|
static void
|
|
_blocking_shutdown(void)
|
|
{
|
|
if (blocked) {
|
|
g_list_free_full(blocked, free);
|
|
}
|
|
autocomplete_free(blocked_ac);
|
|
}
|
|
|
|
void
|
|
blocking_request(void)
|
|
{
|
|
prof_add_shutdown_routine(_blocking_shutdown);
|
|
if (blocked) {
|
|
g_list_free_full(blocked, free);
|
|
blocked = NULL;
|
|
}
|
|
|
|
if (blocked_ac) {
|
|
autocomplete_free(blocked_ac);
|
|
}
|
|
blocked_ac = autocomplete_new();
|
|
|
|
auto_char char* id = connection_create_stanza_id();
|
|
iq_id_handler_add(id, _blocklist_result_handler, NULL, NULL);
|
|
|
|
xmpp_ctx_t* ctx = connection_get_ctx();
|
|
xmpp_stanza_t* iq = stanza_create_blocked_list_request(ctx);
|
|
xmpp_stanza_set_id(iq, id);
|
|
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
GList*
|
|
blocked_list(void)
|
|
{
|
|
return blocked;
|
|
}
|
|
|
|
char*
|
|
blocked_ac_find(const char* const search_str, gboolean previous, void* context)
|
|
{
|
|
return autocomplete_complete(blocked_ac, search_str, TRUE, previous);
|
|
}
|
|
|
|
void
|
|
blocked_ac_reset(void)
|
|
{
|
|
if (blocked_ac) {
|
|
autocomplete_reset(blocked_ac);
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
blocked_add(char* jid, blocked_report reportkind, const char* const message)
|
|
{
|
|
GList* found = g_list_find_custom(blocked, jid, (GCompareFunc)g_strcmp0);
|
|
if (found) {
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_ctx_t* ctx = connection_get_ctx();
|
|
|
|
auto_char char* id = connection_create_stanza_id();
|
|
xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id);
|
|
|
|
xmpp_stanza_t* block = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(block, STANZA_NAME_BLOCK);
|
|
xmpp_stanza_set_ns(block, STANZA_NS_BLOCKING);
|
|
|
|
xmpp_stanza_t* item = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(item, STANZA_NAME_ITEM);
|
|
xmpp_stanza_set_attribute(item, STANZA_ATTR_JID, jid);
|
|
|
|
if (reportkind != BLOCKED_NO_REPORT) {
|
|
xmpp_stanza_t* report = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(report, STANZA_NAME_REPORT);
|
|
xmpp_stanza_set_ns(report, STANZA_NS_REPORTING);
|
|
if (reportkind == BLOCKED_REPORT_ABUSE) {
|
|
xmpp_stanza_set_attribute(report, STANZA_ATTR_REASON, STANZA_REPORTING_ABUSE);
|
|
} else {
|
|
xmpp_stanza_set_attribute(report, STANZA_ATTR_REASON, STANZA_REPORTING_SPAM);
|
|
}
|
|
|
|
xmpp_stanza_t* origin = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(origin, STANZA_NAME_REPORT_ORIGIN);
|
|
xmpp_stanza_set_attribute(origin, STANZA_ATTR_JID, connection_get_fulljid());
|
|
xmpp_stanza_add_child(report, origin);
|
|
xmpp_stanza_release(origin);
|
|
|
|
xmpp_stanza_t* third_party = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(third_party, STANZA_NAME_THIRD_PARTY);
|
|
xmpp_stanza_set_attribute(third_party, STANZA_ATTR_JID, jid);
|
|
xmpp_stanza_add_child(report, third_party);
|
|
xmpp_stanza_release(third_party);
|
|
|
|
if (message) {
|
|
xmpp_stanza_t* text = xmpp_stanza_new(ctx);
|
|
if (reportkind == BLOCKED_REPORT_SPAM) {
|
|
xmpp_stanza_set_name(text, STANZA_NAME_BODY);
|
|
xmpp_stanza_set_ns(text, "jabber:client");
|
|
} else {
|
|
xmpp_stanza_set_name(text, STANZA_NAME_TEXT);
|
|
}
|
|
|
|
xmpp_stanza_t* txt = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_text(txt, message);
|
|
|
|
xmpp_stanza_add_child(text, txt);
|
|
xmpp_stanza_add_child(report, text);
|
|
xmpp_stanza_release(txt);
|
|
}
|
|
|
|
xmpp_stanza_add_child(item, report);
|
|
xmpp_stanza_release(report);
|
|
}
|
|
|
|
xmpp_stanza_add_child(block, item);
|
|
xmpp_stanza_release(item);
|
|
|
|
xmpp_stanza_add_child(iq, block);
|
|
xmpp_stanza_release(block);
|
|
|
|
iq_id_handler_add(id, _block_add_result_handler, free, strdup(jid));
|
|
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
gboolean
|
|
blocked_remove(char* jid)
|
|
{
|
|
GList* found = g_list_find_custom(blocked, jid, (GCompareFunc)g_strcmp0);
|
|
if (!found) {
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_ctx_t* ctx = connection_get_ctx();
|
|
|
|
auto_char char* id = connection_create_stanza_id();
|
|
xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id);
|
|
|
|
xmpp_stanza_t* block = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(block, STANZA_NAME_UNBLOCK);
|
|
xmpp_stanza_set_ns(block, STANZA_NS_BLOCKING);
|
|
|
|
xmpp_stanza_t* item = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(item, STANZA_NAME_ITEM);
|
|
xmpp_stanza_set_attribute(item, STANZA_ATTR_JID, jid);
|
|
|
|
xmpp_stanza_add_child(block, item);
|
|
xmpp_stanza_release(item);
|
|
|
|
xmpp_stanza_add_child(iq, block);
|
|
xmpp_stanza_release(block);
|
|
|
|
iq_id_handler_add(id, _block_remove_result_handler, free, strdup(jid));
|
|
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
int
|
|
blocked_set_handler(xmpp_stanza_t* stanza)
|
|
{
|
|
xmpp_stanza_t* block = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_BLOCK);
|
|
if (block) {
|
|
xmpp_stanza_t* child = xmpp_stanza_get_children(block);
|
|
while (child) {
|
|
if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_ITEM) == 0) {
|
|
const char* jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID);
|
|
if (jid) {
|
|
blocked = g_list_append(blocked, strdup(jid));
|
|
autocomplete_add(blocked_ac, jid);
|
|
}
|
|
}
|
|
|
|
child = xmpp_stanza_get_next(child);
|
|
}
|
|
}
|
|
|
|
xmpp_stanza_t* unblock = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_UNBLOCK);
|
|
if (unblock) {
|
|
xmpp_stanza_t* child = xmpp_stanza_get_children(unblock);
|
|
if (!child) {
|
|
g_list_free_full(blocked, free);
|
|
blocked = NULL;
|
|
autocomplete_clear(blocked_ac);
|
|
} else {
|
|
while (child) {
|
|
if (g_strcmp0(xmpp_stanza_get_name(child), STANZA_NAME_ITEM) == 0) {
|
|
const char* jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID);
|
|
if (jid) {
|
|
GList* found = g_list_find_custom(blocked, jid, (GCompareFunc)g_strcmp0);
|
|
if (found) {
|
|
blocked = g_list_remove_link(blocked, found);
|
|
g_list_free_full(found, free);
|
|
autocomplete_remove(blocked_ac, jid);
|
|
}
|
|
}
|
|
}
|
|
|
|
child = xmpp_stanza_get_next(child);
|
|
}
|
|
}
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
_block_add_result_handler(xmpp_stanza_t* const stanza, void* const userdata)
|
|
{
|
|
char* jid = (char*)userdata;
|
|
|
|
const char* type = xmpp_stanza_get_type(stanza);
|
|
if (!type) {
|
|
log_info("Block response received for %s with no type attribute.", jid);
|
|
return 0;
|
|
}
|
|
|
|
if (g_strcmp0(type, "result") != 0) {
|
|
log_info("Block response received for %s with unrecognised type attribute.", jid);
|
|
return 0;
|
|
}
|
|
|
|
cons_show("User %s successfully blocked.", jid);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
_block_remove_result_handler(xmpp_stanza_t* const stanza, void* const userdata)
|
|
{
|
|
char* jid = (char*)userdata;
|
|
|
|
const char* type = xmpp_stanza_get_type(stanza);
|
|
if (!type) {
|
|
log_info("Unblock response received for %s with no type attribute.", jid);
|
|
return 0;
|
|
}
|
|
|
|
if (g_strcmp0(type, "result") != 0) {
|
|
log_info("Unblock response received for %s with unrecognised type attribute.", jid);
|
|
return 0;
|
|
}
|
|
|
|
cons_show("User %s successfully unblocked.", jid);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
_blocklist_result_handler(xmpp_stanza_t* const stanza, void* const userdata)
|
|
{
|
|
log_debug("Blocked list result handler fired.");
|
|
|
|
const char* type = xmpp_stanza_get_type(stanza);
|
|
if (g_strcmp0(type, "result") != 0) {
|
|
log_info("Received blocklist without result type");
|
|
return 0;
|
|
}
|
|
|
|
xmpp_stanza_t* blocklist = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_BLOCKLIST);
|
|
if (!blocklist) {
|
|
log_info("Received blocklist without blocklist element");
|
|
return 0;
|
|
}
|
|
|
|
if (blocked) {
|
|
g_list_free_full(blocked, free);
|
|
blocked = NULL;
|
|
}
|
|
|
|
xmpp_stanza_t* items = xmpp_stanza_get_children(blocklist);
|
|
if (!items) {
|
|
log_debug("No blocked users.");
|
|
return 0;
|
|
}
|
|
|
|
xmpp_stanza_t* curr = items;
|
|
while (curr) {
|
|
const char* name = xmpp_stanza_get_name(curr);
|
|
if (g_strcmp0(name, "item") == 0) {
|
|
const char* jid = xmpp_stanza_get_attribute(curr, STANZA_ATTR_JID);
|
|
if (jid) {
|
|
blocked = g_list_append(blocked, strdup(jid));
|
|
autocomplete_add(blocked_ac, jid);
|
|
}
|
|
}
|
|
curr = xmpp_stanza_get_next(curr);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
reporting_set_handler(xmpp_stanza_t* stanza)
|
|
{
|
|
const char* from = xmpp_stanza_get_from(stanza);
|
|
xmpp_stanza_t* report = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_REPORTING);
|
|
if (!report) {
|
|
return 1;
|
|
}
|
|
|
|
const char* reason = xmpp_stanza_get_attribute(report, STANZA_ATTR_REASON);
|
|
const char* display_reason = "unknown";
|
|
if (g_strcmp0(reason, STANZA_REPORTING_SPAM) == 0) {
|
|
display_reason = "spam";
|
|
} else if (g_strcmp0(reason, STANZA_REPORTING_ABUSE) == 0) {
|
|
display_reason = "abuse";
|
|
}
|
|
|
|
char* message = NULL;
|
|
xmpp_stanza_t* body = xmpp_stanza_get_child_by_name(report, STANZA_NAME_BODY);
|
|
if (body) {
|
|
message = xmpp_stanza_get_text(body);
|
|
} else {
|
|
xmpp_stanza_t* text = xmpp_stanza_get_child_by_name(report, STANZA_NAME_TEXT);
|
|
if (text) {
|
|
message = xmpp_stanza_get_text(text);
|
|
}
|
|
}
|
|
|
|
// Attempt to find the reported JID if it's wrapped in an item (sync push style)
|
|
const char* reported_jid = NULL;
|
|
xmpp_stanza_t* block = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_BLOCKING);
|
|
if (block) {
|
|
xmpp_stanza_t* item = xmpp_stanza_get_child_by_name(block, STANZA_NAME_ITEM);
|
|
if (item) {
|
|
reported_jid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
|
|
}
|
|
}
|
|
|
|
xmpp_stanza_t* third_party = xmpp_stanza_get_child_by_name(report, STANZA_NAME_THIRD_PARTY);
|
|
if (third_party) {
|
|
reported_jid = xmpp_stanza_get_attribute(third_party, STANZA_ATTR_JID);
|
|
}
|
|
|
|
const char* reported_by = NULL;
|
|
xmpp_stanza_t* origin = xmpp_stanza_get_child_by_name(report, STANZA_NAME_REPORT_ORIGIN);
|
|
if (origin) {
|
|
reported_by = xmpp_stanza_get_attribute(origin, STANZA_ATTR_JID);
|
|
}
|
|
|
|
auto_gchar gchar* report_origin_str = NULL;
|
|
if (reported_by) {
|
|
report_origin_str = g_strdup_printf(" (origin: %s)", reported_by);
|
|
} else {
|
|
report_origin_str = g_strdup("");
|
|
}
|
|
|
|
if (reported_jid) {
|
|
if (message) {
|
|
cons_show("Incoming %s report%s from %s: User %s reported for %s. Content: \"%s\"",
|
|
display_reason, report_origin_str, from, reported_jid, display_reason, message);
|
|
} else {
|
|
cons_show("Incoming %s report%s from %s: User %s reported for %s.",
|
|
display_reason, report_origin_str, from, reported_jid, display_reason);
|
|
}
|
|
} else {
|
|
if (message) {
|
|
cons_show("Incoming %s report%s from %s. Content: \"%s\"",
|
|
display_reason, report_origin_str, from, message);
|
|
} else {
|
|
cons_show("Incoming %s report%s from %s.", display_reason, report_origin_str, from);
|
|
}
|
|
}
|
|
|
|
if (message) {
|
|
xmpp_free(xmpp_stanza_get_context(stanza), message);
|
|
}
|
|
|
|
return 1;
|
|
}
|