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>
225 lines
6.4 KiB
C
225 lines
6.4 KiB
C
/*
|
|
* files.c
|
|
* vim: expandtab:ts=4:sts=4:sw=4
|
|
*
|
|
* Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
|
|
* Copyright (C) 2020 - 2026 Michael Vetter <jubalh@iodoru.org>
|
|
*
|
|
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
|
|
*/
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
#include <glib.h>
|
|
|
|
#include "common.h"
|
|
#include "log.h"
|
|
#include "config/files.h"
|
|
#include "config/preferences.h"
|
|
|
|
static char* _files_get_xdg_config_home(void);
|
|
static char* _files_get_xdg_data_home(void);
|
|
|
|
void
|
|
files_create_directories(void)
|
|
{
|
|
auto_gchar gchar* xdg_config = _files_get_xdg_config_home();
|
|
auto_gchar gchar* xdg_data = _files_get_xdg_data_home();
|
|
|
|
GString* themes_dir = g_string_new(xdg_config);
|
|
g_string_append(themes_dir, "/profanity/themes");
|
|
GString* icons_dir = g_string_new(xdg_config);
|
|
g_string_append(icons_dir, "/profanity/icons");
|
|
GString* chatlogs_dir = g_string_new(xdg_data);
|
|
g_string_append(chatlogs_dir, "/profanity/chatlogs");
|
|
GString* logs_dir = g_string_new(xdg_data);
|
|
g_string_append(logs_dir, "/profanity/logs");
|
|
GString* plugins_dir = g_string_new(xdg_data);
|
|
g_string_append(plugins_dir, "/profanity/plugins");
|
|
|
|
if (!create_dir(themes_dir->str)) {
|
|
log_error("Error while creating directory %s", themes_dir->str);
|
|
}
|
|
if (!create_dir(icons_dir->str)) {
|
|
log_error("Error while creating directory %s", icons_dir->str);
|
|
}
|
|
if (!create_dir(chatlogs_dir->str)) {
|
|
log_error("Error while creating directory %s", chatlogs_dir->str);
|
|
}
|
|
if (!create_dir(logs_dir->str)) {
|
|
log_error("Error while creating directory %s", logs_dir->str);
|
|
}
|
|
if (!create_dir(plugins_dir->str)) {
|
|
log_error("Error while creating directory %s", plugins_dir->str);
|
|
}
|
|
|
|
g_string_free(themes_dir, TRUE);
|
|
g_string_free(icons_dir, TRUE);
|
|
g_string_free(chatlogs_dir, TRUE);
|
|
g_string_free(logs_dir, TRUE);
|
|
g_string_free(plugins_dir, TRUE);
|
|
}
|
|
|
|
gchar*
|
|
files_get_inputrc_file(void)
|
|
{
|
|
auto_gchar gchar* xdg_config = _files_get_xdg_config_home();
|
|
GString* inputrc_file = g_string_new(xdg_config);
|
|
|
|
g_string_append(inputrc_file, "/profanity/inputrc");
|
|
|
|
if (g_file_test(inputrc_file->str, G_FILE_TEST_IS_REGULAR)) {
|
|
gchar* result = g_strdup(inputrc_file->str);
|
|
g_string_free(inputrc_file, TRUE);
|
|
|
|
return result;
|
|
}
|
|
|
|
g_string_free(inputrc_file, TRUE);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
gchar*
|
|
files_get_log_file(const char* const log_file)
|
|
{
|
|
auto_gchar gchar* xdg_data = _files_get_xdg_data_home();
|
|
|
|
if (log_file) {
|
|
auto_gchar gchar* log_path = g_path_get_dirname(log_file);
|
|
if (!create_dir(log_path)) {
|
|
log_error("Error while creating directory %s", log_path);
|
|
}
|
|
return g_strdup(log_file);
|
|
}
|
|
|
|
GString* logfile = g_string_new(xdg_data);
|
|
g_string_append(logfile, "/profanity/logs/profanity");
|
|
|
|
if (!prefs_get_boolean(PREF_LOG_SHARED)) {
|
|
g_string_append_printf(logfile, "%d", getpid());
|
|
}
|
|
|
|
g_string_append(logfile, ".log");
|
|
|
|
gchar* result = g_strdup(logfile->str);
|
|
g_string_free(logfile, TRUE);
|
|
return result;
|
|
}
|
|
|
|
gchar*
|
|
files_get_config_path(const char* const config_base)
|
|
{
|
|
auto_gchar gchar* xdg_config = _files_get_xdg_config_home();
|
|
gchar* result = g_strdup_printf("%s/profanity/%s", xdg_config, config_base);
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Get the full path by appending the given location to the project base path.
|
|
*
|
|
* @param location The location (directory or file) to append to the project base path.
|
|
* @return The full path obtained by appending the location to the project base path.
|
|
*
|
|
* @note Remember to free returned string using `auto_gchar` or `g_free()` when it is no longer needed to prevent memory leaks.
|
|
*/
|
|
gchar*
|
|
files_get_data_path(const char* const location)
|
|
{
|
|
auto_gchar gchar* xdg_data = _files_get_xdg_data_home();
|
|
return g_strdup_printf("%s/profanity/%s", xdg_data, location);
|
|
}
|
|
|
|
gchar*
|
|
files_get_download_path(const char* const jid)
|
|
{
|
|
auto_gchar gchar* xdg_data = _files_get_xdg_data_home();
|
|
|
|
if (jid) {
|
|
auto_char char* account_dir = str_replace(jid, "@", "_at_");
|
|
GDateTime* now = g_date_time_new_now_local();
|
|
auto_gchar gchar* date = g_date_time_format(now, "%Y_%m_%d");
|
|
g_date_time_unref(now);
|
|
return g_strdup_printf("%s/profanity/%s/%s/%s", xdg_data, DIR_DOWNLOADS, account_dir, date);
|
|
} else {
|
|
return g_strdup_printf("%s/profanity/%s", xdg_data, DIR_DOWNLOADS);
|
|
}
|
|
}
|
|
|
|
gchar*
|
|
files_get_account_data_path(const char* const specific_dir, const char* const jid)
|
|
{
|
|
auto_gchar gchar* data_dir = files_get_data_path(specific_dir);
|
|
auto_char char* account_dir = str_replace(jid, "@", "_at_");
|
|
|
|
return g_strdup_printf("%s/%s", data_dir, account_dir);
|
|
}
|
|
|
|
gchar*
|
|
files_file_in_account_data_path(const char* const specific_dir, const char* const jid, const char* const file_name)
|
|
{
|
|
gchar* data_path = files_get_account_data_path(specific_dir, jid);
|
|
|
|
if (!create_dir(data_path)) {
|
|
g_free(data_path);
|
|
return NULL;
|
|
}
|
|
|
|
if (!file_name) {
|
|
return data_path;
|
|
}
|
|
gchar* filename = g_strdup_printf("%s/%s", data_path, file_name);
|
|
g_free(data_path);
|
|
return filename;
|
|
}
|
|
|
|
static char*
|
|
_files_get_xdg_config_home(void)
|
|
{
|
|
gchar* xdg_config_home_env = getenv("XDG_CONFIG_HOME");
|
|
gchar* xdg_config_home = NULL;
|
|
|
|
if (xdg_config_home_env) {
|
|
xdg_config_home = strdup(xdg_config_home_env);
|
|
g_strstrip(xdg_config_home);
|
|
}
|
|
|
|
if (xdg_config_home && (strcmp(xdg_config_home, "") != 0)) {
|
|
return xdg_config_home;
|
|
} else {
|
|
GString* default_path = g_string_new(getenv("HOME"));
|
|
g_string_append(default_path, "/.config");
|
|
char* result = strdup(default_path->str);
|
|
g_string_free(default_path, TRUE);
|
|
|
|
return result;
|
|
}
|
|
}
|
|
|
|
static char*
|
|
_files_get_xdg_data_home(void)
|
|
{
|
|
gchar* xdg_data_home_env = getenv("XDG_DATA_HOME");
|
|
gchar* xdg_data_home = NULL;
|
|
|
|
if (xdg_data_home_env) {
|
|
xdg_data_home = strdup(xdg_data_home_env);
|
|
g_strstrip(xdg_data_home);
|
|
}
|
|
|
|
if (xdg_data_home && (strcmp(xdg_data_home, "") != 0)) {
|
|
return xdg_data_home;
|
|
} else {
|
|
GString* default_path = g_string_new(getenv("HOME"));
|
|
g_string_append(default_path, "/.local/share");
|
|
gchar* result = strdup(default_path->str);
|
|
g_string_free(default_path, TRUE);
|
|
|
|
return result;
|
|
}
|
|
}
|