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>
301 lines
8.7 KiB
C
301 lines
8.7 KiB
C
/*
|
|
* roster.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 <assert.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <glib.h>
|
|
|
|
#include <strophe.h>
|
|
|
|
#include "profanity.h"
|
|
#include "log.h"
|
|
#include "config/preferences.h"
|
|
#include "plugins/plugins.h"
|
|
#include "event/server_events.h"
|
|
#include "event/client_events.h"
|
|
#include "tools/autocomplete.h"
|
|
#include "ui/ui.h"
|
|
#include "xmpp/session.h"
|
|
#include "xmpp/iq.h"
|
|
#include "xmpp/connection.h"
|
|
#include "xmpp/roster.h"
|
|
#include "xmpp/roster_list.h"
|
|
#include "xmpp/stanza.h"
|
|
#include "xmpp/xmpp.h"
|
|
|
|
// callback data for group commands
|
|
typedef struct _group_data
|
|
{
|
|
char* name;
|
|
char* group;
|
|
} GroupData;
|
|
|
|
// id handlers
|
|
static int _group_add_id_handler(xmpp_stanza_t* const stanza, void* const userdata);
|
|
static int _group_remove_id_handler(xmpp_stanza_t* const stanza, void* const userdata);
|
|
static void _free_group_data(GroupData* data);
|
|
|
|
void
|
|
roster_request(void)
|
|
{
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
xmpp_stanza_t* iq = stanza_create_roster_iq(ctx);
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
void
|
|
roster_send_add_new(const char* const barejid, const char* const name)
|
|
{
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
auto_char char* id = connection_create_stanza_id();
|
|
xmpp_stanza_t* iq = stanza_create_roster_set(ctx, id, barejid, name, NULL);
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
void
|
|
roster_send_remove(const char* const barejid)
|
|
{
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
xmpp_stanza_t* iq = stanza_create_roster_remove_set(ctx, barejid);
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
void
|
|
roster_send_name_change(const char* const barejid, const char* const new_name, GSList* groups)
|
|
{
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
auto_char char* id = connection_create_stanza_id();
|
|
xmpp_stanza_t* iq = stanza_create_roster_set(ctx, id, barejid, new_name, groups);
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
void
|
|
roster_send_add_to_group(const char* const group, PContact contact)
|
|
{
|
|
GSList* groups = p_contact_groups(contact);
|
|
GSList* new_groups = NULL;
|
|
while (groups) {
|
|
new_groups = g_slist_append(new_groups, strdup(groups->data));
|
|
groups = g_slist_next(groups);
|
|
}
|
|
|
|
new_groups = g_slist_append(new_groups, strdup(group));
|
|
// add an id handler to handle the response
|
|
auto_char char* unique_id = connection_create_stanza_id();
|
|
GroupData* data = g_new0(GroupData, 1);
|
|
data->group = strdup(group);
|
|
if (p_contact_name(contact)) {
|
|
data->name = strdup(p_contact_name(contact));
|
|
} else {
|
|
data->name = strdup(p_contact_barejid(contact));
|
|
}
|
|
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
iq_id_handler_add(unique_id, _group_add_id_handler, (ProfIqFreeCallback)_free_group_data, data);
|
|
xmpp_stanza_t* iq = stanza_create_roster_set(ctx, unique_id, p_contact_barejid(contact),
|
|
p_contact_name(contact), new_groups);
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
static int
|
|
_group_add_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
|
|
{
|
|
if (userdata) {
|
|
GroupData* data = userdata;
|
|
ui_group_added(data->name, data->group);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
roster_send_remove_from_group(const char* const group, PContact contact)
|
|
{
|
|
GSList* groups = p_contact_groups(contact);
|
|
GSList* new_groups = NULL;
|
|
while (groups) {
|
|
if (strcmp(groups->data, group) != 0) {
|
|
new_groups = g_slist_append(new_groups, strdup(groups->data));
|
|
}
|
|
groups = g_slist_next(groups);
|
|
}
|
|
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
|
|
// add an id handler to handle the response
|
|
auto_char char* unique_id = connection_create_stanza_id();
|
|
GroupData* data = g_new0(GroupData, 1);
|
|
data->group = strdup(group);
|
|
if (p_contact_name(contact)) {
|
|
data->name = strdup(p_contact_name(contact));
|
|
} else {
|
|
data->name = strdup(p_contact_barejid(contact));
|
|
}
|
|
|
|
iq_id_handler_add(unique_id, _group_remove_id_handler, (ProfIqFreeCallback)_free_group_data, data);
|
|
xmpp_stanza_t* iq = stanza_create_roster_set(ctx, unique_id, p_contact_barejid(contact),
|
|
p_contact_name(contact), new_groups);
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
static int
|
|
_group_remove_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
|
|
{
|
|
if (userdata) {
|
|
GroupData* data = userdata;
|
|
ui_group_removed(data->name, data->group);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
roster_set_handler(xmpp_stanza_t* const stanza)
|
|
{
|
|
xmpp_stanza_t* query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
|
|
xmpp_stanza_t* item = xmpp_stanza_get_child_by_name(query, STANZA_NAME_ITEM);
|
|
|
|
if (item == NULL) {
|
|
return;
|
|
}
|
|
|
|
// if from attribute exists and it is not current users barejid, ignore push
|
|
const char* from = xmpp_stanza_get_from(stanza);
|
|
if (from && !equals_our_barejid(from)) {
|
|
log_warning("Received alleged roster push from: %s", from);
|
|
return;
|
|
}
|
|
|
|
const char* barejid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
|
|
auto_gchar gchar* barejid_lower = g_utf8_strdown(barejid, -1);
|
|
const char* name = xmpp_stanza_get_attribute(item, STANZA_ATTR_NAME);
|
|
const char* sub = xmpp_stanza_get_attribute(item, STANZA_ATTR_SUBSCRIPTION);
|
|
const char* ask = xmpp_stanza_get_attribute(item, STANZA_ATTR_ASK);
|
|
|
|
// do not set nickname to empty string, set to NULL instead
|
|
if (name && (strlen(name) == 0)) {
|
|
name = NULL;
|
|
}
|
|
|
|
// remove from roster
|
|
if (g_strcmp0(sub, "remove") == 0) {
|
|
// remove barejid and name
|
|
if (name == NULL) {
|
|
name = barejid_lower;
|
|
}
|
|
roster_remove(name, barejid_lower);
|
|
ui_roster_remove(barejid_lower);
|
|
|
|
// otherwise update local roster
|
|
} else {
|
|
|
|
// check for pending out subscriptions
|
|
gboolean pending_out = FALSE;
|
|
if (ask && (strcmp(ask, "subscribe") == 0)) {
|
|
pending_out = TRUE;
|
|
}
|
|
|
|
GSList* groups = roster_get_groups_from_item(item);
|
|
|
|
// update the local roster
|
|
PContact contact = roster_get_contact(barejid_lower);
|
|
if (contact == NULL) {
|
|
gboolean added = roster_add(barejid_lower, name, groups, sub, pending_out);
|
|
if (added) {
|
|
ui_roster_add(barejid_lower, name);
|
|
}
|
|
} else {
|
|
sv_ev_roster_update(barejid_lower, name, groups, sub, pending_out);
|
|
}
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
void
|
|
roster_result_handler(xmpp_stanza_t* const stanza)
|
|
{
|
|
const char* id = xmpp_stanza_get_id(stanza);
|
|
|
|
if (g_strcmp0(id, "roster") != 0) {
|
|
return;
|
|
}
|
|
|
|
// handle initial roster response
|
|
xmpp_stanza_t* query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
|
|
xmpp_stanza_t* item = xmpp_stanza_get_children(query);
|
|
|
|
while (item) {
|
|
const char* barejid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
|
|
auto_gchar gchar* barejid_lower = g_utf8_strdown(barejid, -1);
|
|
const char* name = xmpp_stanza_get_attribute(item, STANZA_ATTR_NAME);
|
|
const char* sub = xmpp_stanza_get_attribute(item, STANZA_ATTR_SUBSCRIPTION);
|
|
|
|
// do not set nickname to empty string, set to NULL instead
|
|
if (name && (strlen(name) == 0))
|
|
name = NULL;
|
|
|
|
gboolean pending_out = FALSE;
|
|
const char* ask = xmpp_stanza_get_attribute(item, STANZA_ATTR_ASK);
|
|
if (g_strcmp0(ask, "subscribe") == 0) {
|
|
pending_out = TRUE;
|
|
}
|
|
|
|
GSList* groups = roster_get_groups_from_item(item);
|
|
|
|
gboolean added = roster_add(barejid_lower, name, groups, sub, pending_out);
|
|
if (!added) {
|
|
log_warning("Attempt to add contact twice: %s", barejid_lower);
|
|
}
|
|
|
|
item = xmpp_stanza_get_next(item);
|
|
}
|
|
|
|
sv_ev_roster_received();
|
|
|
|
return;
|
|
}
|
|
|
|
GSList*
|
|
roster_get_groups_from_item(xmpp_stanza_t* item)
|
|
{
|
|
GSList* groups = NULL;
|
|
xmpp_stanza_t* group_element = xmpp_stanza_get_children(item);
|
|
|
|
while (group_element) {
|
|
if (strcmp(xmpp_stanza_get_name(group_element), STANZA_NAME_GROUP) == 0) {
|
|
char* groupname = xmpp_stanza_get_text(group_element);
|
|
if (groupname) {
|
|
groups = g_slist_append(groups, groupname);
|
|
}
|
|
}
|
|
group_element = xmpp_stanza_get_next(group_element);
|
|
}
|
|
|
|
return groups;
|
|
}
|
|
|
|
static void
|
|
_free_group_data(GroupData* data)
|
|
{
|
|
if (data) {
|
|
free(data->group);
|
|
free(data->name);
|
|
free(data);
|
|
}
|
|
}
|