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>
142 lines
5.0 KiB
C
142 lines
5.0 KiB
C
/*
|
|
* muc.h
|
|
* 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
|
|
*/
|
|
|
|
#ifndef XMPP_MUC_H
|
|
#define XMPP_MUC_H
|
|
|
|
#include <glib.h>
|
|
|
|
#include "tools/autocomplete.h"
|
|
#include "ui/win_types.h"
|
|
#include "xmpp/contact.h"
|
|
#include "xmpp/jid.h"
|
|
|
|
typedef enum {
|
|
MUC_ROLE_NONE,
|
|
MUC_ROLE_VISITOR,
|
|
MUC_ROLE_PARTICIPANT,
|
|
MUC_ROLE_MODERATOR
|
|
} muc_role_t;
|
|
|
|
typedef enum {
|
|
MUC_AFFILIATION_NONE,
|
|
MUC_AFFILIATION_OUTCAST,
|
|
MUC_AFFILIATION_MEMBER,
|
|
MUC_AFFILIATION_ADMIN,
|
|
MUC_AFFILIATION_OWNER
|
|
} muc_affiliation_t;
|
|
|
|
typedef enum {
|
|
MUC_MEMBER_TYPE_UNKNOWN,
|
|
MUC_MEMBER_TYPE_PUBLIC,
|
|
MUC_MEMBER_TYPE_MEMBERS_ONLY
|
|
} muc_member_type_t;
|
|
|
|
typedef enum {
|
|
MUC_ANONYMITY_TYPE_UNKNOWN,
|
|
MUC_ANONYMITY_TYPE_NONANONYMOUS,
|
|
MUC_ANONYMITY_TYPE_SEMIANONYMOUS
|
|
} muc_anonymity_type_t;
|
|
|
|
typedef struct _muc_occupant_t
|
|
{
|
|
char* nick;
|
|
gchar* nick_collate_key;
|
|
char* jid;
|
|
muc_role_t role;
|
|
muc_affiliation_t affiliation;
|
|
resource_presence_t presence;
|
|
char* status;
|
|
} Occupant;
|
|
|
|
void muc_init(void);
|
|
|
|
void muc_join(const char* const room, const char* const nick, const char* const password, gboolean autojoin);
|
|
void muc_leave(const char* const room);
|
|
|
|
gboolean muc_active(const char* const room);
|
|
gboolean muc_autojoin(const char* const room);
|
|
|
|
GList* muc_rooms(void);
|
|
|
|
void muc_set_features(const char* const room, GSList* features);
|
|
|
|
const char* muc_nick(const char* const room);
|
|
char* muc_password(const char* const room);
|
|
|
|
void muc_nick_change_start(const char* const room, const char* const new_nick);
|
|
void muc_nick_change_complete(const char* const room, const char* const nick);
|
|
gboolean muc_nick_change_pending(const char* const room);
|
|
char* muc_old_nick(const char* const room, const char* const new_nick);
|
|
|
|
gboolean muc_roster_contains_nick(const char* const room, const char* const nick);
|
|
gboolean muc_roster_complete(const char* const room);
|
|
gboolean muc_roster_add(const char* const room, const char* const nick, const char* const jid, const char* const role,
|
|
const char* const affiliation, const char* const show, const char* const status);
|
|
void muc_roster_remove(const char* const room, const char* const nick);
|
|
void muc_roster_set_complete(const char* const room);
|
|
GList* muc_roster(const char* const room);
|
|
Autocomplete muc_roster_ac(const char* const room);
|
|
Autocomplete muc_roster_jid_ac(const char* const room);
|
|
void muc_jid_autocomplete_reset(const char* const room);
|
|
void muc_jid_autocomplete_add_all(const char* const room, GSList* jids);
|
|
|
|
Occupant* muc_roster_item(const char* const room, const char* const nick);
|
|
|
|
gboolean muc_occupant_available(Occupant* occupant);
|
|
const char* muc_occupant_affiliation_str(Occupant* occupant);
|
|
const char* muc_occupant_role_str(Occupant* occupant);
|
|
GSList* muc_occupants_by_role(const char* const room, muc_role_t role);
|
|
GSList* muc_occupants_by_affiliation(const char* const room, muc_affiliation_t affiliation);
|
|
|
|
void muc_occupant_nick_change_start(const char* const room, const char* const new_nick, const char* const old_nick);
|
|
char* muc_roster_nick_change_complete(const char* const room, const char* const nick);
|
|
|
|
void muc_confserver_add(const char* const server);
|
|
void muc_confserver_reset_ac(void);
|
|
char* muc_confserver_find(const char* const search_str, gboolean previous, void* context);
|
|
void muc_confserver_clear(void);
|
|
|
|
void muc_invites_add(const char* const room, const char* const password);
|
|
void muc_invites_remove(const char* const room);
|
|
gint muc_invites_count(void);
|
|
GList* muc_invites(void);
|
|
gboolean muc_invites_contain(const char* const room);
|
|
void muc_invites_reset_ac(void);
|
|
char* muc_invites_find(const char* const search_str, gboolean previous, void* context);
|
|
void muc_invites_clear(void);
|
|
char* muc_invite_password(const char* const room);
|
|
|
|
void muc_set_subject(const char* const room, const char* const subject);
|
|
char* muc_subject(const char* const room);
|
|
|
|
void muc_pending_broadcasts_add(const char* const room, const char* const message);
|
|
GList* muc_pending_broadcasts(const char* const room);
|
|
|
|
char* muc_autocomplete(ProfWin* window, const char* const input, gboolean previous);
|
|
void muc_autocomplete_reset(const char* const room);
|
|
|
|
gboolean muc_requires_config(const char* const room);
|
|
void muc_set_requires_config(const char* const room, gboolean val);
|
|
|
|
void muc_set_role(const char* const room, const char* const role);
|
|
void muc_set_affiliation(const char* const room, const char* const affiliation);
|
|
char* muc_role_str(const char* const room);
|
|
char* muc_affiliation_str(const char* const room);
|
|
|
|
muc_member_type_t muc_member_type(const char* const room);
|
|
muc_anonymity_type_t muc_anonymity_type(const char* const room);
|
|
|
|
GList* muc_members(const char* const room);
|
|
void muc_members_add(const char* const room, const char* const jid);
|
|
void muc_members_remove(const char* const room, const char* const jid);
|
|
void muc_members_update(const char* const room, const char* const jid, const char* const affiliation);
|
|
|
|
#endif
|