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>
146 lines
2.9 KiB
C
146 lines
2.9 KiB
C
/*
|
|
* vcard.h
|
|
* vim: expandtab:ts=4:sts=4:sw=4
|
|
*
|
|
* Copyright (C) 2022 Marouane L. <techmetx11@disroot.org>
|
|
*
|
|
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
|
|
*/
|
|
|
|
#ifndef XMPP_VCARD_H
|
|
#define XMPP_VCARD_H
|
|
|
|
#include <glib.h>
|
|
|
|
// 17 bits are currently used, out of (a possible) 32 bits
|
|
typedef enum {
|
|
VCARD_HOME = 1,
|
|
VCARD_WORK = 2,
|
|
VCARD_POSTAL = 4,
|
|
VCARD_PARCEL = 8,
|
|
VCARD_INTL = 16,
|
|
VCARD_PREF = 32,
|
|
VCARD_TEL_VOICE = 64,
|
|
VCARD_TEL_FAX = 128,
|
|
VCARD_TEL_PAGER = 256,
|
|
VCARD_TEL_MSG = 512,
|
|
VCARD_TEL_CELL = 1024,
|
|
VCARD_TEL_VIDEO = 2048,
|
|
VCARD_TEL_BBS = 4096,
|
|
VCARD_TEL_MODEM = 8192,
|
|
VCARD_TEL_ISDN = 16384,
|
|
VCARD_TEL_PCS = 32768,
|
|
VCARD_EMAIL_X400 = 65536,
|
|
VCARD_EMAIL_INTERNET = 131072,
|
|
VCARD_DOM = 262144
|
|
} vcard_element_options_t;
|
|
|
|
typedef struct _vcard_name
|
|
{
|
|
char *family, *given, *middle, *prefix, *suffix;
|
|
} vcard_name_t;
|
|
|
|
typedef struct _vcard_element_photo
|
|
{
|
|
union {
|
|
struct
|
|
{
|
|
guchar* data;
|
|
char* type;
|
|
gsize length;
|
|
};
|
|
char* extval;
|
|
};
|
|
gboolean external;
|
|
} vcard_element_photo_t;
|
|
|
|
typedef struct _vcard_element_address
|
|
{
|
|
char *pobox, *extaddr, *street, *locality, *region, *pcode, *country;
|
|
|
|
// Options used:
|
|
// VCARD_HOME
|
|
// VCARD_WORK
|
|
// VCARD_POSTAL
|
|
// VCARD_PARCEL
|
|
// VCARD_DOM
|
|
// VCARD_INTL
|
|
// VCARD_PREF
|
|
vcard_element_options_t options;
|
|
} vcard_element_address_t;
|
|
|
|
typedef struct _vcard_element_telephone
|
|
{
|
|
char* number;
|
|
|
|
// Options used:
|
|
// VCARD_HOME
|
|
// VCARD_WORK
|
|
// VCARD_TEL_VOICE
|
|
// VCARD_TEL_FAX
|
|
// VCARD_TEL_PAGER
|
|
// VCARD_TEL_MSG
|
|
// VCARD_TEL_CELL
|
|
// VCARD_TEL_VIDEO
|
|
// VCARD_TEL_BBS
|
|
// VCARD_TEL_MODEM
|
|
// VCARD_TEL_ISDN
|
|
// VCARD_TEL_PCS
|
|
// VCARD_PREF
|
|
vcard_element_options_t options;
|
|
} vcard_element_telephone_t;
|
|
|
|
typedef struct _vcard_element_email
|
|
{
|
|
char* userid;
|
|
|
|
// Options used:
|
|
// VCARD_HOME
|
|
// VCARD_WORK
|
|
// VCARD_EMAIL_X400
|
|
// VCARD_PREF
|
|
vcard_element_options_t options;
|
|
} vcard_element_email_t;
|
|
|
|
typedef enum _vcard_element_type {
|
|
VCARD_NICKNAME,
|
|
VCARD_PHOTO,
|
|
VCARD_BIRTHDAY,
|
|
VCARD_ADDRESS,
|
|
VCARD_TELEPHONE,
|
|
VCARD_EMAIL,
|
|
VCARD_JID,
|
|
VCARD_TITLE,
|
|
VCARD_ROLE,
|
|
VCARD_NOTE,
|
|
VCARD_URL
|
|
} vcard_element_type;
|
|
|
|
typedef struct _vcard_element
|
|
{
|
|
vcard_element_type type;
|
|
|
|
union {
|
|
char *nickname, *jid, *title, *role, *note, *url;
|
|
vcard_element_photo_t photo;
|
|
GDateTime* birthday;
|
|
vcard_element_address_t address;
|
|
vcard_element_telephone_t telephone;
|
|
vcard_element_email_t email;
|
|
};
|
|
} vcard_element_t;
|
|
|
|
typedef struct _vcard
|
|
{
|
|
// These elements are only meant to appear once (per DTD)
|
|
vcard_name_t name;
|
|
char* fullname;
|
|
|
|
gboolean modified;
|
|
|
|
// GQueue of vcard_element*
|
|
GQueue* elements;
|
|
} vCard;
|
|
|
|
#endif
|