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>
137 lines
4.2 KiB
Python
Executable File
137 lines
4.2 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
import os
|
|
import re
|
|
import sys
|
|
import urllib.request
|
|
import xml.etree.ElementTree as ET
|
|
from itertools import zip_longest
|
|
from typing import Dict, List, Optional
|
|
|
|
|
|
# Namespaces in DOAP
|
|
NS = {
|
|
"rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
|
|
"foaf": "http://xmlns.com/foaf/0.1/",
|
|
"doap": "http://usefulinc.com/ns/doap#",
|
|
"xmpp": "https://linkmauve.fr/ns/xmpp-doap#",
|
|
"schema": "https://schema.org/",
|
|
}
|
|
|
|
|
|
def compare_versions(v1: str, v2: str) -> int:
|
|
"""
|
|
Compare two version strings.
|
|
Returns 1 if v2 > v1, -1 if v1 > v2, 0 if equal.
|
|
"""
|
|
def parse_v(v: str) -> List[int]:
|
|
return [int(x) for x in re.split(r"[^0-9]+", v) if x]
|
|
|
|
parts1 = parse_v(v1)
|
|
parts2 = parse_v(v2)
|
|
|
|
for p1, p2 in zip_longest(parts1, parts2, fillvalue=0):
|
|
if p2 > p1:
|
|
return 1
|
|
if p1 > p2:
|
|
return -1
|
|
return 0
|
|
|
|
|
|
def find_doap() -> Optional[str]:
|
|
"""Try to find profanity.doap in current or parent directory."""
|
|
candidates = ["profanity.doap", "../profanity.doap"]
|
|
for c in candidates:
|
|
if os.path.exists(c):
|
|
return c
|
|
return None
|
|
|
|
|
|
def get_implemented_xeps(doap_path: str) -> Dict[str, str]:
|
|
"""Parse DOAP file and return a map of XEP number to version."""
|
|
implemented_xeps: Dict[str, str] = {}
|
|
try:
|
|
tree = ET.parse(doap_path)
|
|
root = tree.getroot()
|
|
|
|
for implements in root.findall(".//doap:implements", NS):
|
|
supported_xep = implements.find(".//xmpp:SupportedXep", NS)
|
|
if supported_xep is not None:
|
|
xep_res = supported_xep.find(".//xmpp:xep", NS)
|
|
version_elem = supported_xep.find(".//xmpp:version", NS)
|
|
|
|
if xep_res is not None and version_elem is not None:
|
|
resource = xep_res.attrib.get(f"{{{NS['rdf']}}}resource", "")
|
|
match = re.search(r"xep-(\d+)\.html", resource)
|
|
if match:
|
|
xep_num = match.group(1)
|
|
current_version = version_elem.text.strip() if version_elem.text else ""
|
|
implemented_xeps[xep_num] = current_version
|
|
except (ET.ParseError, PermissionError) as e:
|
|
print(f"Error reading {doap_path}: {e}")
|
|
sys.exit(1)
|
|
|
|
return implemented_xeps
|
|
|
|
|
|
def check_xeps() -> None:
|
|
"""Main logic for checking XEP updates."""
|
|
doap_path = find_doap()
|
|
if not doap_path:
|
|
print("Error: Could not find DOAP file.")
|
|
sys.exit(1)
|
|
|
|
implemented_xeps = get_implemented_xeps(doap_path)
|
|
if not implemented_xeps:
|
|
print("No XEPs found in DOAP file.")
|
|
return
|
|
|
|
print(f"XEPs tracked: {len(implemented_xeps)}")
|
|
|
|
try:
|
|
url = "https://xmpp.org/extensions/xeplist.xml"
|
|
with urllib.request.urlopen(url, timeout=15) as response:
|
|
xeplist_xml = response.read()
|
|
except Exception as e:
|
|
print(f"Error fetching xeplist.xml: {e}")
|
|
return
|
|
|
|
try:
|
|
xeplist_tree = ET.fromstring(xeplist_xml)
|
|
except ET.ParseError as e:
|
|
print(f"Error parsing xeplist.xml: {e}")
|
|
return
|
|
|
|
print(f"\n{'XEP':<10} | {'Name':<35} | {'Ours':<8} | {'Latest':<8}")
|
|
print("-" * 80)
|
|
|
|
updates_found = 0
|
|
for xep_node in xeplist_tree.findall("xep"):
|
|
number_node = xep_node.find("number")
|
|
title_node = xep_node.find("title")
|
|
last_revision_node = xep_node.find("last-revision")
|
|
|
|
if number_node is None or title_node is None or last_revision_node is None:
|
|
continue
|
|
|
|
number = (number_node.text or "0").zfill(4)
|
|
name = title_node.text or "Unknown"
|
|
version_node = last_revision_node.find("version")
|
|
|
|
if version_node is None or version_node.text is None:
|
|
continue
|
|
|
|
latest_version = version_node.text
|
|
|
|
if number in implemented_xeps:
|
|
old_version = implemented_xeps[number]
|
|
if compare_versions(old_version, latest_version) > 0:
|
|
print(f"XEP-{number:<4} | {name[:35]:<35} | {old_version:<8} | {latest_version:<8}")
|
|
updates_found += 1
|
|
|
|
if updates_found == 0:
|
|
print("All tracked XEPs are up to date.")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
check_xeps()
|