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>
139 lines
4.0 KiB
Bash
Executable File
139 lines
4.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# Central linting and testing script for Profanity
|
|
|
|
set -e
|
|
|
|
RED='\033[0;31m'
|
|
GREEN='\033[0;32m'
|
|
YELLOW='\033[1;33m'
|
|
NC='\033[0m'
|
|
|
|
# Go to project root
|
|
cd "$(dirname "$0")/.."
|
|
|
|
usage() {
|
|
echo "Usage: $0 [options]"
|
|
echo ""
|
|
echo "Description:"
|
|
echo " Code quality checks (spelling, formatting, and unit tests)."
|
|
echo " Works with meson and can be used as a git"
|
|
echo " pre-commit hook."
|
|
echo ""
|
|
echo "Options:"
|
|
echo " --fix-formatting Apply formatting fixes (default is check only)"
|
|
echo " --no-format Skip the formatting check/fix entirely. Use this if your local"
|
|
echo " clang-format version produces different results than the CI."
|
|
echo " Can also be set via SKIP_FORMAT=1 environment variable."
|
|
echo " --tests Run unit tests using Meson (meson test)"
|
|
echo " --hook Git hook mode: Checks only staged files for spelling and"
|
|
echo " formatting. Does not run tests to ensure fast commits."
|
|
echo " --install Install this script as a git pre-commit hook"
|
|
echo " --help Show this help message"
|
|
}
|
|
|
|
run_tests() {
|
|
local system=$1
|
|
echo -e "${YELLOW}---> Running unit tests...${NC}"
|
|
|
|
if [ "$system" == "meson" ]; then
|
|
echo "Using Meson..."
|
|
# Uses build_run
|
|
meson test -C build_run "unit tests"
|
|
fi
|
|
}
|
|
|
|
run_format() {
|
|
local mode=$1
|
|
local hook_mode=$2
|
|
local skip=$3
|
|
local files
|
|
|
|
if [ "$skip" = true ]; then
|
|
echo -e "${YELLOW}---> Skipping formatting check.${NC}"
|
|
return
|
|
fi
|
|
|
|
if [ "$hook_mode" = true ]; then
|
|
echo -e "${YELLOW}---> Checking staged files for formatting...${NC}"
|
|
# Only added/modified C files
|
|
files=$(git diff --cached --name-only --diff-filter=ACMR | grep -E "\.(c|h)$" || true)
|
|
else
|
|
echo -e "${YELLOW}---> Checking all files for formatting...${NC}"
|
|
files=$(find src tests -name "*.[ch]" || true)
|
|
fi
|
|
|
|
if [ -z "$files" ]; then
|
|
echo "No C files to check."
|
|
return
|
|
fi
|
|
|
|
if [ "$mode" = "fix" ]; then
|
|
clang-format -i $files
|
|
echo -e "${GREEN}Formatting applied.${NC}"
|
|
else
|
|
# --Werror makes it return non-zero on diff
|
|
if ! clang-format --dry-run --Werror $files; then
|
|
echo -e "${RED}Error: Style violations found. Run '$0 --fix-formatting' to resolve.${NC}"
|
|
echo -e "${RED}If this is due to a clang-format version mismatch, use --no-format or SKIP_FORMAT=1.${NC}"
|
|
exit 1
|
|
fi
|
|
echo -e "${GREEN}Style check passed.${NC}"
|
|
fi
|
|
}
|
|
|
|
run_spell() {
|
|
echo -e "${YELLOW}---> Running spell check...${NC}"
|
|
if command -v codespell >/dev/null 2>&1; then
|
|
codespell
|
|
echo -e "${GREEN}Spell check passed.${NC}"
|
|
else
|
|
echo -e "${YELLOW}Warning: codespell not found, skipping.${NC}"
|
|
fi
|
|
}
|
|
|
|
MODE="check"
|
|
BUILD_SYSTEM="none"
|
|
HOOK=false
|
|
|
|
# Support environment variable override
|
|
if [[ "$SKIP_FORMAT" == "1" || "$SKIP_FORMAT" == "true" ]]; then
|
|
INTERNAL_SKIP_FORMAT=true
|
|
else
|
|
INTERNAL_SKIP_FORMAT=false
|
|
fi
|
|
|
|
while [[ "$#" -gt 0 ]]; do
|
|
case $1 in
|
|
--fix-formatting) MODE="fix" ;;
|
|
--no-format) INTERNAL_SKIP_FORMAT=true ;;
|
|
--tests) BUILD_SYSTEM="meson" ;;
|
|
--hook) HOOK=true ;;
|
|
--install)
|
|
echo "Installing pre-commit hook..."
|
|
mkdir -p .git/hooks
|
|
echo "#!/usr/bin/env bash" > .git/hooks/pre-commit
|
|
echo "./scripts/lint-and-test.sh --hook" >> .git/hooks/pre-commit
|
|
chmod +x .git/hooks/pre-commit
|
|
echo "Hook installed."
|
|
exit 0
|
|
;;
|
|
--help) usage; exit 0 ;;
|
|
*) echo "Unknown parameter: $1"; usage; exit 1 ;;
|
|
esac
|
|
shift
|
|
done
|
|
|
|
# Always run spell check
|
|
run_spell
|
|
|
|
# Run format check unless skipped
|
|
run_format "$MODE" "$HOOK" "$INTERNAL_SKIP_FORMAT"
|
|
|
|
# Run tests if a build system was specified
|
|
if [ "$BUILD_SYSTEM" != "none" ]; then
|
|
run_tests "$BUILD_SYSTEM"
|
|
fi
|
|
|
|
echo -e "${GREEN}Validation successful!${NC}"
|