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>
This commit is contained in:
2026-05-26 17:48:14 +00:00
parent 3b673150b4
commit 72f4f186da
303 changed files with 10658 additions and 9857 deletions

View File

@@ -4,33 +4,7 @@
*
* Copyright (C) 2022 Marouane L. <techmetx11@disroot.org>
*
* This file is part of Profanity.
*
* Profanity is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Profanity is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Profanity. If not, see <https://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders give permission to
* link the code of portions of this program with the OpenSSL library under
* certain conditions as described in each individual source file, and
* distribute linked combinations including the two.
*
* You must obey the GNU General Public License in all respects for all of the
* code used other than OpenSSL. If you modify file(s) with this exception, you
* may extend this exception to your version of the file(s), but you are not
* obligated to do so. If you do not wish to do so, delete this exception
* statement from your version. If you delete this exception statement from all
* source files in the program, then also delete it here.
*
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
*/
#include <assert.h>
@@ -59,7 +33,7 @@ typedef struct
// for photo
int photo_index;
gboolean open;
char* filename;
gchar* filename;
} _userdata;
static void
@@ -209,7 +183,7 @@ vcard_free_full(vCard* vcard)
vCard*
vcard_new(void)
{
vCard* vcard = calloc(1, sizeof(vCard));
vCard* vcard = g_new0(vCard, 1);
if (!vcard) {
return NULL;
@@ -238,10 +212,10 @@ _free_userdata(_userdata* data)
vcard_free(data->vcard);
if (data->filename) {
free(data->filename);
g_free(data->filename);
}
free(data);
g_free(data);
}
// Function must be called with <vCard> root element
@@ -287,7 +261,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
vcard->name.suffix = child_pointer2 ? stanza_text_strdup(child_pointer2) : NULL;
flags |= 2;
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "NICKNAME")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -304,7 +278,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "PHOTO")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -346,7 +320,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
}
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "BDAY")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -392,7 +366,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
}
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "ADR")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -438,7 +412,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
element->address.country = child_pointer2 ? stanza_text_strdup(child_pointer2) : NULL;
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "TEL")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -494,7 +468,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
element->telephone.number = stanza_text_strdup(child_pointer2);
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "EMAIL")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -526,7 +500,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
element->email.userid = stanza_text_strdup(child_pointer2);
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "JABBERID")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -543,7 +517,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "TITLE")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -560,7 +534,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "ROLE")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -577,7 +551,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "NOTE")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -594,7 +568,7 @@ vcard_parse(xmpp_stanza_t* vcard_xml, vCard* vcard)
g_queue_push_tail(vcard->elements, element);
} else if (!g_strcmp0(xmpp_stanza_get_name(child_pointer), "URL")) {
vcard_element_t* element = calloc(1, sizeof(vcard_element_t));
vcard_element_t* element = g_new0(vcard_element_t, 1);
if (!element) {
// Allocation failed
continue;
@@ -1227,12 +1201,10 @@ vcard_print(xmpp_ctx_t* ctx, ProfWin* window, char* jid)
return;
}
_userdata* data = calloc(1, sizeof(_userdata));
_userdata* data = g_new0(_userdata, 1);
data->vcard = vcard_new();
if (!data || !data->vcard) {
if (data) {
free(data);
}
if (!data->vcard) {
g_free(data);
cons_show("vCard allocation failed");
return;
@@ -1338,7 +1310,7 @@ _vcard_photo_result(xmpp_stanza_t* const stanza, void* userdata)
g_string_append(filename, ".webp");
}
GError* err = NULL;
auto_gerror GError* err = NULL;
if (!filename) {
cons_show_error("Unable to determine filename for photo");
@@ -1346,8 +1318,7 @@ _vcard_photo_result(xmpp_stanza_t* const stanza, void* userdata)
}
if (g_file_set_contents(filename->str, (gchar*)photo->data, photo->length, &err) == FALSE) {
cons_show_error("Unable to save photo: %s", err->message);
g_error_free(err);
cons_show_error("Unable to save photo: %s", PROF_GERROR_MESSAGE(err));
g_string_free(filename, TRUE);
return 1;
} else {
@@ -1365,7 +1336,7 @@ _vcard_photo_result(xmpp_stanza_t* const stanza, void* userdata)
g_string_append(filename, "\"");
auto_char char* cmd = str_replace(cmdtemplate, "%p", filename->str);
if (g_shell_parse_argv(cmd, &argc, &argv, &err) == FALSE) {
if (g_shell_parse_argv(cmd, &argc, &argv, NULL) == FALSE) {
cons_show_error("Failed to parse command template");
} else {
if (!call_external(argv)) {
@@ -1382,13 +1353,11 @@ _vcard_photo_result(xmpp_stanza_t* const stanza, void* userdata)
void
vcard_photo(xmpp_ctx_t* ctx, char* jid, char* filename, int index, gboolean open)
{
_userdata* data = calloc(1, sizeof(_userdata));
_userdata* data = g_new0(_userdata, 1);
data->vcard = vcard_new();
if (!data || !data->vcard) {
if (data) {
free(data);
}
if (!data->vcard) {
g_free(data);
cons_show("vCard allocation failed");
return;
@@ -1398,7 +1367,7 @@ vcard_photo(xmpp_ctx_t* ctx, char* jid, char* filename, int index, gboolean open
data->open = open;
if (filename) {
data->filename = strdup(filename);
data->filename = g_strdup(filename);
}
auto_char char* id = connection_create_stanza_id();