mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-23 17:56:21 +00:00
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>
246 lines
9.0 KiB
C
246 lines
9.0 KiB
C
/*
|
|
* occupantswin.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 <assert.h>
|
|
|
|
#include "config/preferences.h"
|
|
#include "ui/ui.h"
|
|
#include "ui/window.h"
|
|
#include "ui/window_list.h"
|
|
|
|
static void
|
|
_occuptantswin_occupant(ProfLayoutSplit* layout, GList* item, gboolean showjid, gboolean isoffline)
|
|
{
|
|
int colour = 0; // init to workaround compiler warning
|
|
theme_item_t presence_colour = THEME_ROSTER_ONLINE; // init to workaround compiler warning
|
|
Occupant* occupant = item->data;
|
|
|
|
if (isoffline) {
|
|
wattron(layout->subwin, theme_attrs(THEME_ROSTER_OFFLINE));
|
|
} else if (prefs_get_boolean(PREF_OCCUPANTS_COLOR_NICK)) {
|
|
colour = theme_hash_attrs(occupant->nick);
|
|
|
|
wattron(layout->subwin, colour);
|
|
} else {
|
|
const char* presence_str = string_from_resource_presence(occupant->presence);
|
|
presence_colour = theme_main_presence_attrs(presence_str);
|
|
|
|
wattron(layout->subwin, theme_attrs(presence_colour));
|
|
}
|
|
|
|
GString* spaces = g_string_new(" ");
|
|
|
|
gint indent = prefs_get_occupants_indent();
|
|
gint current_indent = 0;
|
|
if (indent > 0) {
|
|
current_indent += indent;
|
|
while (indent > 0) {
|
|
g_string_append(spaces, " ");
|
|
indent--;
|
|
}
|
|
}
|
|
|
|
GString* msg = g_string_new(spaces->str);
|
|
|
|
auto_gchar gchar* ch = prefs_get_occupants_char();
|
|
if (ch) {
|
|
g_string_append_printf(msg, "%s", ch);
|
|
}
|
|
|
|
gboolean wrap = prefs_get_boolean(PREF_OCCUPANTS_WRAP);
|
|
|
|
if (isoffline) {
|
|
auto_jid Jid* jid = jid_create(item->data);
|
|
g_string_append(msg, jid->barejid);
|
|
} else {
|
|
g_string_append(msg, occupant->nick);
|
|
}
|
|
win_sub_newline_lazy(layout->subwin);
|
|
win_sub_print(layout->subwin, msg->str, FALSE, wrap, current_indent);
|
|
g_string_free(msg, TRUE);
|
|
|
|
if (showjid && !isoffline && occupant->jid) {
|
|
GString* msg = g_string_new(spaces->str);
|
|
g_string_append(msg, " ");
|
|
|
|
g_string_append(msg, occupant->jid);
|
|
win_sub_newline_lazy(layout->subwin);
|
|
win_sub_print(layout->subwin, msg->str, FALSE, wrap, current_indent);
|
|
g_string_free(msg, TRUE);
|
|
}
|
|
|
|
g_string_free(spaces, TRUE);
|
|
|
|
if (isoffline) {
|
|
wattroff(layout->subwin, theme_attrs(THEME_ROSTER_OFFLINE));
|
|
} else if (prefs_get_boolean(PREF_OCCUPANTS_COLOR_NICK)) {
|
|
wattroff(layout->subwin, colour);
|
|
} else {
|
|
wattroff(layout->subwin, theme_attrs(presence_colour));
|
|
}
|
|
}
|
|
|
|
void
|
|
occupantswin_occupants(const char* const roomjid)
|
|
{
|
|
ProfMucWin* mucwin = wins_get_muc(roomjid);
|
|
if (mucwin) {
|
|
GList* occupants = muc_roster(roomjid);
|
|
if (occupants) {
|
|
ProfLayoutSplit* layout = (ProfLayoutSplit*)mucwin->window.layout;
|
|
assert(layout->memcheck == LAYOUT_SPLIT_MEMCHECK);
|
|
|
|
werase(layout->subwin);
|
|
|
|
GString* prefix = g_string_new(" ");
|
|
|
|
auto_gchar gchar* ch = prefs_get_occupants_header_char();
|
|
if (ch) {
|
|
g_string_append_printf(prefix, "%s", ch);
|
|
}
|
|
|
|
if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) {
|
|
|
|
GList* online_occupants = { NULL };
|
|
|
|
GString* role = g_string_new(prefix->str);
|
|
g_string_append(role, "Moderators");
|
|
|
|
wattron(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
win_sub_newline_lazy(layout->subwin);
|
|
win_sub_print(layout->subwin, role->str, TRUE, FALSE, 0);
|
|
wattroff(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
g_string_free(role, TRUE);
|
|
GList* roster_curr = occupants;
|
|
while (roster_curr) {
|
|
Occupant* occupant = roster_curr->data;
|
|
if (occupant->role == MUC_ROLE_MODERATOR) {
|
|
_occuptantswin_occupant(layout, roster_curr, mucwin->showjid, false);
|
|
}
|
|
roster_curr = g_list_next(roster_curr);
|
|
online_occupants = g_list_append(online_occupants, occupant->jid);
|
|
}
|
|
|
|
role = g_string_new(prefix->str);
|
|
g_string_append(role, "Participants");
|
|
|
|
wattron(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
win_sub_newline_lazy(layout->subwin);
|
|
win_sub_print(layout->subwin, role->str, TRUE, FALSE, 0);
|
|
wattroff(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
g_string_free(role, TRUE);
|
|
roster_curr = occupants;
|
|
while (roster_curr) {
|
|
Occupant* occupant = roster_curr->data;
|
|
if (occupant->role == MUC_ROLE_PARTICIPANT) {
|
|
_occuptantswin_occupant(layout, roster_curr, mucwin->showjid, false);
|
|
}
|
|
roster_curr = g_list_next(roster_curr);
|
|
online_occupants = g_list_append(online_occupants, occupant->jid);
|
|
}
|
|
|
|
role = g_string_new(prefix->str);
|
|
g_string_append(role, "Visitors");
|
|
|
|
wattron(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
win_sub_newline_lazy(layout->subwin);
|
|
win_sub_print(layout->subwin, role->str, TRUE, FALSE, 0);
|
|
wattroff(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
g_string_free(role, TRUE);
|
|
roster_curr = occupants;
|
|
while (roster_curr) {
|
|
Occupant* occupant = roster_curr->data;
|
|
if (occupant->role == MUC_ROLE_VISITOR) {
|
|
_occuptantswin_occupant(layout, roster_curr, mucwin->showjid, false);
|
|
}
|
|
roster_curr = g_list_next(roster_curr);
|
|
online_occupants = g_list_append(online_occupants, occupant->jid);
|
|
}
|
|
|
|
if (mucwin->showoffline) {
|
|
GList* members = muc_members(roomjid);
|
|
// offline_occupants is used to display the same account on multiple devices once
|
|
GList* offline_occupants = { NULL };
|
|
|
|
role = g_string_new(prefix->str);
|
|
g_string_append(role, "Offline");
|
|
|
|
wattron(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
win_sub_newline_lazy(layout->subwin);
|
|
win_sub_print(layout->subwin, role->str, TRUE, FALSE, 0);
|
|
wattroff(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
g_string_free(role, TRUE);
|
|
roster_curr = members;
|
|
while (roster_curr) {
|
|
auto_jid Jid* jid = jid_create(roster_curr->data);
|
|
gboolean found = false;
|
|
GList* iter = online_occupants;
|
|
for (; iter != NULL; iter = iter->next) {
|
|
if (strstr(iter->data, jid->barejid)) {
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!found && g_list_index(offline_occupants, jid->barejid) == -1) {
|
|
_occuptantswin_occupant(layout, roster_curr, mucwin->showjid, true);
|
|
offline_occupants = g_list_append(offline_occupants, jid->barejid);
|
|
}
|
|
|
|
roster_curr = g_list_next(roster_curr);
|
|
}
|
|
g_list_free(members);
|
|
g_list_free(offline_occupants);
|
|
}
|
|
g_list_free(online_occupants);
|
|
|
|
} else {
|
|
GString* role = g_string_new(prefix->str);
|
|
g_string_append(role, "Occupants\n");
|
|
|
|
wattron(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
win_sub_newline_lazy(layout->subwin);
|
|
win_sub_print(layout->subwin, role->str, TRUE, FALSE, 0);
|
|
wattroff(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
|
|
g_string_free(role, TRUE);
|
|
|
|
GList* roster_curr = occupants;
|
|
while (roster_curr) {
|
|
_occuptantswin_occupant(layout, roster_curr, mucwin->showjid, false);
|
|
roster_curr = g_list_next(roster_curr);
|
|
}
|
|
}
|
|
|
|
g_string_free(prefix, TRUE);
|
|
}
|
|
|
|
g_list_free(occupants);
|
|
}
|
|
}
|
|
|
|
void
|
|
occupantswin_occupants_all(void)
|
|
{
|
|
GList* rooms = muc_rooms();
|
|
GList* curr = rooms;
|
|
|
|
while (curr) {
|
|
char* roomjid = curr->data;
|
|
ProfMucWin* mw = wins_get_muc(roomjid);
|
|
if (mw != NULL) {
|
|
mucwin_update_occupants(mw);
|
|
}
|
|
|
|
curr = g_list_next(curr);
|
|
}
|
|
}
|