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>
354 lines
9.7 KiB
C
354 lines
9.7 KiB
C
/*
|
|
* callbacks.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 <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "command/cmd_defs.h"
|
|
#include "command/cmd_ac.h"
|
|
#include "plugins/callbacks.h"
|
|
#include "plugins/plugins.h"
|
|
#include "tools/autocomplete.h"
|
|
#include "tools/parser.h"
|
|
#include "ui/ui.h"
|
|
#include "ui/window_list.h"
|
|
|
|
static GHashTable* p_commands = NULL;
|
|
static GHashTable* p_timed_functions = NULL;
|
|
static GHashTable* p_window_callbacks = NULL;
|
|
|
|
static void
|
|
_free_window_callback(PluginWindowCallback* window_callback)
|
|
{
|
|
if (window_callback->callback_destroy) {
|
|
window_callback->callback_destroy(window_callback->callback);
|
|
}
|
|
free(window_callback);
|
|
}
|
|
|
|
static void
|
|
_free_window_callbacks(GHashTable* window_callbacks)
|
|
{
|
|
g_hash_table_destroy(window_callbacks);
|
|
}
|
|
|
|
static void
|
|
_free_command_help(CommandHelp* help)
|
|
{
|
|
int i = 0;
|
|
while (help->tags[i] != NULL) {
|
|
free(help->tags[i++]);
|
|
}
|
|
|
|
i = 0;
|
|
while (help->synopsis[i] != NULL) {
|
|
free(help->synopsis[i++]);
|
|
}
|
|
|
|
free(help->desc);
|
|
|
|
i = 0;
|
|
while (help->args[i][0] != NULL) {
|
|
free(help->args[i][0]);
|
|
free(help->args[i][1]);
|
|
i++;
|
|
}
|
|
|
|
i = 0;
|
|
while (help->examples[i] != NULL) {
|
|
free(help->examples[i++]);
|
|
}
|
|
|
|
free(help);
|
|
}
|
|
|
|
static void
|
|
_free_command(PluginCommand* command)
|
|
{
|
|
if (command->callback_destroy) {
|
|
command->callback_destroy(command->callback);
|
|
}
|
|
free(command->command_name);
|
|
|
|
if (command->help)
|
|
_free_command_help(command->help);
|
|
|
|
free(command);
|
|
}
|
|
|
|
static void
|
|
_free_command_hash(GHashTable* command_hash)
|
|
{
|
|
g_hash_table_destroy(command_hash);
|
|
}
|
|
|
|
static void
|
|
_free_timed_function(PluginTimedFunction* timed_function)
|
|
{
|
|
if (!timed_function)
|
|
return;
|
|
if (timed_function->callback_destroy) {
|
|
timed_function->callback_destroy(timed_function->callback);
|
|
}
|
|
|
|
g_timer_destroy(timed_function->timer);
|
|
|
|
free(timed_function);
|
|
}
|
|
|
|
static void
|
|
_free_timed_function_list(GList* timed_functions)
|
|
{
|
|
g_list_free_full(timed_functions, (GDestroyNotify)_free_timed_function);
|
|
}
|
|
|
|
void
|
|
callbacks_init(void)
|
|
{
|
|
p_commands = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)_free_command_hash);
|
|
p_timed_functions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)_free_timed_function_list);
|
|
p_window_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)_free_window_callbacks);
|
|
}
|
|
|
|
void
|
|
callbacks_remove(const char* const plugin_name)
|
|
{
|
|
GHashTable* command_hash = g_hash_table_lookup(p_commands, plugin_name);
|
|
if (command_hash) {
|
|
GHashTableIter iter;
|
|
gpointer key, value;
|
|
g_hash_table_iter_init(&iter, command_hash);
|
|
while (g_hash_table_iter_next(&iter, &key, &value)) {
|
|
char* command = (char*)key;
|
|
cmd_ac_remove(command);
|
|
cmd_ac_remove_help(&command[1]);
|
|
}
|
|
}
|
|
|
|
g_hash_table_remove(p_commands, plugin_name);
|
|
g_hash_table_remove(p_timed_functions, plugin_name);
|
|
|
|
GHashTable* tag_to_win_cb_hash = g_hash_table_lookup(p_window_callbacks, plugin_name);
|
|
if (tag_to_win_cb_hash) {
|
|
GHashTableIter iter;
|
|
gpointer key, value;
|
|
g_hash_table_iter_init(&iter, tag_to_win_cb_hash);
|
|
while (g_hash_table_iter_next(&iter, &key, &value)) {
|
|
wins_close_plugin(key);
|
|
}
|
|
}
|
|
|
|
g_hash_table_remove(p_window_callbacks, plugin_name);
|
|
}
|
|
|
|
void
|
|
callbacks_close(void)
|
|
{
|
|
g_hash_table_destroy(p_window_callbacks);
|
|
p_window_callbacks = NULL;
|
|
g_hash_table_destroy(p_timed_functions);
|
|
p_timed_functions = NULL;
|
|
g_hash_table_destroy(p_commands);
|
|
p_commands = NULL;
|
|
}
|
|
|
|
void
|
|
callbacks_add_command(const char* const plugin_name, PluginCommand* command)
|
|
{
|
|
GHashTable* command_hash = g_hash_table_lookup(p_commands, plugin_name);
|
|
if (command_hash) {
|
|
g_hash_table_insert(command_hash, g_strdup(command->command_name), command);
|
|
} else {
|
|
command_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)_free_command);
|
|
g_hash_table_insert(command_hash, g_strdup(command->command_name), command);
|
|
g_hash_table_insert(p_commands, g_strdup(plugin_name), command_hash);
|
|
}
|
|
cmd_ac_add(command->command_name);
|
|
cmd_ac_add_help(&command->command_name[1]);
|
|
}
|
|
|
|
void
|
|
callbacks_add_timed(const char* const plugin_name, PluginTimedFunction* timed_function)
|
|
{
|
|
GList* timed_function_list = g_hash_table_lookup(p_timed_functions, plugin_name);
|
|
if (timed_function_list) {
|
|
// we assign this so we dont get: -Werror=unused-result
|
|
timed_function_list = g_list_append(timed_function_list, timed_function);
|
|
} else {
|
|
timed_function_list = g_list_append(timed_function_list, timed_function);
|
|
g_hash_table_insert(p_timed_functions, g_strdup(plugin_name), timed_function_list);
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
callbacks_win_exists(const char* const plugin_name, const char* tag)
|
|
{
|
|
GHashTable* window_callbacks = g_hash_table_lookup(p_window_callbacks, plugin_name);
|
|
if (window_callbacks) {
|
|
PluginWindowCallback* cb = g_hash_table_lookup(window_callbacks, tag);
|
|
if (cb) {
|
|
return TRUE;
|
|
}
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
void
|
|
callbacks_remove_win(const char* const plugin_name, const char* const tag)
|
|
{
|
|
GHashTable* window_callbacks = g_hash_table_lookup(p_window_callbacks, plugin_name);
|
|
if (window_callbacks) {
|
|
g_hash_table_remove(window_callbacks, tag);
|
|
}
|
|
}
|
|
|
|
void
|
|
callbacks_add_window_handler(const char* const plugin_name, const char* tag, PluginWindowCallback* window_callback)
|
|
{
|
|
GHashTable* window_callbacks = g_hash_table_lookup(p_window_callbacks, plugin_name);
|
|
if (window_callbacks) {
|
|
g_hash_table_insert(window_callbacks, g_strdup(tag), window_callback);
|
|
} else {
|
|
window_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)_free_window_callback);
|
|
g_hash_table_insert(window_callbacks, g_strdup(tag), window_callback);
|
|
g_hash_table_insert(p_window_callbacks, g_strdup(plugin_name), window_callbacks);
|
|
}
|
|
}
|
|
|
|
void*
|
|
callbacks_get_window_handler(const char* tag)
|
|
{
|
|
if (p_window_callbacks) {
|
|
GList* window_callback_hashes = g_hash_table_get_values(p_window_callbacks);
|
|
GList* curr_hash = window_callback_hashes;
|
|
while (curr_hash) {
|
|
GHashTable* window_callback_hash = curr_hash->data;
|
|
PluginWindowCallback* callback = g_hash_table_lookup(window_callback_hash, tag);
|
|
if (callback) {
|
|
g_list_free(window_callback_hashes);
|
|
return callback;
|
|
}
|
|
|
|
curr_hash = g_list_next(curr_hash);
|
|
}
|
|
|
|
g_list_free(window_callback_hashes);
|
|
return NULL;
|
|
} else {
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
plugins_run_command(const char* const input)
|
|
{
|
|
auto_gcharv gchar** split = g_strsplit(input, " ", -1);
|
|
|
|
GList* command_hashes = g_hash_table_get_values(p_commands);
|
|
GList* curr_hash = command_hashes;
|
|
while (curr_hash) {
|
|
GHashTable* command_hash = curr_hash->data;
|
|
|
|
PluginCommand* command = g_hash_table_lookup(command_hash, split[0]);
|
|
if (command) {
|
|
gboolean result;
|
|
auto_gcharv gchar** args = parse_args_with_freetext(input, command->min_args, command->max_args, &result);
|
|
if (result == FALSE) {
|
|
ui_invalid_command_usage(command->command_name, NULL);
|
|
} else {
|
|
command->callback_exec(command, args);
|
|
}
|
|
g_list_free(command_hashes);
|
|
return TRUE;
|
|
}
|
|
|
|
curr_hash = g_list_next(curr_hash);
|
|
}
|
|
|
|
g_list_free(command_hashes);
|
|
return FALSE;
|
|
}
|
|
|
|
CommandHelp*
|
|
plugins_get_help(const char* const cmd)
|
|
{
|
|
GList* command_hashes = g_hash_table_get_values(p_commands);
|
|
GList* curr_hash = command_hashes;
|
|
while (curr_hash) {
|
|
GHashTable* command_hash = curr_hash->data;
|
|
|
|
PluginCommand* command = g_hash_table_lookup(command_hash, cmd);
|
|
if (command) {
|
|
g_list_free(command_hashes);
|
|
return command->help;
|
|
}
|
|
|
|
curr_hash = g_list_next(curr_hash);
|
|
}
|
|
|
|
g_list_free(command_hashes);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
plugins_run_timed(void)
|
|
{
|
|
GList* timed_functions_lists = g_hash_table_get_values(p_timed_functions);
|
|
|
|
GList* curr_list = timed_functions_lists;
|
|
while (curr_list) {
|
|
GList* timed_function_list = curr_list->data;
|
|
GList* curr = timed_function_list;
|
|
while (curr) {
|
|
PluginTimedFunction* timed_function = curr->data;
|
|
|
|
gdouble elapsed = g_timer_elapsed(timed_function->timer, NULL);
|
|
|
|
if (timed_function->interval_seconds > 0 && elapsed >= timed_function->interval_seconds) {
|
|
timed_function->callback_exec(timed_function);
|
|
g_timer_start(timed_function->timer);
|
|
}
|
|
|
|
curr = g_list_next(curr);
|
|
}
|
|
curr_list = g_list_next(curr_list);
|
|
}
|
|
|
|
g_list_free(timed_functions_lists);
|
|
}
|
|
|
|
GList*
|
|
plugins_get_command_names(void)
|
|
{
|
|
GList* result = NULL;
|
|
|
|
GList* command_hashes = g_hash_table_get_values(p_commands);
|
|
GList* curr_hash = command_hashes;
|
|
while (curr_hash) {
|
|
GHashTable* command_hash = curr_hash->data;
|
|
GList* commands = g_hash_table_get_keys(command_hash);
|
|
GList* curr = commands;
|
|
while (curr) {
|
|
char* command = curr->data;
|
|
result = g_list_append(result, command);
|
|
curr = g_list_next(curr);
|
|
}
|
|
g_list_free(commands);
|
|
curr_hash = g_list_next(curr_hash);
|
|
}
|
|
|
|
g_list_free(command_hashes);
|
|
|
|
return result;
|
|
}
|