Some checks failed
CI Code / Check coding style (pull_request) Failing after 7s
CI Code / Check spelling (pull_request) Successful in 17s
CI Code / Linux (debian) (pull_request) Successful in 7m1s
CI Code / Linux (ubuntu) (pull_request) Successful in 7m44s
CI Code / Code Coverage (pull_request) Successful in 7m35s
Lint / DCO (pull_request) Failing after 7s
Lint / conventional commits (pull_request) Failing after 45s
CI Code / Linux (arch) (pull_request) Successful in 9m23s
Build / ubuntu | func | signal (pull_request) Has been cancelled
Lint / coding style (pull_request) Has been cancelled
Lint / spellcheck (pull_request) Has been cancelled
Build / cygwin / build only (pull_request) Has been cancelled
CodeQL / analyze (pull_request) Has been cancelled
Merge profanity-im/profanity master (373 commits) into cproof fork.
Source changes (manual merge):
- src/command/: cmd_defs, cmd_funcs, cmd_ac — upstream g_new0, auto_gchar,
launch_editor callback; keep our XEP-0308 LMC, force-encryption, CWE-134
- src/config/: preferences, tlscerts, account — upstream UNIQUE dedup,
dynamic pad capacity; keep our db_history_result_t, scroll logic
- src/database.*: upstream g_new0 memory mgmt; keep our return types,
add null-check fix for msg->timestamp
- src/omemo/, src/pgp/: upstream _gpgme_key_get_email, g_new0;
keep our replace_id in omemo_on_message_send
- src/tools/: editor, http_upload, bookmark_ignore — upstream launch_editor
callback API
- src/ui/: console, window, chatwin, mucwin, inputwin, buffer —
upstream win_warn_needed/sent dedup, PAD_MIN_HEIGHT dynamic pads;
keep our y_start_pos scroll, _truncate_datetime_suffix
- src/xmpp/: message, stanza, presence, roster_list, iq, session —
upstream connection_get_available_resources; keep our LMC stanza logic
- src/common.c: fix format-security (cons_show)
Build system:
- Makefile.am: updated test paths to subdirectory structure, added
test_cmd_ac, test_forced_encryption
- Restored autotools files deleted by upstream meson migration:
bootstrap.sh, autogen.sh, m4/ax_valgrind_check.m4, configure-debug
Tests:
- Unit tests: upstream unittests.c base + our forced_encryption tests
(482 passed, 0 failed across all 4 configurations)
- Functional tests: kept our version (93 passed, 0 failed)
upstream version requires stbbr_for_xmlns not yet in our stabber fork
- Updated test stubs: stub_xmpp.c, stub_omemo.c from upstream
Compile fixes:
- src/common.c: cons_show(errmsg) -> cons_show("%s", errmsg)
- src/database.c: null-check before msg->timestamp access
- src/ui/console.c: size_t -> (int) cast for format width
- src/config/tlscerts.c: %d -> %zu for size_t
373 lines
7.9 KiB
C
373 lines
7.9 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;
|
|
}
|
|
|
|
int dup_fd = dup2(stderr_pipe[1], STDERR_FILENO);
|
|
if (dup_fd < 0)
|
|
goto err_free;
|
|
close(dup_fd);
|
|
|
|
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));
|
|
}
|