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>
186 lines
5.1 KiB
C
186 lines
5.1 KiB
C
/*
|
|
* autocompleters.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 <glib.h>
|
|
|
|
#include "tools/autocomplete.h"
|
|
#include "command/cmd_ac.h"
|
|
|
|
static GHashTable* plugin_to_acs;
|
|
static GHashTable* plugin_to_filepath_acs;
|
|
|
|
static void
|
|
_free_autocompleters(GHashTable* key_to_ac)
|
|
{
|
|
g_hash_table_destroy(key_to_ac);
|
|
}
|
|
|
|
static void
|
|
_free_filepath_autocompleters(GHashTable* prefixes)
|
|
{
|
|
g_hash_table_destroy(prefixes);
|
|
}
|
|
|
|
void
|
|
autocompleters_init(void)
|
|
{
|
|
plugin_to_acs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)_free_autocompleters);
|
|
plugin_to_filepath_acs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)_free_filepath_autocompleters);
|
|
}
|
|
|
|
void
|
|
autocompleters_add(const char* const plugin_name, const char* key, char** items)
|
|
{
|
|
GHashTable* key_to_ac = g_hash_table_lookup(plugin_to_acs, plugin_name);
|
|
if (key_to_ac) {
|
|
if (g_hash_table_contains(key_to_ac, key)) {
|
|
Autocomplete existing_ac = g_hash_table_lookup(key_to_ac, key);
|
|
autocomplete_add_all(existing_ac, items);
|
|
} else {
|
|
Autocomplete new_ac = autocomplete_new();
|
|
autocomplete_add_all(new_ac, items);
|
|
g_hash_table_insert(key_to_ac, g_strdup(key), new_ac);
|
|
}
|
|
} else {
|
|
key_to_ac = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)autocomplete_free);
|
|
Autocomplete new_ac = autocomplete_new();
|
|
autocomplete_add_all(new_ac, items);
|
|
g_hash_table_insert(key_to_ac, g_strdup(key), new_ac);
|
|
g_hash_table_insert(plugin_to_acs, g_strdup(plugin_name), key_to_ac);
|
|
}
|
|
}
|
|
|
|
void
|
|
autocompleters_remove(const char* const plugin_name, const char* key, char** items)
|
|
{
|
|
GHashTable* key_to_ac = g_hash_table_lookup(plugin_to_acs, plugin_name);
|
|
if (!key_to_ac) {
|
|
return;
|
|
}
|
|
|
|
if (!g_hash_table_contains(key_to_ac, key)) {
|
|
return;
|
|
}
|
|
|
|
Autocomplete ac = g_hash_table_lookup(key_to_ac, key);
|
|
autocomplete_remove_all(ac, items);
|
|
}
|
|
|
|
void
|
|
autocompleters_clear(const char* const plugin_name, const char* key)
|
|
{
|
|
GHashTable* key_to_ac = g_hash_table_lookup(plugin_to_acs, plugin_name);
|
|
if (!key_to_ac) {
|
|
return;
|
|
}
|
|
|
|
if (!g_hash_table_contains(key_to_ac, key)) {
|
|
return;
|
|
}
|
|
|
|
Autocomplete ac = g_hash_table_lookup(key_to_ac, key);
|
|
autocomplete_clear(ac);
|
|
}
|
|
|
|
void
|
|
autocompleters_filepath_add(const char* const plugin_name, const char* prefix)
|
|
{
|
|
GHashTable* prefixes = g_hash_table_lookup(plugin_to_filepath_acs, plugin_name);
|
|
if (prefixes) {
|
|
g_hash_table_add(prefixes, g_strdup(prefix));
|
|
} else {
|
|
prefixes = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
|
|
g_hash_table_add(prefixes, g_strdup(prefix));
|
|
g_hash_table_insert(plugin_to_filepath_acs, g_strdup(plugin_name), prefixes);
|
|
}
|
|
}
|
|
|
|
char*
|
|
autocompleters_complete(const char* const input, gboolean previous)
|
|
{
|
|
char* result = NULL;
|
|
|
|
GList* ac_hashes = g_hash_table_get_values(plugin_to_acs);
|
|
GList* curr_hash = ac_hashes;
|
|
while (curr_hash) {
|
|
GHashTable* key_to_ac = curr_hash->data;
|
|
|
|
GHashTableIter iter;
|
|
gpointer key, value;
|
|
g_hash_table_iter_init(&iter, key_to_ac);
|
|
while (g_hash_table_iter_next(&iter, &key, &value)) {
|
|
result = autocomplete_param_with_ac(input, key, value, TRUE, previous);
|
|
if (result) {
|
|
g_list_free(ac_hashes);
|
|
return result;
|
|
}
|
|
}
|
|
|
|
curr_hash = g_list_next(curr_hash);
|
|
}
|
|
g_list_free(ac_hashes);
|
|
|
|
GList* filepath_hashes = g_hash_table_get_values(plugin_to_filepath_acs);
|
|
curr_hash = filepath_hashes;
|
|
while (curr_hash) {
|
|
GHashTable* prefixes_hash = curr_hash->data;
|
|
GHashTableIter iter;
|
|
gpointer key, value;
|
|
g_hash_table_iter_init(&iter, prefixes_hash);
|
|
while (g_hash_table_iter_next(&iter, &key, &value)) {
|
|
char* prefix = (char*)key;
|
|
if (g_str_has_prefix(input, prefix)) {
|
|
result = cmd_ac_complete_filepath(input, prefix, previous);
|
|
if (result) {
|
|
g_list_free(filepath_hashes);
|
|
return result;
|
|
}
|
|
}
|
|
}
|
|
|
|
curr_hash = g_list_next(curr_hash);
|
|
}
|
|
g_list_free(filepath_hashes);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
autocompleters_reset(void)
|
|
{
|
|
GList* ac_hashes = g_hash_table_get_values(plugin_to_acs);
|
|
GList* curr_hash = ac_hashes;
|
|
while (curr_hash) {
|
|
GList* acs = g_hash_table_get_values(curr_hash->data);
|
|
GList* curr = acs;
|
|
while (curr) {
|
|
autocomplete_reset(curr->data);
|
|
curr = g_list_next(curr);
|
|
}
|
|
|
|
g_list_free(acs);
|
|
curr_hash = g_list_next(curr_hash);
|
|
}
|
|
|
|
g_list_free(ac_hashes);
|
|
}
|
|
|
|
void
|
|
autocompleters_destroy(void)
|
|
{
|
|
g_hash_table_destroy(plugin_to_acs);
|
|
g_hash_table_destroy(plugin_to_filepath_acs);
|
|
plugin_to_acs = NULL;
|
|
plugin_to_filepath_acs = NULL;
|
|
}
|