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>
114 lines
3.1 KiB
Bash
Executable File
114 lines
3.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# Exhaustive build configuration matrix testing for Profanity
|
|
|
|
set -e
|
|
|
|
RED='\033[0;31m'
|
|
GREEN='\033[0;32m'
|
|
YELLOW='\033[1;33m'
|
|
NC='\033[0m'
|
|
|
|
log_content() {
|
|
echo
|
|
if [ -f "$1" ]; then
|
|
echo "Content of $1:"
|
|
cat "$1"
|
|
else
|
|
echo "Log file $1 not found."
|
|
fi
|
|
}
|
|
|
|
error_handler() {
|
|
ERR_CODE=$?
|
|
echo -e "${RED}Error ${ERR_CODE} with command '${BASH_COMMAND}' on line ${BASH_LINENO[0]}. Exiting.${NC}"
|
|
|
|
for log in build_run/meson-logs/testlog.txt build_valgrind/meson-logs/testlog.txt; do
|
|
if [ -f "$log" ]; then
|
|
echo "--- Meson Test Log ($log) ---"
|
|
cat "$log"
|
|
fi
|
|
done
|
|
exit ${ERR_CODE}
|
|
}
|
|
|
|
trap error_handler ERR
|
|
|
|
num_cores() {
|
|
nproc \
|
|
|| sysctl -n hw.ncpu \
|
|
|| getconf _NPROCESSORS_ONLN 2>/dev/null \
|
|
|| echo 2
|
|
}
|
|
|
|
usage() {
|
|
echo "Usage: $0 [extra-args]"
|
|
echo ""
|
|
echo "Run exhaustive build matrix tests."
|
|
echo ""
|
|
echo "Extra arguments are passed directly to: meson setup [extra-args]"
|
|
exit 0
|
|
}
|
|
|
|
if [[ "$1" == "--help" || "$1" == "-h" ]]; then
|
|
usage
|
|
fi
|
|
|
|
# Compatibility with old script that took autotools|meson as first arg
|
|
if [[ "$1" == "meson" ]]; then
|
|
shift
|
|
elif [[ "$1" == "autotools" ]]; then
|
|
echo -e "${RED}Error: Autotools is no longer supported.${NC}"
|
|
exit 1
|
|
fi
|
|
|
|
ARCH="$(uname | tr '[:upper:]' '[:lower:]')"
|
|
EXTRA_ARGS="$*"
|
|
|
|
# Build Matrix
|
|
echo -e "${YELLOW}---> Starting build matrix...${NC}"
|
|
|
|
tests=(
|
|
"-Dnotifications=enabled -Dicons-and-clipboard=enabled -Dotr=enabled -Dpgp=enabled -Domemo=enabled -Dc-plugins=enabled -Dpython-plugins=enabled -Dxscreensaver=enabled -Domemo-qrcode=enabled -Dgdk-pixbuf=enabled"
|
|
""
|
|
"-Dnotifications=disabled"
|
|
"-Dicons-and-clipboard=disabled"
|
|
"-Dotr=disabled"
|
|
"-Dpgp=disabled"
|
|
"-Domemo=disabled -Domemo-qrcode=disabled"
|
|
"-Dpgp=disabled -Dotr=disabled"
|
|
"-Dpgp=disabled -Dotr=disabled -Domemo=disabled"
|
|
"-Dpython-plugins=disabled"
|
|
"-Dc-plugins=disabled"
|
|
"-Dc-plugins=disabled -Dpython-plugins=disabled"
|
|
"-Dxscreensaver=disabled"
|
|
"-Dgdk-pixbuf=disabled"
|
|
)
|
|
|
|
BACKEND_OPT=""
|
|
if [ -n "${OMEMO_BACKEND}" ]; then
|
|
BACKEND_OPT="-Domemo-backend=${OMEMO_BACKEND}"
|
|
fi
|
|
|
|
# Valgrind check (Linux only)
|
|
if [[ "$ARCH" == linux* ]]; then
|
|
echo -e "${YELLOW}--> Running Valgrind check with full features ${BACKEND_OPT} ${EXTRA_ARGS}${NC}"
|
|
rm -rf build_valgrind
|
|
meson setup build_valgrind ${tests[0]} ${BACKEND_OPT} -Dtests=true -Db_sanitize=undefined ${EXTRA_ARGS}
|
|
meson compile -C build_valgrind
|
|
meson test -C build_valgrind "unit tests" --print-errorlogs --wrap=valgrind || echo "Valgrind issues detected"
|
|
rm -rf build_valgrind
|
|
fi
|
|
|
|
for features in "${tests[@]}"
|
|
do
|
|
echo -e "${YELLOW}--> Building with: ${features} ${BACKEND_OPT} ${EXTRA_ARGS}${NC}"
|
|
rm -rf build_run
|
|
meson setup build_run ${features} ${BACKEND_OPT} -Dtests=true ${EXTRA_ARGS}
|
|
meson compile -C build_run
|
|
meson test -C build_run "unit tests" --print-errorlogs
|
|
./build_run/profanity -v
|
|
done
|
|
|
|
echo -e "${GREEN}Build configuration matrix testing successful!${NC}"
|