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>
374 lines
8.0 KiB
C
374 lines
8.0 KiB
C
/*
|
|
* log.c
|
|
* vim: expandtab:ts=4:sts=4:sw=4
|
|
*
|
|
* Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
|
|
* Copyright (C) 2018 - 2026 Michael Vetter <jubalh@iodoru.org>
|
|
*
|
|
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "glib.h"
|
|
#include "glib/gstdio.h"
|
|
|
|
#include "log.h"
|
|
#include "common.h"
|
|
#include "config/files.h"
|
|
#include "config/preferences.h"
|
|
|
|
#define PROF "prof"
|
|
|
|
static void _log_msg(log_level_t level, const char* const area, const char* const msg);
|
|
|
|
static FILE* logp;
|
|
static gchar* mainlogfile = NULL;
|
|
static gboolean user_provided_log = FALSE;
|
|
static log_level_t level_filter;
|
|
static pid_t prof_pid;
|
|
|
|
static int stderr_inited;
|
|
static log_level_t stderr_level;
|
|
static int stderr_pipe[2];
|
|
static char* stderr_buf;
|
|
static GString* stderr_msg;
|
|
|
|
enum {
|
|
STDERR_BUFSIZE = 4000,
|
|
STDERR_RETRY_NR = 5,
|
|
};
|
|
|
|
static void
|
|
_rotate_log_file(void)
|
|
{
|
|
if (!mainlogfile)
|
|
return;
|
|
auto_gchar gchar* log_file = g_strdup(mainlogfile);
|
|
size_t len = strlen(log_file);
|
|
auto_gchar gchar* log_file_new = malloc(len + 5);
|
|
|
|
// the mainlog file should always end in '.log', lets remove this last part
|
|
// so that we can have profanity.001.log later
|
|
if (len > 4) {
|
|
log_file[len - 4] = '\0';
|
|
}
|
|
|
|
// find an empty name. from .log -> log.001 -> log.999
|
|
for (int i = 1; i < 1000; i++) {
|
|
g_sprintf(log_file_new, "%s.%03d.log", log_file, i);
|
|
if (!g_file_test(log_file_new, G_FILE_TEST_EXISTS))
|
|
break;
|
|
}
|
|
|
|
log_close();
|
|
|
|
if (len > 4) {
|
|
log_file[len - 4] = '.';
|
|
}
|
|
|
|
rename(log_file, log_file_new);
|
|
|
|
log_init(log_get_filter(), NULL);
|
|
|
|
log_info("Log has been rotated");
|
|
}
|
|
|
|
// abbreviation string is the prefix that's used in the log file
|
|
static char*
|
|
_log_abbreviation_string_from_level(log_level_t level)
|
|
{
|
|
switch (level) {
|
|
case PROF_LEVEL_ERROR:
|
|
return "ERR";
|
|
case PROF_LEVEL_WARN:
|
|
return "WRN";
|
|
case PROF_LEVEL_INFO:
|
|
return "INF";
|
|
case PROF_LEVEL_DEBUG:
|
|
return "DBG";
|
|
default:
|
|
return "LOG";
|
|
}
|
|
}
|
|
|
|
static gboolean
|
|
_should_log(log_level_t level)
|
|
{
|
|
return level >= level_filter && logp;
|
|
}
|
|
|
|
void
|
|
log_debug(const char* const msg, ...)
|
|
{
|
|
if (!_should_log(PROF_LEVEL_DEBUG))
|
|
return;
|
|
va_list arg;
|
|
va_start(arg, msg);
|
|
GString* fmt_msg = g_string_new(NULL);
|
|
g_string_vprintf(fmt_msg, msg, arg);
|
|
_log_msg(PROF_LEVEL_DEBUG, PROF, fmt_msg->str);
|
|
g_string_free(fmt_msg, TRUE);
|
|
va_end(arg);
|
|
}
|
|
|
|
void
|
|
log_info(const char* const msg, ...)
|
|
{
|
|
if (!_should_log(PROF_LEVEL_INFO))
|
|
return;
|
|
va_list arg;
|
|
va_start(arg, msg);
|
|
GString* fmt_msg = g_string_new(NULL);
|
|
g_string_vprintf(fmt_msg, msg, arg);
|
|
_log_msg(PROF_LEVEL_INFO, PROF, fmt_msg->str);
|
|
g_string_free(fmt_msg, TRUE);
|
|
va_end(arg);
|
|
}
|
|
|
|
void
|
|
log_warning(const char* const msg, ...)
|
|
{
|
|
if (!_should_log(PROF_LEVEL_WARN))
|
|
return;
|
|
va_list arg;
|
|
va_start(arg, msg);
|
|
GString* fmt_msg = g_string_new(NULL);
|
|
g_string_vprintf(fmt_msg, msg, arg);
|
|
_log_msg(PROF_LEVEL_WARN, PROF, fmt_msg->str);
|
|
g_string_free(fmt_msg, TRUE);
|
|
va_end(arg);
|
|
}
|
|
|
|
void
|
|
log_error(const char* const msg, ...)
|
|
{
|
|
if (!_should_log(PROF_LEVEL_ERROR))
|
|
return;
|
|
va_list arg;
|
|
va_start(arg, msg);
|
|
GString* fmt_msg = g_string_new(NULL);
|
|
g_string_vprintf(fmt_msg, msg, arg);
|
|
_log_msg(PROF_LEVEL_ERROR, PROF, fmt_msg->str);
|
|
g_string_free(fmt_msg, TRUE);
|
|
va_end(arg);
|
|
}
|
|
|
|
void
|
|
log_init(log_level_t filter, const char* const log_file)
|
|
{
|
|
level_filter = filter;
|
|
|
|
if (log_file) {
|
|
user_provided_log = TRUE;
|
|
}
|
|
|
|
mainlogfile = files_get_log_file(log_file);
|
|
|
|
logp = fopen(mainlogfile, "a");
|
|
g_chmod(mainlogfile, S_IRUSR | S_IWUSR);
|
|
|
|
prof_pid = getpid();
|
|
}
|
|
|
|
const gchar*
|
|
get_log_file_location(void)
|
|
{
|
|
return mainlogfile;
|
|
}
|
|
|
|
log_level_t
|
|
log_get_filter(void)
|
|
{
|
|
return level_filter;
|
|
}
|
|
|
|
void
|
|
log_close(void)
|
|
{
|
|
g_free(mainlogfile);
|
|
mainlogfile = NULL;
|
|
if (logp) {
|
|
fclose(logp);
|
|
}
|
|
}
|
|
|
|
static void
|
|
_log_msg(log_level_t level, const char* const area, const char* const msg)
|
|
{
|
|
char* level_str = _log_abbreviation_string_from_level(level);
|
|
|
|
auto_gchar gchar* date_fmt = prof_date_time_format_iso8601(NULL);
|
|
|
|
fprintf(logp, "%s: %08d: %s: %s: %s\n", date_fmt, prof_pid, area, level_str, msg);
|
|
|
|
fflush(logp);
|
|
|
|
if (prefs_get_boolean(PREF_LOG_ROTATE) && !user_provided_log) {
|
|
long result = ftell(logp);
|
|
if (result != -1 && result >= prefs_get_max_log_size()) {
|
|
_rotate_log_file();
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
log_msg(log_level_t level, const char* const area, const char* const msg)
|
|
{
|
|
if (!_should_log(level))
|
|
return;
|
|
_log_msg(level, area, msg);
|
|
}
|
|
|
|
int
|
|
log_level_from_string(char* log_level, log_level_t* level)
|
|
{
|
|
int ret = 0;
|
|
assert(log_level != NULL);
|
|
assert(level != NULL);
|
|
if (strcmp(log_level, "DEBUG") == 0) {
|
|
*level = PROF_LEVEL_DEBUG;
|
|
} else if (strcmp(log_level, "INFO") == 0) {
|
|
*level = PROF_LEVEL_INFO;
|
|
} else if (strcmp(log_level, "WARN") == 0) {
|
|
*level = PROF_LEVEL_WARN;
|
|
} else if (strcmp(log_level, "ERROR") == 0) {
|
|
*level = PROF_LEVEL_ERROR;
|
|
} else { // default logging is warn
|
|
*level = PROF_LEVEL_WARN;
|
|
ret = -1;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
const char*
|
|
log_string_from_level(log_level_t level)
|
|
{
|
|
switch (level) {
|
|
case PROF_LEVEL_ERROR:
|
|
return "ERROR";
|
|
case PROF_LEVEL_WARN:
|
|
return "WARN";
|
|
case PROF_LEVEL_INFO:
|
|
return "INFO";
|
|
case PROF_LEVEL_DEBUG:
|
|
return "DEBUG";
|
|
default:
|
|
return "LOG";
|
|
}
|
|
}
|
|
|
|
void
|
|
log_stderr_handler(void)
|
|
{
|
|
GString* const s = stderr_msg;
|
|
char* const buf = stderr_buf;
|
|
ssize_t size;
|
|
int retry = 0;
|
|
|
|
if (!stderr_inited)
|
|
return;
|
|
|
|
do {
|
|
size = read(stderr_pipe[0], buf, STDERR_BUFSIZE);
|
|
if (size == -1 && errno == EINTR && retry++ < STDERR_RETRY_NR)
|
|
continue;
|
|
if (size <= 0 || retry++ >= STDERR_RETRY_NR)
|
|
break;
|
|
|
|
for (int i = 0; i < size; ++i) {
|
|
if (buf[i] == '\n') {
|
|
log_msg(stderr_level, "stderr", s->str);
|
|
g_string_assign(s, "");
|
|
} else
|
|
g_string_append_c(s, buf[i]);
|
|
}
|
|
} while (1);
|
|
|
|
if (s->len > 0 && s->str[0] != '\0') {
|
|
log_msg(stderr_level, "stderr", s->str);
|
|
g_string_assign(s, "");
|
|
}
|
|
}
|
|
|
|
static int
|
|
log_stderr_nonblock_set(int fd)
|
|
{
|
|
int rc;
|
|
|
|
rc = fcntl(fd, F_GETFL);
|
|
if (rc >= 0)
|
|
rc = fcntl(fd, F_SETFL, rc | O_NONBLOCK);
|
|
|
|
return rc;
|
|
}
|
|
|
|
static void
|
|
_log_stderr_close(void)
|
|
{
|
|
if (!stderr_inited)
|
|
return;
|
|
|
|
/* handle remaining logs before close */
|
|
log_stderr_handler();
|
|
stderr_inited = 0;
|
|
free(stderr_buf);
|
|
g_string_free(stderr_msg, TRUE);
|
|
close(stderr_pipe[0]);
|
|
close(stderr_pipe[1]);
|
|
}
|
|
|
|
void
|
|
log_stderr_init(log_level_t level)
|
|
{
|
|
int rc;
|
|
|
|
rc = pipe(stderr_pipe);
|
|
if (rc != 0)
|
|
goto err;
|
|
|
|
rc = log_stderr_nonblock_set(stderr_pipe[0])
|
|
?: log_stderr_nonblock_set(stderr_pipe[1]);
|
|
if (rc != 0)
|
|
goto err_close;
|
|
|
|
stderr_buf = malloc(STDERR_BUFSIZE);
|
|
stderr_msg = g_string_sized_new(STDERR_BUFSIZE);
|
|
|
|
if (stderr_buf == NULL || stderr_msg == NULL) {
|
|
errno = ENOMEM;
|
|
goto err_free;
|
|
}
|
|
|
|
if (dup2(stderr_pipe[1], STDERR_FILENO) < 0)
|
|
goto err_free;
|
|
// fd 2 now owns the pipe write end; release the original.
|
|
close(stderr_pipe[1]);
|
|
stderr_pipe[1] = STDERR_FILENO;
|
|
|
|
stderr_level = level;
|
|
stderr_inited = 1;
|
|
|
|
prof_add_shutdown_routine(_log_stderr_close);
|
|
return;
|
|
|
|
err_free:
|
|
if (stderr_msg != NULL)
|
|
g_string_free(stderr_msg, TRUE);
|
|
free(stderr_buf);
|
|
err_close:
|
|
close(stderr_pipe[0]);
|
|
close(stderr_pipe[1]);
|
|
err:
|
|
stderr_inited = 0;
|
|
log_error("Unable to init stderr log handler: %s", strerror(errno));
|
|
}
|