Jabber Developer
72f4f186da
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>
96 lines
3.7 KiB
C
96 lines
3.7 KiB
C
/*
|
|
* database.h
|
|
* vim: expandtab:ts=4:sts=4:sw=4
|
|
*
|
|
* Copyright (C) 2020 - 2026 Michael Vetter <jubalh@iodoru.org>
|
|
*
|
|
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
|
|
*/
|
|
|
|
#ifndef DATABASE_H
|
|
#define DATABASE_H
|
|
|
|
#include <glib.h>
|
|
#include "config/account.h"
|
|
#include "xmpp/xmpp.h"
|
|
|
|
#define MESSAGES_TO_RETRIEVE 100
|
|
|
|
typedef enum {
|
|
DB_RESPONSE_ERROR,
|
|
DB_RESPONSE_EMPTY,
|
|
DB_RESPONSE_SUCCESS
|
|
} db_history_result_t;
|
|
|
|
// Integrity verification issue levels
|
|
typedef enum {
|
|
INTEGRITY_ERROR,
|
|
INTEGRITY_WARNING,
|
|
INTEGRITY_INFO
|
|
} integrity_level_t;
|
|
|
|
// A single integrity issue found during verification
|
|
typedef struct
|
|
{
|
|
integrity_level_t level;
|
|
char* file;
|
|
int line;
|
|
char* message;
|
|
} integrity_issue_t;
|
|
|
|
void integrity_issue_free(integrity_issue_t* issue);
|
|
|
|
// Backend vtable: pluggable storage backends implement this interface
|
|
typedef struct db_backend_t
|
|
{
|
|
const char* name;
|
|
gboolean (*init)(ProfAccount* account);
|
|
void (*close)(void);
|
|
void (*add_incoming)(ProfMessage* message);
|
|
void (*add_outgoing_chat)(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
|
|
void (*add_outgoing_muc)(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
|
|
void (*add_outgoing_muc_pm)(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
|
|
db_history_result_t (*get_previous_chat)(const gchar* const contact_barejid, const gchar* start_time, const gchar* end_time, gboolean from_start, gboolean flip, GSList** result);
|
|
ProfMessage* (*get_limits_info)(const gchar* const contact_barejid, gboolean is_last);
|
|
GSList* (*verify_integrity)(const gchar* const contact_barejid);
|
|
} db_backend_t;
|
|
|
|
// Active backend (set during init based on PREF_DBLOG)
|
|
extern db_backend_t* active_db_backend;
|
|
|
|
// Backend registry
|
|
#ifdef HAVE_SQLITE
|
|
db_backend_t* db_backend_sqlite(void);
|
|
GSList* db_sqlite_list_contacts(void);
|
|
GSList* db_sqlite_get_all_chat(const gchar* const contact_barejid);
|
|
void db_sqlite_begin_transaction(void);
|
|
void db_sqlite_end_transaction(void);
|
|
void db_sqlite_rollback_transaction(void);
|
|
int db_sqlite_last_changes(void);
|
|
gboolean db_sqlite_is_open(void);
|
|
#endif
|
|
db_backend_t* db_backend_flatfile(void);
|
|
|
|
// Public API (dispatches to active_db_backend)
|
|
gboolean log_database_init(ProfAccount* account);
|
|
gboolean log_database_switch_backend(const char* new_backend);
|
|
void log_database_add_incoming(ProfMessage* message);
|
|
void log_database_add_outgoing_chat(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
|
|
void log_database_add_outgoing_muc(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
|
|
void log_database_add_outgoing_muc_pm(const char* const id, const char* const barejid, const char* const message, const char* const replace_id, prof_enc_t enc);
|
|
db_history_result_t log_database_get_previous_chat(const gchar* const contact_barejid, const gchar* start_time, const gchar* end_time, gboolean from_start, gboolean flip, GSList** result);
|
|
ProfMessage* log_database_get_limits_info(const gchar* const contact_barejid, gboolean is_last);
|
|
void log_database_close(void);
|
|
GSList* log_database_verify_integrity(const gchar* const contact_barejid);
|
|
|
|
// FALSE if no backend, or PREF_DBLOG is "off" / "redact".
|
|
gboolean log_database_can_recover_messages(void);
|
|
|
|
// Cross-backend export/import (requires HAVE_SQLITE)
|
|
#ifdef HAVE_SQLITE
|
|
int log_database_export_to_flatfile(const gchar* const contact_jid);
|
|
int log_database_import_from_flatfile(const gchar* const contact_jid);
|
|
#endif
|
|
|
|
#endif // DATABASE_H
|