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>
154 lines
3.7 KiB
C
154 lines
3.7 KiB
C
/*
|
|
* resource.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 <assert.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <glib.h>
|
|
|
|
#include "common.h"
|
|
#include "xmpp/resource.h"
|
|
|
|
Resource*
|
|
resource_new(const gchar* const name, resource_presence_t presence, const gchar* const status, const int priority)
|
|
{
|
|
assert(name != NULL);
|
|
Resource* new_resource = g_new(Resource, 1);
|
|
new_resource->name = g_strdup(name);
|
|
new_resource->presence = presence;
|
|
if (status) {
|
|
new_resource->status = g_strdup(status);
|
|
} else {
|
|
new_resource->status = NULL;
|
|
}
|
|
new_resource->priority = priority;
|
|
|
|
return new_resource;
|
|
}
|
|
|
|
int
|
|
resource_compare_availability(Resource* first, Resource* second)
|
|
{
|
|
if (first->priority > second->priority) {
|
|
return -1;
|
|
} else if (first->priority < second->priority) {
|
|
return 1;
|
|
} else { // priorities equal
|
|
if (first->presence == RESOURCE_CHAT) {
|
|
return -1;
|
|
} else if (second->presence == RESOURCE_CHAT) {
|
|
return 1;
|
|
} else if (first->presence == RESOURCE_ONLINE) {
|
|
return -1;
|
|
} else if (second->presence == RESOURCE_ONLINE) {
|
|
return 1;
|
|
} else if (first->presence == RESOURCE_AWAY) {
|
|
return -1;
|
|
} else if (second->presence == RESOURCE_AWAY) {
|
|
return 1;
|
|
} else if (first->presence == RESOURCE_XA) {
|
|
return -1;
|
|
} else if (second->presence == RESOURCE_XA) {
|
|
return 1;
|
|
} else {
|
|
return -1;
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
resource_destroy(Resource* resource)
|
|
{
|
|
if (resource) {
|
|
g_free(resource->name);
|
|
resource->name = NULL;
|
|
g_free(resource->status);
|
|
resource->status = NULL;
|
|
g_free(resource);
|
|
}
|
|
}
|
|
|
|
Resource*
|
|
resource_copy(Resource* resource)
|
|
{
|
|
if (resource == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
return resource_new(resource->name, resource->presence, resource->status, resource->priority);
|
|
}
|
|
|
|
gboolean
|
|
valid_resource_presence_string(const gchar* const str)
|
|
{
|
|
assert(str != NULL);
|
|
if ((strcmp(str, "online") == 0) || (strcmp(str, "chat") == 0) || (strcmp(str, "away") == 0) || (strcmp(str, "xa") == 0) || (strcmp(str, "dnd") == 0)) {
|
|
return TRUE;
|
|
} else {
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
const gchar*
|
|
string_from_resource_presence(resource_presence_t presence)
|
|
{
|
|
switch (presence) {
|
|
case RESOURCE_CHAT:
|
|
return "chat";
|
|
case RESOURCE_AWAY:
|
|
return "away";
|
|
case RESOURCE_XA:
|
|
return "xa";
|
|
case RESOURCE_DND:
|
|
return "dnd";
|
|
default:
|
|
return "online";
|
|
}
|
|
}
|
|
|
|
resource_presence_t
|
|
resource_presence_from_string(const gchar* const str)
|
|
{
|
|
if (str == NULL) {
|
|
return RESOURCE_ONLINE;
|
|
} else if (strcmp(str, "online") == 0) {
|
|
return RESOURCE_ONLINE;
|
|
} else if (strcmp(str, "chat") == 0) {
|
|
return RESOURCE_CHAT;
|
|
} else if (strcmp(str, "away") == 0) {
|
|
return RESOURCE_AWAY;
|
|
} else if (strcmp(str, "xa") == 0) {
|
|
return RESOURCE_XA;
|
|
} else if (strcmp(str, "dnd") == 0) {
|
|
return RESOURCE_DND;
|
|
} else {
|
|
return RESOURCE_ONLINE;
|
|
}
|
|
}
|
|
|
|
contact_presence_t
|
|
contact_presence_from_resource_presence(resource_presence_t resource_presence)
|
|
{
|
|
switch (resource_presence) {
|
|
case RESOURCE_CHAT:
|
|
return CONTACT_CHAT;
|
|
case RESOURCE_AWAY:
|
|
return CONTACT_AWAY;
|
|
case RESOURCE_XA:
|
|
return CONTACT_XA;
|
|
case RESOURCE_DND:
|
|
return CONTACT_DND;
|
|
default:
|
|
return CONTACT_ONLINE;
|
|
}
|
|
}
|