merge: sync upstream profanity-im/profanity
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
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>
This commit is contained in:
@@ -4,33 +4,7 @@
|
||||
*
|
||||
* Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
|
||||
*
|
||||
* 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 <string.h>
|
||||
@@ -108,7 +82,7 @@ void
|
||||
plugins_init(void)
|
||||
{
|
||||
prof_add_shutdown_routine(_plugins_shutdown);
|
||||
plugins = g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL);
|
||||
plugins = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
|
||||
callbacks_init();
|
||||
autocompleters_init();
|
||||
plugin_themes_init();
|
||||
@@ -126,14 +100,14 @@ plugins_init(void)
|
||||
if (!plugins_pref) {
|
||||
return;
|
||||
}
|
||||
for (int i = 0; i < g_strv_length(plugins_pref); i++) {
|
||||
for (guint i = 0; i < g_strv_length(plugins_pref); i++) {
|
||||
gboolean loaded = FALSE;
|
||||
gchar* filename = plugins_pref[i];
|
||||
#ifdef HAVE_PYTHON
|
||||
if (g_str_has_suffix(filename, ".py")) {
|
||||
ProfPlugin* plugin = python_plugin_create(filename);
|
||||
if (plugin) {
|
||||
g_hash_table_insert(plugins, strdup(filename), plugin);
|
||||
g_hash_table_insert(plugins, g_strdup(filename), plugin);
|
||||
loaded = TRUE;
|
||||
}
|
||||
}
|
||||
@@ -142,7 +116,7 @@ plugins_init(void)
|
||||
if (g_str_has_suffix(filename, ".so")) {
|
||||
ProfPlugin* plugin = c_plugin_create(filename);
|
||||
if (plugin) {
|
||||
g_hash_table_insert(plugins, strdup(filename), plugin);
|
||||
g_hash_table_insert(plugins, g_strdup(filename), plugin);
|
||||
loaded = TRUE;
|
||||
}
|
||||
}
|
||||
@@ -171,14 +145,14 @@ plugins_free_install_result(PluginsInstallResult* result)
|
||||
if (!result) {
|
||||
return;
|
||||
}
|
||||
g_slist_free_full(result->installed, free);
|
||||
g_slist_free_full(result->failed, free);
|
||||
g_slist_free_full(result->installed, g_free);
|
||||
g_slist_free_full(result->failed, g_free);
|
||||
}
|
||||
|
||||
PluginsInstallResult*
|
||||
plugins_install_all(const char* const path)
|
||||
{
|
||||
PluginsInstallResult* result = malloc(sizeof(PluginsInstallResult));
|
||||
PluginsInstallResult* result = g_new0(PluginsInstallResult, 1);
|
||||
result->installed = NULL;
|
||||
result->failed = NULL;
|
||||
GSList* contents = NULL;
|
||||
@@ -191,9 +165,9 @@ plugins_install_all(const char* const path)
|
||||
if (g_str_has_suffix(curr->data, ".py") || g_str_has_suffix(curr->data, ".so")) {
|
||||
gchar* plugin_name = g_path_get_basename(curr->data);
|
||||
if (plugins_install(plugin_name, curr->data, error_message)) {
|
||||
result->installed = g_slist_append(result->installed, strdup(curr->data));
|
||||
result->installed = g_slist_append(result->installed, g_strdup(curr->data));
|
||||
} else {
|
||||
result->failed = g_slist_append(result->failed, strdup(curr->data));
|
||||
result->failed = g_slist_append(result->failed, g_strdup(curr->data));
|
||||
}
|
||||
}
|
||||
curr = g_slist_next(curr);
|
||||
@@ -214,10 +188,8 @@ plugins_uninstall(const char* const plugin_name)
|
||||
g_string_append(target_path, "/");
|
||||
g_string_append(target_path, plugin_name);
|
||||
GFile* file = g_file_new_for_path(target_path->str);
|
||||
GError* error = NULL;
|
||||
gboolean result = g_file_delete(file, NULL, &error);
|
||||
gboolean result = g_file_delete(file, NULL, NULL);
|
||||
g_object_unref(file);
|
||||
g_error_free(error);
|
||||
g_string_free(target_path, TRUE);
|
||||
return result;
|
||||
}
|
||||
@@ -255,7 +227,7 @@ plugins_load_all(void)
|
||||
while (curr) {
|
||||
error_message = g_string_new(NULL);
|
||||
if (plugins_load(curr->data, error_message)) {
|
||||
loaded = g_slist_append(loaded, strdup(curr->data));
|
||||
loaded = g_slist_append(loaded, g_strdup(curr->data));
|
||||
}
|
||||
curr = g_slist_next(curr);
|
||||
g_string_free(error_message, TRUE);
|
||||
@@ -290,7 +262,7 @@ plugins_load(const char* const name, GString* error_message)
|
||||
#endif
|
||||
}
|
||||
if (plugin) {
|
||||
g_hash_table_insert(plugins, strdup(name), plugin);
|
||||
g_hash_table_insert(plugins, g_strdup(name), plugin);
|
||||
if (connection_get_status() == JABBER_CONNECTED) {
|
||||
plugin->init_func(plugin, PACKAGE_VERSION, PACKAGE_STATUS, session_get_account_name(), connection_get_fulljid());
|
||||
} else {
|
||||
@@ -313,7 +285,7 @@ plugins_unload_all(void)
|
||||
GList* plugin_names_dup = NULL;
|
||||
GList* curr = plugin_names;
|
||||
while (curr) {
|
||||
plugin_names_dup = g_list_append(plugin_names_dup, strdup(curr->data));
|
||||
plugin_names_dup = g_list_append(plugin_names_dup, g_strdup(curr->data));
|
||||
curr = g_list_next(curr);
|
||||
}
|
||||
g_list_free(plugin_names);
|
||||
@@ -326,7 +298,7 @@ plugins_unload_all(void)
|
||||
curr = g_list_next(curr);
|
||||
}
|
||||
|
||||
g_list_free_full(plugin_names_dup, free);
|
||||
g_list_free_full(plugin_names_dup, g_free);
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -368,7 +340,7 @@ plugins_reload_all(void)
|
||||
GList* plugin_names_dup = NULL;
|
||||
GList* curr = plugin_names;
|
||||
while (curr) {
|
||||
plugin_names_dup = g_list_append(plugin_names_dup, strdup(curr->data));
|
||||
plugin_names_dup = g_list_append(plugin_names_dup, g_strdup(curr->data));
|
||||
curr = g_list_next(curr);
|
||||
}
|
||||
g_list_free(plugin_names);
|
||||
@@ -382,7 +354,7 @@ plugins_reload_all(void)
|
||||
curr = g_list_next(curr);
|
||||
}
|
||||
|
||||
g_list_free_full(plugin_names_dup, free);
|
||||
g_list_free_full(plugin_names_dup, g_free);
|
||||
}
|
||||
|
||||
gboolean
|
||||
@@ -411,7 +383,7 @@ _plugins_unloaded_list_dir(const gchar* const dir, GSList** result)
|
||||
while (plugin) {
|
||||
ProfPlugin* found = g_hash_table_lookup(plugins, plugin);
|
||||
if ((g_str_has_suffix(plugin, ".so") || g_str_has_suffix(plugin, ".py")) && !found) {
|
||||
*result = g_slist_append(*result, strdup(plugin));
|
||||
*result = g_slist_append(*result, g_strdup(plugin));
|
||||
}
|
||||
plugin = g_dir_read_name(plugins_dir);
|
||||
}
|
||||
@@ -522,15 +494,15 @@ plugins_pre_chat_message_display(const char* const barejid, const char* const re
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char* new_message = NULL;
|
||||
char* curr_message = strdup(message);
|
||||
gchar* new_message = NULL;
|
||||
gchar* curr_message = g_strdup(message);
|
||||
|
||||
GList* curr = values;
|
||||
while (curr) {
|
||||
ProfPlugin* plugin = curr->data;
|
||||
new_message = plugin->pre_chat_message_display(plugin, barejid, resource, curr_message);
|
||||
if (new_message) {
|
||||
free(curr_message);
|
||||
g_free(curr_message);
|
||||
curr_message = new_message;
|
||||
}
|
||||
curr = g_list_next(curr);
|
||||
@@ -561,15 +533,15 @@ plugins_pre_chat_message_send(const char* const barejid, const char* message)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char* new_message = NULL;
|
||||
char* curr_message = strdup(message);
|
||||
gchar* new_message = NULL;
|
||||
gchar* curr_message = g_strdup(message);
|
||||
|
||||
GList* curr = values;
|
||||
while (curr) {
|
||||
ProfPlugin* plugin = curr->data;
|
||||
if (plugin->contains_hook(plugin, "prof_pre_chat_message_send")) {
|
||||
new_message = plugin->pre_chat_message_send(plugin, barejid, curr_message);
|
||||
free(curr_message);
|
||||
g_free(curr_message);
|
||||
if (new_message) {
|
||||
curr_message = new_message;
|
||||
} else {
|
||||
@@ -606,15 +578,15 @@ plugins_pre_room_message_display(const char* const barejid, const char* const ni
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char* new_message = NULL;
|
||||
char* curr_message = strdup(message);
|
||||
gchar* new_message = NULL;
|
||||
gchar* curr_message = g_strdup(message);
|
||||
|
||||
GList* curr = values;
|
||||
while (curr) {
|
||||
ProfPlugin* plugin = curr->data;
|
||||
new_message = plugin->pre_room_message_display(plugin, barejid, nick, curr_message);
|
||||
if (new_message) {
|
||||
free(curr_message);
|
||||
g_free(curr_message);
|
||||
curr_message = new_message;
|
||||
}
|
||||
curr = g_list_next(curr);
|
||||
@@ -645,15 +617,15 @@ plugins_pre_room_message_send(const char* const barejid, const char* message)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char* new_message = NULL;
|
||||
char* curr_message = strdup(message);
|
||||
gchar* new_message = NULL;
|
||||
gchar* curr_message = g_strdup(message);
|
||||
|
||||
GList* curr = values;
|
||||
while (curr) {
|
||||
ProfPlugin* plugin = curr->data;
|
||||
if (plugin->contains_hook(plugin, "prof_pre_room_message_send")) {
|
||||
new_message = plugin->pre_room_message_send(plugin, barejid, curr_message);
|
||||
free(curr_message);
|
||||
g_free(curr_message);
|
||||
if (new_message) {
|
||||
curr_message = new_message;
|
||||
} else {
|
||||
@@ -702,7 +674,7 @@ plugins_on_room_history_message(const char* const barejid, const char* const nic
|
||||
}
|
||||
g_list_free(values);
|
||||
|
||||
free(timestamp_str);
|
||||
g_free(timestamp_str);
|
||||
}
|
||||
|
||||
char*
|
||||
@@ -714,15 +686,15 @@ plugins_pre_priv_message_display(const char* const fulljid, const char* message)
|
||||
}
|
||||
|
||||
auto_jid Jid* jidp = jid_create(fulljid);
|
||||
char* new_message = NULL;
|
||||
char* curr_message = strdup(message);
|
||||
gchar* new_message = NULL;
|
||||
gchar* curr_message = g_strdup(message);
|
||||
|
||||
GList* curr = values;
|
||||
while (curr) {
|
||||
ProfPlugin* plugin = curr->data;
|
||||
new_message = plugin->pre_priv_message_display(plugin, jidp->barejid, jidp->resourcepart, curr_message);
|
||||
if (new_message) {
|
||||
free(curr_message);
|
||||
g_free(curr_message);
|
||||
curr_message = new_message;
|
||||
}
|
||||
curr = g_list_next(curr);
|
||||
@@ -755,15 +727,15 @@ plugins_pre_priv_message_send(const char* const fulljid, const char* const messa
|
||||
}
|
||||
|
||||
auto_jid Jid* jidp = jid_create(fulljid);
|
||||
char* new_message = NULL;
|
||||
char* curr_message = strdup(message);
|
||||
gchar* new_message = NULL;
|
||||
gchar* curr_message = g_strdup(message);
|
||||
|
||||
GList* curr = values;
|
||||
while (curr) {
|
||||
ProfPlugin* plugin = curr->data;
|
||||
if (plugin->contains_hook(plugin, "prof_pre_priv_message_send")) {
|
||||
new_message = plugin->pre_priv_message_send(plugin, jidp->barejid, jidp->resourcepart, curr_message);
|
||||
free(curr_message);
|
||||
g_free(curr_message);
|
||||
if (new_message) {
|
||||
curr_message = new_message;
|
||||
} else {
|
||||
@@ -803,15 +775,15 @@ plugins_on_message_stanza_send(const char* const text)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char* new_stanza = NULL;
|
||||
char* curr_stanza = strdup(text);
|
||||
gchar* new_stanza = NULL;
|
||||
gchar* curr_stanza = g_strdup(text);
|
||||
|
||||
GList* curr = values;
|
||||
while (curr) {
|
||||
ProfPlugin* plugin = curr->data;
|
||||
new_stanza = plugin->on_message_stanza_send(plugin, curr_stanza);
|
||||
if (new_stanza) {
|
||||
free(curr_stanza);
|
||||
g_free(curr_stanza);
|
||||
curr_stanza = new_stanza;
|
||||
}
|
||||
curr = g_list_next(curr);
|
||||
@@ -849,15 +821,15 @@ plugins_on_presence_stanza_send(const char* const text)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char* new_stanza = NULL;
|
||||
char* curr_stanza = strdup(text);
|
||||
gchar* new_stanza = NULL;
|
||||
gchar* curr_stanza = g_strdup(text);
|
||||
|
||||
GList* curr = values;
|
||||
while (curr) {
|
||||
ProfPlugin* plugin = curr->data;
|
||||
new_stanza = plugin->on_presence_stanza_send(plugin, curr_stanza);
|
||||
if (new_stanza) {
|
||||
free(curr_stanza);
|
||||
g_free(curr_stanza);
|
||||
curr_stanza = new_stanza;
|
||||
}
|
||||
curr = g_list_next(curr);
|
||||
@@ -896,14 +868,14 @@ plugins_on_iq_stanza_send(const char* const text)
|
||||
}
|
||||
|
||||
char* new_stanza = NULL;
|
||||
char* curr_stanza = strdup(text);
|
||||
char* curr_stanza = g_strdup(text);
|
||||
|
||||
GList* curr = values;
|
||||
while (curr) {
|
||||
ProfPlugin* plugin = curr->data;
|
||||
new_stanza = plugin->on_iq_stanza_send(plugin, curr_stanza);
|
||||
if (new_stanza) {
|
||||
free(curr_stanza);
|
||||
g_free(curr_stanza);
|
||||
curr_stanza = new_stanza;
|
||||
}
|
||||
curr = g_list_next(curr);
|
||||
|
||||
Reference in New Issue
Block a user