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>
314 lines
8.4 KiB
C
314 lines
8.4 KiB
C
/*
|
|
* notifier.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 <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <glib.h>
|
|
|
|
#ifdef HAVE_LIBNOTIFY
|
|
#include <libnotify/notify.h>
|
|
#endif
|
|
|
|
#ifdef PLATFORM_CYGWIN
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
#include "log.h"
|
|
#include "config/preferences.h"
|
|
#include "ui/ui.h"
|
|
#include "ui/window_list.h"
|
|
#ifdef HAVE_GTK
|
|
#include "ui/tray.h"
|
|
#endif
|
|
#include "xmpp/xmpp.h"
|
|
#include "xmpp/muc.h"
|
|
|
|
static GTimer* remind_timer;
|
|
|
|
#ifdef HAVE_LIBNOTIFY
|
|
static NotifyNotification* notification;
|
|
|
|
static void
|
|
_notifier_uninit(void)
|
|
{
|
|
if (notify_is_initted()) {
|
|
g_object_unref(G_OBJECT(notification));
|
|
notification = NULL;
|
|
notify_uninit();
|
|
}
|
|
}
|
|
#else
|
|
static void
|
|
_notifier_uninit(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_LIBNOTIFY
|
|
static void
|
|
_notify(const char* const message, int timeout, const char* const category)
|
|
{
|
|
#ifdef HAVE_GTK
|
|
if (!tray_gtk_ready()) {
|
|
return;
|
|
}
|
|
#endif
|
|
log_debug("Attempting notification: %s", message);
|
|
if (notify_is_initted()) {
|
|
log_debug("Reinitialising libnotify");
|
|
notify_uninit();
|
|
} else {
|
|
log_debug("Initialising libnotify");
|
|
}
|
|
notify_init("Profanity");
|
|
|
|
if (notify_is_initted()) {
|
|
if (notification)
|
|
g_object_unref(G_OBJECT(notification));
|
|
notification = notify_notification_new("Profanity", message, NULL);
|
|
notify_notification_set_timeout(notification, timeout);
|
|
notify_notification_set_category(notification, category);
|
|
notify_notification_set_urgency(notification, NOTIFY_URGENCY_NORMAL);
|
|
|
|
auto_gerror GError* error = NULL;
|
|
gboolean notify_success = notify_notification_show(notification, &error);
|
|
|
|
if (!notify_success) {
|
|
log_error("Error sending desktop notification:");
|
|
log_error(" -> Message : %s", message);
|
|
log_error(" -> Error : %s", PROF_GERROR_MESSAGE(error));
|
|
} else {
|
|
log_debug("Notification sent.");
|
|
}
|
|
} else {
|
|
log_error("Libnotify not initialised.");
|
|
}
|
|
}
|
|
#elif defined(PLATFORM_CYGWIN)
|
|
static void
|
|
_notify(const char* const message, int timeout, const char* const category)
|
|
{
|
|
NOTIFYICONDATA nid;
|
|
memset(&nid, 0, sizeof(nid));
|
|
nid.cbSize = sizeof(NOTIFYICONDATA);
|
|
// nid.hWnd = hWnd;
|
|
nid.uID = 100;
|
|
nid.uVersion = NOTIFYICON_VERSION;
|
|
// nid.uCallbackMessage = WM_MYMESSAGE;
|
|
nid.hIcon = LoadIcon(NULL, IDI_APPLICATION);
|
|
strcpy(nid.szTip, "Tray Icon");
|
|
nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
|
|
Shell_NotifyIcon(NIM_ADD, &nid);
|
|
|
|
// For a Ballon Tip
|
|
nid.uFlags = NIF_INFO;
|
|
strcpy(nid.szInfoTitle, "Profanity"); // Title
|
|
strncpy(nid.szInfo, message, sizeof(nid.szInfo) - 1); // Copy Tip
|
|
nid.uTimeout = timeout; // 3 Seconds
|
|
nid.dwInfoFlags = NIIF_INFO;
|
|
|
|
Shell_NotifyIcon(NIM_MODIFY, &nid);
|
|
}
|
|
#elif defined(HAVE_OSXNOTIFY)
|
|
static void
|
|
_notify(const char* const message, int timeout, const char* const category)
|
|
{
|
|
GString* notify_command = g_string_new("terminal-notifier -title \"Profanity\" -message '");
|
|
|
|
auto_char char* escaped_single = str_replace(message, "'", "'\\''");
|
|
|
|
if (escaped_single[0] == '<') {
|
|
g_string_append(notify_command, "\\<");
|
|
g_string_append(notify_command, &escaped_single[1]);
|
|
} else if (escaped_single[0] == '[') {
|
|
g_string_append(notify_command, "\\[");
|
|
g_string_append(notify_command, &escaped_single[1]);
|
|
} else if (escaped_single[0] == '(') {
|
|
g_string_append(notify_command, "\\(");
|
|
g_string_append(notify_command, &escaped_single[1]);
|
|
} else if (escaped_single[0] == '{') {
|
|
g_string_append(notify_command, "\\{");
|
|
g_string_append(notify_command, &escaped_single[1]);
|
|
} else {
|
|
g_string_append(notify_command, escaped_single);
|
|
}
|
|
|
|
g_string_append(notify_command, "'");
|
|
|
|
char* term_name = getenv("TERM_PROGRAM");
|
|
char* app_id = NULL;
|
|
if (g_strcmp0(term_name, "Apple_Terminal") == 0) {
|
|
app_id = "com.apple.Terminal";
|
|
} else if (g_strcmp0(term_name, "iTerm.app") == 0) {
|
|
app_id = "com.googlecode.iterm2";
|
|
}
|
|
|
|
if (app_id) {
|
|
g_string_append(notify_command, " -sender ");
|
|
g_string_append(notify_command, app_id);
|
|
}
|
|
|
|
int res = system(notify_command->str);
|
|
if (res == -1) {
|
|
log_error("Could not send desktop notification.");
|
|
}
|
|
|
|
g_string_free(notify_command, TRUE);
|
|
}
|
|
#else
|
|
static void
|
|
_notify(const char* const message, int timeout, const char* const category)
|
|
{
|
|
log_error_once("Notification backend missing");
|
|
}
|
|
#endif
|
|
|
|
void
|
|
notifier_initialise(void)
|
|
{
|
|
remind_timer = g_timer_new();
|
|
}
|
|
|
|
void
|
|
notifier_uninit(void)
|
|
{
|
|
_notifier_uninit();
|
|
g_timer_destroy(remind_timer);
|
|
}
|
|
|
|
void
|
|
notify_typing(const char* const name)
|
|
{
|
|
auto_gchar gchar* message = g_strdup_printf("%s: typing…", name);
|
|
notify(message, 10000, "Incoming message");
|
|
}
|
|
|
|
void
|
|
notify_invite(const char* const from, const char* const room, const char* const reason)
|
|
{
|
|
GString* message = g_string_new("Room invite\nfrom: ");
|
|
g_string_append(message, from);
|
|
g_string_append(message, "\nto: ");
|
|
g_string_append(message, room);
|
|
if (reason) {
|
|
g_string_append_printf(message, "\n\"%s\"", reason);
|
|
}
|
|
|
|
notify(message->str, 10000, "Incoming message");
|
|
|
|
g_string_free(message, TRUE);
|
|
}
|
|
|
|
void
|
|
notify_message(const char* const name, int num, const char* const text)
|
|
{
|
|
int ui_index = num;
|
|
if (ui_index == 10) {
|
|
ui_index = 0;
|
|
}
|
|
|
|
GString* message = g_string_new("");
|
|
g_string_append_printf(message, "%s (win %d)", name, ui_index);
|
|
if (text && prefs_get_boolean(PREF_NOTIFY_CHAT_TEXT)) {
|
|
g_string_append_printf(message, "\n%s", text);
|
|
}
|
|
|
|
notify(message->str, 10000, "incoming message");
|
|
g_string_free(message, TRUE);
|
|
}
|
|
|
|
void
|
|
notify_room_message(const char* const nick, const char* const room, int num, const char* const text)
|
|
{
|
|
int ui_index = num;
|
|
if (ui_index == 10) {
|
|
ui_index = 0;
|
|
}
|
|
|
|
GString* message = g_string_new("");
|
|
g_string_append_printf(message, "%s in %s (win %d)", nick, room, ui_index);
|
|
if (text && prefs_get_boolean(PREF_NOTIFY_ROOM_TEXT)) {
|
|
g_string_append_printf(message, "\n%s", text);
|
|
}
|
|
|
|
notify(message->str, 10000, "incoming message");
|
|
|
|
g_string_free(message, TRUE);
|
|
}
|
|
|
|
void
|
|
notify_subscription(const char* const from)
|
|
{
|
|
GString* message = g_string_new("Subscription request: \n");
|
|
g_string_append(message, from);
|
|
notify(message->str, 10000, "Incoming message");
|
|
g_string_free(message, TRUE);
|
|
}
|
|
|
|
void
|
|
notify_remind(void)
|
|
{
|
|
gdouble elapsed = g_timer_elapsed(remind_timer, NULL);
|
|
gint remind_period = prefs_get_notify_remind();
|
|
if (remind_period > 0 && elapsed >= remind_period) {
|
|
gboolean donotify = wins_do_notify_remind();
|
|
gint unread = wins_get_total_unread();
|
|
gint open = muc_invites_count();
|
|
gint subs = presence_sub_request_count();
|
|
|
|
GString* text = g_string_new("");
|
|
|
|
if (donotify && unread > 0) {
|
|
if (unread == 1) {
|
|
g_string_append(text, "1 unread message");
|
|
} else {
|
|
g_string_append_printf(text, "%d unread messages", unread);
|
|
}
|
|
}
|
|
if (open > 0) {
|
|
if (unread > 0) {
|
|
g_string_append(text, "\n");
|
|
}
|
|
if (open == 1) {
|
|
g_string_append(text, "1 room invite");
|
|
} else {
|
|
g_string_append_printf(text, "%d room invites", open);
|
|
}
|
|
}
|
|
if (subs > 0) {
|
|
if ((unread > 0) || (open > 0)) {
|
|
g_string_append(text, "\n");
|
|
}
|
|
if (subs == 1) {
|
|
g_string_append(text, "1 subscription request");
|
|
} else {
|
|
g_string_append_printf(text, "%d subscription requests", subs);
|
|
}
|
|
}
|
|
|
|
if ((donotify && unread > 0) || (open > 0) || (subs > 0)) {
|
|
notify(text->str, 5000, "Incoming message");
|
|
}
|
|
|
|
g_string_free(text, TRUE);
|
|
|
|
g_timer_start(remind_timer);
|
|
}
|
|
}
|
|
|
|
void
|
|
notify(const char* const message, int timeout, const char* const category)
|
|
{
|
|
log_debug("Attempting notification: %s", message);
|
|
_notify(message, timeout, category);
|
|
}
|