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>
236 lines
6.5 KiB
C
236 lines
6.5 KiB
C
/*
|
|
* account.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 <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <sys/wait.h>
|
|
|
|
#include <glib.h>
|
|
|
|
#include "common.h"
|
|
#include "log.h"
|
|
#include "config/account.h"
|
|
#include "xmpp/jid.h"
|
|
#include "xmpp/resource.h"
|
|
|
|
ProfAccount*
|
|
account_new(gchar* name, gchar* jid, gchar* password, gchar* eval_password, gboolean enabled,
|
|
gchar* server, int port, gchar* resource, gchar* last_presence, gchar* login_presence,
|
|
int priority_online, int priority_chat, int priority_away, int priority_xa, int priority_dnd,
|
|
gchar* muc_service, gchar* muc_nick,
|
|
gchar* otr_policy, GList* otr_manual, GList* otr_opportunistic, GList* otr_always,
|
|
gchar* omemo_policy, GList* omemo_enabled, GList* omemo_disabled,
|
|
GList* ox_enabled, GList* pgp_enabled, gchar* pgp_keyid,
|
|
gchar* startscript, gchar* theme, gchar* tls_policy, gchar* auth_policy,
|
|
gchar* client, int max_sessions)
|
|
{
|
|
ProfAccount* new_account = g_new0(ProfAccount, 1);
|
|
|
|
new_account->name = name;
|
|
|
|
if (jid) {
|
|
new_account->jid = jid;
|
|
} else {
|
|
new_account->jid = strdup(name);
|
|
}
|
|
|
|
new_account->password = password;
|
|
|
|
new_account->eval_password = eval_password;
|
|
|
|
new_account->enabled = enabled;
|
|
|
|
new_account->server = server;
|
|
|
|
new_account->resource = resource;
|
|
|
|
new_account->port = port;
|
|
|
|
if (last_presence == NULL || !valid_resource_presence_string(last_presence)) {
|
|
new_account->last_presence = strdup("online");
|
|
g_free(last_presence);
|
|
} else {
|
|
new_account->last_presence = last_presence;
|
|
}
|
|
|
|
if (login_presence == NULL) {
|
|
new_account->login_presence = strdup("online");
|
|
} else if (strcmp(login_presence, "last") == 0) {
|
|
new_account->login_presence = login_presence;
|
|
} else if (!valid_resource_presence_string(login_presence)) {
|
|
new_account->login_presence = strdup("online");
|
|
g_free(login_presence);
|
|
} else {
|
|
new_account->login_presence = login_presence;
|
|
}
|
|
|
|
new_account->priority_online = priority_online;
|
|
new_account->priority_chat = priority_chat;
|
|
new_account->priority_away = priority_away;
|
|
new_account->priority_xa = priority_xa;
|
|
new_account->priority_dnd = priority_dnd;
|
|
|
|
new_account->muc_service = muc_service;
|
|
|
|
if (muc_nick == NULL) {
|
|
auto_jid Jid* jidp = jid_create(new_account->jid);
|
|
new_account->muc_nick = strdup(jidp->domainpart);
|
|
} else {
|
|
new_account->muc_nick = muc_nick;
|
|
}
|
|
|
|
new_account->otr_policy = otr_policy;
|
|
|
|
new_account->otr_manual = otr_manual;
|
|
new_account->otr_opportunistic = otr_opportunistic;
|
|
new_account->otr_always = otr_always;
|
|
|
|
new_account->omemo_policy = omemo_policy;
|
|
new_account->omemo_enabled = omemo_enabled;
|
|
new_account->omemo_disabled = omemo_disabled;
|
|
|
|
new_account->ox_enabled = ox_enabled;
|
|
|
|
new_account->pgp_enabled = pgp_enabled;
|
|
new_account->pgp_keyid = pgp_keyid;
|
|
|
|
new_account->startscript = startscript;
|
|
|
|
new_account->client = client;
|
|
|
|
new_account->theme = theme;
|
|
|
|
new_account->tls_policy = tls_policy;
|
|
|
|
new_account->auth_policy = auth_policy;
|
|
|
|
new_account->max_sessions = max_sessions;
|
|
|
|
return new_account;
|
|
}
|
|
|
|
gchar*
|
|
account_create_connect_jid(ProfAccount* account)
|
|
{
|
|
if (account->resource) {
|
|
return create_fulljid(account->jid, account->resource);
|
|
} else {
|
|
return g_strdup(account->jid);
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
account_eval_password(ProfAccount* account)
|
|
{
|
|
assert(account != NULL);
|
|
assert(account->eval_password != NULL);
|
|
|
|
gchar* stdout_buf = NULL;
|
|
GError* error = NULL;
|
|
gint exit_status = 0;
|
|
gchar** argv = NULL;
|
|
|
|
if (!g_shell_parse_argv(account->eval_password, NULL, &argv, &error)) {
|
|
log_error("Failed to parse `eval_password` command: %s", error->message);
|
|
g_error_free(error);
|
|
return FALSE;
|
|
}
|
|
|
|
if (!g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_CHILD_INHERITS_STDIN, NULL, NULL, &stdout_buf, NULL, &exit_status, &error)) {
|
|
log_error("Failed to execute `eval_password` command: %s", error->message);
|
|
g_strfreev(argv);
|
|
g_error_free(error);
|
|
return FALSE;
|
|
}
|
|
|
|
g_strfreev(argv);
|
|
|
|
if (WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == 0) {
|
|
account->password = stdout_buf;
|
|
g_strstrip(account->password);
|
|
if (account->password[0] == '\0') {
|
|
log_error("Empty password returned by `eval_password` command.");
|
|
g_free(account->password);
|
|
account->password = NULL;
|
|
return FALSE;
|
|
}
|
|
return TRUE;
|
|
} else {
|
|
log_error("`eval_password` command failed with status %d", exit_status);
|
|
g_free(stdout_buf);
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
void
|
|
account_free(ProfAccount* account)
|
|
{
|
|
if (account == NULL) {
|
|
return;
|
|
}
|
|
|
|
free(account->name);
|
|
free(account->jid);
|
|
free(account->password);
|
|
free(account->eval_password);
|
|
free(account->resource);
|
|
free(account->server);
|
|
free(account->last_presence);
|
|
free(account->login_presence);
|
|
free(account->muc_service);
|
|
free(account->muc_nick);
|
|
free(account->otr_policy);
|
|
free(account->omemo_policy);
|
|
free(account->pgp_keyid);
|
|
free(account->startscript);
|
|
free(account->client);
|
|
free(account->theme);
|
|
free(account->tls_policy);
|
|
free(account->auth_policy);
|
|
g_list_free_full(account->otr_manual, g_free);
|
|
g_list_free_full(account->otr_opportunistic, g_free);
|
|
g_list_free_full(account->otr_always, g_free);
|
|
g_list_free_full(account->omemo_enabled, g_free);
|
|
g_list_free_full(account->omemo_disabled, g_free);
|
|
g_list_free_full(account->ox_enabled, g_free);
|
|
g_list_free_full(account->pgp_enabled, g_free);
|
|
free(account);
|
|
}
|
|
|
|
void
|
|
account_set_server(ProfAccount* account, const char* server)
|
|
{
|
|
free(account->server);
|
|
account->server = strdup(server);
|
|
}
|
|
|
|
void
|
|
account_set_port(ProfAccount* account, int port)
|
|
{
|
|
account->port = port;
|
|
}
|
|
|
|
void
|
|
account_set_tls_policy(ProfAccount* account, const char* tls_policy)
|
|
{
|
|
free(account->tls_policy);
|
|
account->tls_policy = strdup(tls_policy);
|
|
}
|
|
|
|
void
|
|
account_set_auth_policy(ProfAccount* account, const char* auth_policy)
|
|
{
|
|
free(account->auth_policy);
|
|
account->auth_policy = strdup(auth_policy);
|
|
}
|