jabber.developer2
9feff00ead
Cleanup of the conversion-safety warnings exposed by enabling -Wconversion / -Wsign-compare in the previous commit, plus guard clauses at the few places where unsigned arithmetic could actually misbehave. Build: - configure.ac drops -Wno-error=conversion and -Wno-error=float-conversion. Only -Wno-error=sign-conversion and -Wno-error=sign-compare remain, gating the ~230 sign warnings inherited from upstream that will be cleaned up in follow-ups. Type / conversion fixes (no behaviour change): - Length-like locals in command/cmd_ac.c, command/cmd_funcs.c, pgp/gpg.c, tools/autocomplete.c, tools/parser.c and ui/mucwin.c switched from int to size_t / glong (matching strlen / g_utf8_strlen return type) so we no longer need an (int) cast and loop counters / array sizes stay in their natural unsigned domain. - g_timer_elapsed / GTimeSpan -> int casts in session.c, iq.c, core.c, server_events.c, window.c. - _win_print_wrapped: indent parameter and local curx/maxx switched from size_t to int to match _win_indent / getcurx / getmaxx. - Port casts (int -> unsigned short) at the libstrophe boundary in connection.c and session.c, each preceded by g_assert(port >= 0 && port <= UINT16_MAX) so the truncation is documented at the call-site. - curl_off_t / fread size_t results cast at usage in http_upload.c, http_download.c, omemo/crypto.c. - strtoul results cast to uint32_t in xmpp/omemo.c and omemo/omemo.c where device/prekey IDs are genuinely 32-bit. - config/color.c: fg/bg/palette indices switched to `short` end-to-end (find_col, color_hash, find_closest_col, _color_pair_cache_get, cache.pairs), so the ncurses init_pair boundary needs at most one (short)i cast for the cache index. Also TODO-noted: init_extended_pair is needed for >15-bit palettes. - xmpp/avatar.c: float arithmetic explicitly casts its int operands. - tests/functionaltests/proftest.c: read() result handling uses size_t for the accumulator, _read_output returns ssize_t, and the buffer-shift check happens before space subtraction so the expression cannot underflow. Real-risk guard clauses (the part that actually fixes bugs): - src/ui/statusbar.c _tabs_width: `end > opened_tabs - 1` rewritten as `end < opened_tabs` so opened_tabs == 0 no longer underflows. - src/ui/statusbar.c _status_bar_draw_extended_tabs: the mirror comparison rewritten as `end >= opened_tabs`. - src/ui/statusbar.c status_bar_draw: replaced `MAX(0, getmaxx - (int)_tabs_width)` with an explicit precheck before subtraction. - src/omemo/omemo.c prekey selection: prekey_index is now uint32_t and randomized into an unsigned buffer, so modulo with prekeys_len cannot yield a negative index for g_list_nth_data. - src/omemo/crypto.c omemo_decrypt_func: PKCS#5/PKCS#7 unpadding reads `plaintext[plaintext_len - 1]`, which would underflow on a malformed empty ciphertext and read past the heap buffer. Reject plaintext_len == 0 before the padding peek and validate the padding byte against the buffer length before the unpad loop. Initialise plaintext = NULL so the early `goto out` cannot free uninitialised memory. - src/ui/inputwin.c (4 mbrlen sites) and src/ui/window.c _win_print_wrapped: mbrlen() returns 0 for the null wide character. The existing checks rejected (size_t)-1 / -2 but treated 0 as a valid step, so the surrounding loops would either advance by SIZE_MAX (i += ch_len - 1) or spin in place (word_pos += 0 forever). Add `|| ch_len == 0` to each guard; inside the spell-check word-emission loop also fall back to a one-byte advance. - Defensive `len > 0 ? len - 1 : 0` prechecks at the strlen-based g_strndup / loop sites in ui/console.c, plugins/c_api.c and plugins/python_plugins.c.
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;
|
|
}
|