devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-19 04:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
b208e48ee1daa9ded411890aedf528fb063f2574
profanity/src/ui/confwin.c
Jabber Developer 72f4f186da merge: sync upstream profanity-im/profanity 
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>
2026-05-26 17:48:14 +00:00

313 lines
11 KiB
C
Raw Blame History

/*
* confwin.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 "ui/ui.h"
#include "ui/window.h"
#include "ui/win_types.h"
#include "ui/window_list.h"
static void _confwin_form_field(ProfWin* window, char* tag, FormField* field);
void
confwin_show_form(ProfConfWin* confwin)
{
ProfWin* window = (ProfWin*)confwin;
if (confwin->form->title) {
win_print(window, THEME_DEFAULT, "-", "Form title: ");
win_appendln(window, THEME_DEFAULT, "%s", confwin->form->title);
} else {
win_println(window, THEME_DEFAULT, "-", "Configuration for room %s.", confwin->roomjid);
}
win_println(window, THEME_DEFAULT, "-", "");
confwin_form_help(confwin);
GSList* fields = confwin->form->fields;
GSList* curr_field = fields;
while (curr_field) {
FormField* field = curr_field->data;
if ((g_strcmp0(field->type, "fixed") == 0) && field->values) {
if (field->values) {
char* value = field->values->data;
win_println(window, THEME_DEFAULT, "-", "%s", value);
}
} else if (g_strcmp0(field->type, "hidden") != 0 && field->var) {
gchar* tag = g_hash_table_lookup(confwin->form->var_to_tag, field->var);
_confwin_form_field(window, tag, field);
}
curr_field = g_slist_next(curr_field);
}
}
void
confwin_show_form_field(ProfConfWin* confwin, DataForm* form, char* tag)
{
assert(confwin != NULL);
FormField* field = form_get_field_by_tag(form, tag);
ProfWin* window = (ProfWin*)confwin;
_confwin_form_field(window, tag, field);
win_println(window, THEME_DEFAULT, "-", "");
}
void
confwin_handle_configuration(ProfConfWin* confwin, DataForm* form)
{
assert(confwin != NULL);
ProfWin* window = (ProfWin*)confwin;
ui_focus_win(window);
confwin_show_form(confwin);
win_println(window, THEME_DEFAULT, "-", "");
if (confwin->submit != NULL) {
win_println(window, THEME_DEFAULT, "-", "Use '/form submit' to save changes.");
}
win_println(window, THEME_DEFAULT, "-", "Use '/form cancel' to cancel changes.");
win_println(window, THEME_DEFAULT, "-", "See '/form help' for more information.");
win_println(window, THEME_DEFAULT, "-", "");
}
void
confwin_field_help(ProfConfWin* confwin, char* tag)
{
assert(confwin != NULL);
ProfWin* window = (ProfWin*)confwin;
FormField* field = form_get_field_by_tag(confwin->form, tag);
if (field) {
win_print(window, THEME_DEFAULT, "-", "%s", field->label);
if (field->required) {
win_appendln(window, THEME_DEFAULT, " (Required):");
} else {
win_appendln(window, THEME_DEFAULT, ":");
}
if (field->description) {
win_println(window, THEME_DEFAULT, "-", " Description : %s", field->description);
}
win_println(window, THEME_DEFAULT, "-", " Type : %s", field->type);
int num_values = 0;
GSList* curr_option = NULL;
FormOption* option = NULL;
switch (field->type_t) {
case FIELD_TEXT_SINGLE:
case FIELD_TEXT_PRIVATE:
win_println(window, THEME_DEFAULT, "-", " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is any text");
break;
case FIELD_TEXT_MULTI:
num_values = form_get_value_count(confwin->form, tag);
win_println(window, THEME_DEFAULT, "-", " Add : /%s add <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is any text");
if (num_values > 0) {
win_println(window, THEME_DEFAULT, "-", " Remove : /%s remove <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> between 'val1' and 'val%d'", num_values);
}
break;
case FIELD_BOOLEAN:
win_println(window, THEME_DEFAULT, "-", " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is either 'on' or 'off'");
break;
case FIELD_LIST_SINGLE:
win_println(window, THEME_DEFAULT, "-", " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is one of");
curr_option = field->options;
while (curr_option) {
option = curr_option->data;
win_println(window, THEME_DEFAULT, "-", " %s", option->value);
curr_option = g_slist_next(curr_option);
}
break;
case FIELD_LIST_MULTI:
win_println(window, THEME_DEFAULT, "-", " Add : /%s add <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Remove : /%s remove <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is one of");
curr_option = field->options;
while (curr_option) {
option = curr_option->data;
win_println(window, THEME_DEFAULT, "-", " %s", option->value);
curr_option = g_slist_next(curr_option);
}
break;
case FIELD_JID_SINGLE:
win_println(window, THEME_DEFAULT, "-", " Set : /%s <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is a valid Jabber ID");
break;
case FIELD_JID_MULTI:
win_println(window, THEME_DEFAULT, "-", " Add : /%s add <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Remove : /%s remove <value>", tag);
win_println(window, THEME_DEFAULT, "-", " Where : <value> is a valid Jabber ID");
break;
case FIELD_FIXED:
case FIELD_UNKNOWN:
case FIELD_HIDDEN:
default:
break;
}
} else {
win_println(window, THEME_DEFAULT, "-", "No such field %s", tag);
}
}
void
confwin_form_help(ProfConfWin* confwin)
{
assert(confwin != NULL);
if (confwin->form->instructions) {
ProfWin* window = (ProfWin*)confwin;
win_println(window, THEME_DEFAULT, "-", "Supplied instructions:");
win_println(window, THEME_DEFAULT, "-", "%s", confwin->form->instructions);
win_println(window, THEME_DEFAULT, "-", "");
}
}
static void
_confwin_form_field(ProfWin* window, char* tag, FormField* field)
{
win_print(window, THEME_AWAY, "-", "[%s] ", tag);
win_append(window, THEME_DEFAULT, "%s", field->label);
if (field->required) {
win_append(window, THEME_DEFAULT, " (required): ");
} else {
win_append(window, THEME_DEFAULT, ": ");
}
GSList* curr_value = field->values;
GSList* curr_option;
switch (field->type_t) {
case FIELD_HIDDEN:
break;
case FIELD_TEXT_SINGLE:
if (curr_value) {
char* value = curr_value->data;
if (value) {
if (g_strcmp0(field->var, "muc#roomconfig_roomsecret") == 0) {
win_append(window, THEME_ONLINE, "[hidden]");
} else {
win_append(window, THEME_ONLINE, "%s", value);
}
}
}
win_newline(window);
break;
case FIELD_TEXT_PRIVATE:
if (curr_value) {
char* value = curr_value->data;
if (value) {
win_append(window, THEME_ONLINE, "[hidden]");
}
}
win_newline(window);
break;
case FIELD_TEXT_MULTI:
win_newline(window);
int index = 1;
while (curr_value) {
char* value = curr_value->data;
GString* val_tag = g_string_new("");
g_string_printf(val_tag, "val%d", index++);
win_println(window, THEME_ONLINE, "-", " [%s] %s", val_tag->str, value);
g_string_free(val_tag, TRUE);
curr_value = g_slist_next(curr_value);
}
break;
case FIELD_BOOLEAN:
if (curr_value == NULL) {
win_appendln(window, THEME_OFFLINE, "FALSE");
} else {
char* value = curr_value->data;
if (value == NULL) {
win_appendln(window, THEME_OFFLINE, "FALSE");
} else {
if (g_strcmp0(value, "0") == 0 || g_strcmp0(value, "false") == 0) {
win_appendln(window, THEME_OFFLINE, "FALSE");
} else {
win_appendln(window, THEME_ONLINE, "TRUE");
}
}
}
break;
case FIELD_LIST_SINGLE:
win_newline(window);
char* value = curr_value ? curr_value->data : NULL;
curr_option = field->options;
while (curr_option) {
FormOption* option = curr_option->data;
if (g_strcmp0(option->value, value) == 0) {
win_println(window, THEME_ONLINE, "-", " [%s] %s", option->value, option->label);
} else {
win_println(window, THEME_OFFLINE, "-", " [%s] %s", option->value, option->label);
}
curr_option = g_slist_next(curr_option);
}
break;
case FIELD_LIST_MULTI:
win_newline(window);
curr_option = field->options;
while (curr_option) {
FormOption* option = curr_option->data;
if (g_slist_find_custom(curr_value, option->value, (GCompareFunc)g_strcmp0)) {
win_println(window, THEME_ONLINE, "-", " [%s] %s", option->value, option->label);
} else {
win_println(window, THEME_OFFLINE, "-", " [%s] %s", option->value, option->label);
}
curr_option = g_slist_next(curr_option);
}
break;
case FIELD_JID_SINGLE:
if (curr_value) {
char* value = curr_value->data;
if (value) {
win_append(window, THEME_ONLINE, "%s", value);
}
}
win_newline(window);
break;
case FIELD_JID_MULTI:
win_newline(window);
while (curr_value) {
char* value = curr_value->data;
win_println(window, THEME_ONLINE, "-", " %s", value);
curr_value = g_slist_next(curr_value);
}
break;
case FIELD_FIXED:
if (curr_value) {
char* value = curr_value->data;
if (value) {
win_append(window, THEME_DEFAULT, "%s", value);
}
}
win_newline(window);
break;
default:
break;
}
}
gchar*
confwin_get_string(ProfConfWin* confwin)
{
assert(confwin != NULL);
return win_get_title((ProfWin*)confwin);
}
Reference in New Issue View Git Blame Copy Permalink