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>
515 lines
13 KiB
C
515 lines
13 KiB
C
/*
|
|
* c_api.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 <stdlib.h>
|
|
#include <string.h>
|
|
#include <glib.h>
|
|
|
|
#include "log.h"
|
|
#include "plugins/api.h"
|
|
#include "plugins/c_api.h"
|
|
#include "plugins/callbacks.h"
|
|
#include "plugins/profapi.h"
|
|
|
|
typedef struct command_wrapper_t
|
|
{
|
|
void (*func)(char** args);
|
|
} CommandWrapper;
|
|
|
|
typedef struct timed_wrapper_t
|
|
{
|
|
void (*func)(void);
|
|
} TimedWrapper;
|
|
|
|
typedef struct window_wrapper_t
|
|
{
|
|
void (*func)(char* tag, char* line);
|
|
} WindowWrapper;
|
|
|
|
static char* _c_plugin_name(const char* filename);
|
|
|
|
static void
|
|
c_api_cons_alert(void)
|
|
{
|
|
api_cons_alert();
|
|
}
|
|
|
|
static int
|
|
c_api_cons_show(const char* const message)
|
|
{
|
|
return api_cons_show(message);
|
|
}
|
|
|
|
static int
|
|
c_api_cons_show_themed(const char* const group, const char* const item, const char* const def, const char* const message)
|
|
{
|
|
return api_cons_show_themed(group, item, def, message);
|
|
}
|
|
|
|
static int
|
|
c_api_cons_bad_cmd_usage(const char* const cmd)
|
|
{
|
|
return api_cons_bad_cmd_usage(cmd);
|
|
}
|
|
|
|
static void
|
|
c_api_register_command(const char* filename, const char* command_name, int min_args, int max_args,
|
|
char** synopsis, const char* description, char* arguments[][2], char** examples,
|
|
void (*callback)(char** args))
|
|
{
|
|
auto_char char* plugin_name = _c_plugin_name(filename);
|
|
log_debug("Register command %s for %s", command_name, plugin_name);
|
|
|
|
CommandWrapper* wrapper = g_new0(CommandWrapper, 1);
|
|
wrapper->func = callback;
|
|
api_register_command(plugin_name, command_name, min_args, max_args, synopsis,
|
|
description, arguments, examples, wrapper, c_command_callback, free);
|
|
}
|
|
|
|
static void
|
|
c_api_register_timed(const char* filename, void (*callback)(void), int interval_seconds)
|
|
{
|
|
auto_char char* plugin_name = _c_plugin_name(filename);
|
|
log_debug("Register timed for %s", plugin_name);
|
|
|
|
TimedWrapper* wrapper = g_new0(TimedWrapper, 1);
|
|
wrapper->func = callback;
|
|
api_register_timed(plugin_name, wrapper, interval_seconds, c_timed_callback, free);
|
|
}
|
|
|
|
static void
|
|
c_api_completer_add(const char* filename, const char* key, char** items)
|
|
{
|
|
auto_char char* plugin_name = _c_plugin_name(filename);
|
|
log_debug("Autocomplete add %s for %s", key, plugin_name);
|
|
|
|
api_completer_add(plugin_name, key, items);
|
|
}
|
|
|
|
static void
|
|
c_api_completer_remove(const char* filename, const char* key, char** items)
|
|
{
|
|
auto_char char* plugin_name = _c_plugin_name(filename);
|
|
log_debug("Autocomplete remove %s for %s", key, plugin_name);
|
|
|
|
api_completer_remove(plugin_name, key, items);
|
|
}
|
|
|
|
static void
|
|
c_api_completer_clear(const char* filename, const char* key)
|
|
{
|
|
auto_char char* plugin_name = _c_plugin_name(filename);
|
|
log_debug("Autocomplete clear %s for %s", key, plugin_name);
|
|
|
|
api_completer_clear(plugin_name, key);
|
|
}
|
|
|
|
static void
|
|
c_api_filepath_completer_add(const char* filename, const char* prefix)
|
|
{
|
|
auto_char char* plugin_name = _c_plugin_name(filename);
|
|
log_debug("Filepath autocomplete added '%s' for %s", prefix, plugin_name);
|
|
|
|
api_filepath_completer_add(plugin_name, prefix);
|
|
}
|
|
|
|
static void
|
|
c_api_notify(const char* message, int timeout_ms, const char* category)
|
|
{
|
|
api_notify(message, category, timeout_ms);
|
|
}
|
|
|
|
static void
|
|
c_api_send_line(char* line)
|
|
{
|
|
api_send_line(line);
|
|
}
|
|
|
|
static char*
|
|
c_api_get_current_recipient(void)
|
|
{
|
|
return api_get_current_recipient();
|
|
}
|
|
|
|
static char*
|
|
c_api_get_current_window(void)
|
|
{
|
|
return api_get_current_window();
|
|
}
|
|
|
|
static char*
|
|
c_api_get_current_muc(void)
|
|
{
|
|
return api_get_current_muc();
|
|
}
|
|
|
|
static int
|
|
c_api_current_win_is_console(void)
|
|
{
|
|
return api_current_win_is_console();
|
|
}
|
|
|
|
static char*
|
|
c_api_get_current_nick(void)
|
|
{
|
|
return api_get_current_nick();
|
|
}
|
|
|
|
static char*
|
|
c_api_get_name_from_roster(const char* barejid)
|
|
{
|
|
return api_get_name_from_roster(barejid);
|
|
}
|
|
|
|
static char*
|
|
c_api_get_barejid_from_roster(const char* name)
|
|
{
|
|
return api_get_barejid_from_roster(name);
|
|
}
|
|
|
|
static char**
|
|
c_api_get_current_occupants(void)
|
|
{
|
|
return api_get_current_occupants();
|
|
}
|
|
|
|
static char*
|
|
c_api_get_room_nick(const char* barejid)
|
|
{
|
|
return api_get_room_nick(barejid);
|
|
}
|
|
|
|
static void
|
|
c_api_log_debug(const char* message)
|
|
{
|
|
api_log_debug(message);
|
|
}
|
|
|
|
static void
|
|
c_api_log_info(const char* message)
|
|
{
|
|
api_log_info(message);
|
|
}
|
|
|
|
static void
|
|
c_api_log_warning(const char* message)
|
|
{
|
|
api_log_warning(message);
|
|
}
|
|
|
|
static void
|
|
c_api_log_error(const char* message)
|
|
{
|
|
api_log_error(message);
|
|
}
|
|
|
|
static int
|
|
c_api_win_exists(char* tag)
|
|
{
|
|
return api_win_exists(tag);
|
|
}
|
|
|
|
static void
|
|
c_api_win_create(const char* filename, char* tag, void (*callback)(char* tag, char* line))
|
|
{
|
|
auto_char char* plugin_name = _c_plugin_name(filename);
|
|
|
|
WindowWrapper* wrapper = g_new0(WindowWrapper, 1);
|
|
wrapper->func = callback;
|
|
api_win_create(plugin_name, tag, wrapper, c_window_callback, free);
|
|
}
|
|
|
|
static int
|
|
c_api_win_focus(char* tag)
|
|
{
|
|
return api_win_focus(tag);
|
|
}
|
|
|
|
static int
|
|
c_api_win_show(char* tag, char* line)
|
|
{
|
|
return api_win_show(tag, line);
|
|
}
|
|
|
|
static int
|
|
c_api_win_show_themed(char* tag, char* group, char* key, char* def, char* line)
|
|
{
|
|
return api_win_show_themed(tag, group, key, def, line);
|
|
}
|
|
|
|
static int
|
|
c_api_send_stanza(char* stanza)
|
|
{
|
|
return api_send_stanza(stanza);
|
|
}
|
|
|
|
static int
|
|
c_api_settings_boolean_get(char* group, char* key, int def)
|
|
{
|
|
return api_settings_boolean_get(group, key, def);
|
|
}
|
|
|
|
static void
|
|
c_api_settings_boolean_set(char* group, char* key, int value)
|
|
{
|
|
api_settings_boolean_set(group, key, value);
|
|
}
|
|
|
|
static char*
|
|
c_api_settings_string_get(char* group, char* key, char* def)
|
|
{
|
|
return api_settings_string_get(group, key, def);
|
|
}
|
|
|
|
static void
|
|
c_api_settings_string_set(char* group, char* key, char* value)
|
|
{
|
|
api_settings_string_set(group, key, value);
|
|
}
|
|
|
|
static char**
|
|
c_api_settings_string_list_get(char* group, char* key)
|
|
{
|
|
return api_settings_string_list_get(group, key);
|
|
}
|
|
|
|
static void
|
|
c_api_settings_string_list_add(char* group, char* key, char* value)
|
|
{
|
|
api_settings_string_list_add(group, key, value);
|
|
}
|
|
|
|
static int
|
|
c_api_settings_string_list_remove(char* group, char* key, char* value)
|
|
{
|
|
return api_settings_string_list_remove(group, key, value);
|
|
}
|
|
|
|
static int
|
|
c_api_settings_string_list_clear(char* group, char* key)
|
|
{
|
|
return api_settings_string_list_clear(group, key);
|
|
}
|
|
|
|
static int
|
|
c_api_settings_int_get(char* group, char* key, int def)
|
|
{
|
|
return api_settings_int_get(group, key, def);
|
|
}
|
|
|
|
static void
|
|
c_api_settings_int_set(char* group, char* key, int value)
|
|
{
|
|
api_settings_int_set(group, key, value);
|
|
}
|
|
|
|
static void
|
|
c_api_incoming_message(char* barejid, char* resource, char* message)
|
|
{
|
|
api_incoming_message(barejid, resource, message);
|
|
}
|
|
|
|
static void
|
|
c_api_disco_add_feature(const char* filename, char* feature)
|
|
{
|
|
auto_char char* plugin_name = _c_plugin_name(filename);
|
|
api_disco_add_feature(plugin_name, feature);
|
|
}
|
|
|
|
static void
|
|
c_api_encryption_reset(const char* barejid)
|
|
{
|
|
api_encryption_reset(barejid);
|
|
}
|
|
|
|
static int
|
|
c_api_chat_set_titlebar_enctext(const char* barejid, const char* enctext)
|
|
{
|
|
return api_chat_set_titlebar_enctext(barejid, enctext);
|
|
}
|
|
|
|
static int
|
|
c_api_chat_unset_titlebar_enctext(const char* barejid)
|
|
{
|
|
return api_chat_unset_titlebar_enctext(barejid);
|
|
}
|
|
|
|
static int
|
|
c_api_chat_set_incoming_char(const char* barejid, const char* ch)
|
|
{
|
|
return api_chat_set_incoming_char(barejid, ch);
|
|
}
|
|
|
|
static int
|
|
c_api_chat_unset_incoming_char(const char* barejid)
|
|
{
|
|
return api_chat_unset_incoming_char(barejid);
|
|
}
|
|
|
|
static int
|
|
c_api_chat_set_outgoing_char(const char* barejid, const char* ch)
|
|
{
|
|
return api_chat_set_outgoing_char(barejid, ch);
|
|
}
|
|
|
|
static int
|
|
c_api_chat_unset_outgoing_char(const char* barejid)
|
|
{
|
|
return api_chat_unset_outgoing_char(barejid);
|
|
}
|
|
|
|
static int
|
|
c_api_room_set_titlebar_enctext(const char* roomjid, const char* enctext)
|
|
{
|
|
return api_room_set_titlebar_enctext(roomjid, enctext);
|
|
}
|
|
|
|
static int
|
|
c_api_room_unset_titlebar_enctext(const char* roomjid)
|
|
{
|
|
return api_room_unset_titlebar_enctext(roomjid);
|
|
}
|
|
|
|
static int
|
|
c_api_room_set_message_char(const char* roomjid, const char* ch)
|
|
{
|
|
return api_room_set_message_char(roomjid, ch);
|
|
}
|
|
|
|
static int
|
|
c_api_room_unset_message_char(const char* roomjid)
|
|
{
|
|
return api_room_unset_message_char(roomjid);
|
|
}
|
|
|
|
static int
|
|
c_api_chat_show(const char* const barejid, const char* const message)
|
|
{
|
|
return api_chat_show(barejid, message);
|
|
}
|
|
|
|
static int
|
|
c_api_chat_show_themed(const char* const barejid, const char* const group, const char* const item, const char* const def,
|
|
const char* const ch, const char* const message)
|
|
{
|
|
return api_chat_show_themed(barejid, group, item, def, ch, message);
|
|
}
|
|
|
|
static int
|
|
c_api_room_show(const char* const roomjid, const char* const message)
|
|
{
|
|
return api_room_show(roomjid, message);
|
|
}
|
|
|
|
static int
|
|
c_api_room_show_themed(const char* const roomjid, const char* const group, const char* const item, const char* const def,
|
|
const char* const ch, const char* const message)
|
|
{
|
|
return api_room_show_themed(roomjid, group, item, def, ch, message);
|
|
}
|
|
|
|
void
|
|
c_command_callback(PluginCommand* command, gchar** args)
|
|
{
|
|
CommandWrapper* wrapper = command->callback;
|
|
void (*f)(gchar** args) = wrapper->func;
|
|
f(args);
|
|
}
|
|
|
|
void
|
|
c_timed_callback(PluginTimedFunction* timed_function)
|
|
{
|
|
TimedWrapper* wrapper = timed_function->callback;
|
|
void (*f)(void) = wrapper->func;
|
|
f();
|
|
}
|
|
|
|
void
|
|
c_window_callback(PluginWindowCallback* window_callback, char* tag, char* line)
|
|
{
|
|
WindowWrapper* wrapper = window_callback->callback;
|
|
void (*f)(char* tag, char* line) = wrapper->func;
|
|
f(tag, line);
|
|
}
|
|
|
|
void
|
|
c_api_init(void)
|
|
{
|
|
prof_cons_alert = c_api_cons_alert;
|
|
prof_cons_show = c_api_cons_show;
|
|
prof_cons_show_themed = c_api_cons_show_themed;
|
|
prof_cons_bad_cmd_usage = c_api_cons_bad_cmd_usage;
|
|
_prof_register_command = c_api_register_command;
|
|
_prof_register_timed = c_api_register_timed;
|
|
_prof_completer_add = c_api_completer_add;
|
|
_prof_completer_remove = c_api_completer_remove;
|
|
_prof_completer_clear = c_api_completer_clear;
|
|
_prof_filepath_completer_add = c_api_filepath_completer_add;
|
|
_prof_win_create = c_api_win_create;
|
|
prof_notify = c_api_notify;
|
|
prof_send_line = c_api_send_line;
|
|
prof_get_current_recipient = c_api_get_current_recipient;
|
|
prof_get_current_window = c_api_get_current_window;
|
|
prof_get_current_muc = c_api_get_current_muc;
|
|
prof_current_win_is_console = c_api_current_win_is_console;
|
|
prof_get_current_nick = c_api_get_current_nick;
|
|
prof_get_name_from_roster = c_api_get_name_from_roster;
|
|
prof_get_barejid_from_roster = c_api_get_barejid_from_roster;
|
|
prof_get_current_occupants = c_api_get_current_occupants;
|
|
prof_get_room_nick = c_api_get_room_nick;
|
|
prof_log_debug = c_api_log_debug;
|
|
prof_log_info = c_api_log_info;
|
|
prof_log_warning = c_api_log_warning;
|
|
prof_log_error = c_api_log_error;
|
|
prof_win_exists = c_api_win_exists;
|
|
prof_win_focus = c_api_win_focus;
|
|
prof_win_show = c_api_win_show;
|
|
prof_win_show_themed = c_api_win_show_themed;
|
|
prof_send_stanza = c_api_send_stanza;
|
|
prof_settings_boolean_get = c_api_settings_boolean_get;
|
|
prof_settings_boolean_set = c_api_settings_boolean_set;
|
|
prof_settings_string_get = c_api_settings_string_get;
|
|
prof_settings_string_set = c_api_settings_string_set;
|
|
prof_settings_int_get = c_api_settings_int_get;
|
|
prof_settings_int_set = c_api_settings_int_set;
|
|
prof_settings_string_list_get = c_api_settings_string_list_get;
|
|
prof_settings_string_list_add = c_api_settings_string_list_add;
|
|
prof_settings_string_list_remove = c_api_settings_string_list_remove;
|
|
prof_settings_string_list_clear = c_api_settings_string_list_clear;
|
|
prof_incoming_message = c_api_incoming_message;
|
|
_prof_disco_add_feature = c_api_disco_add_feature;
|
|
prof_encryption_reset = c_api_encryption_reset;
|
|
prof_chat_set_titlebar_enctext = c_api_chat_set_titlebar_enctext;
|
|
prof_chat_unset_titlebar_enctext = c_api_chat_unset_titlebar_enctext;
|
|
prof_chat_set_incoming_char = c_api_chat_set_incoming_char;
|
|
prof_chat_unset_incoming_char = c_api_chat_unset_incoming_char;
|
|
prof_chat_set_outgoing_char = c_api_chat_set_outgoing_char;
|
|
prof_chat_unset_outgoing_char = c_api_chat_unset_outgoing_char;
|
|
prof_room_set_titlebar_enctext = c_api_room_set_titlebar_enctext;
|
|
prof_room_unset_titlebar_enctext = c_api_room_unset_titlebar_enctext;
|
|
prof_room_set_message_char = c_api_room_set_message_char;
|
|
prof_room_unset_message_char = c_api_room_unset_message_char;
|
|
prof_chat_show = c_api_chat_show;
|
|
prof_chat_show_themed = c_api_chat_show_themed;
|
|
prof_room_show = c_api_room_show;
|
|
prof_room_show_themed = c_api_room_show_themed;
|
|
}
|
|
|
|
static char*
|
|
_c_plugin_name(const char* filename)
|
|
{
|
|
size_t flen = strlen(filename);
|
|
auto_gchar gchar* name = g_strndup(filename, flen > 0 ? flen - 1 : 0);
|
|
gchar* result = g_strdup_printf("%sso", name);
|
|
|
|
return result;
|
|
}
|