Add support for libstrophe-0.13 and 0.14

Author: twistedfall

.github/workflows/libstrophe.yml

@@ -18,6 +18,8 @@ jobs:
           - 0.10.1
           - 0.11.0
           - 0.12.3
+          - 0.13.1
+          - 0.14.0
     runs-on: ubuntu-24.04
     env:
       LIBSTROPHE_VERSION: ${{ matrix.libstrophe-version }}
@@ -35,10 +37,6 @@ jobs:
         with:
           components: clippy,rustfmt
 
-      - name: Checks
-        run: ci/checks.sh
-        shell: bash
-
       - name: Test
         run: ci/script.sh
         shell: bash

Cargo.toml

@@ -28,15 +28,16 @@ sys = { package = "libstrophe-sys-bindgen", version = "7", path = "libstrophe-sy
 
 [dev-dependencies]
 env_logger = "0.11"
-matches = "0.1"
 names = "0.14"
 trybuild = "1"
 
 [features]
-default = ["rust-log", "libstrophe-0_12_0"]
+default = ["rust-log", "libstrophe-0_14"]
 buildtime_bindgen = ["sys/buildtime_bindgen"]
 libstrophe-0_9_3 = []
 libstrophe-0_10_0 = ["libstrophe-0_9_3"]
 libstrophe-0_11_0 = ["libstrophe-0_10_0"]
 libstrophe-0_12_0 = ["libstrophe-0_11_0"]
+libstrophe-0_13 = ["libstrophe-0_12_0"]
+libstrophe-0_14 = ["libstrophe-0_13"]
 rust-log = ["log"]

ci/0.13.1-tls-segfault.patch

@@ -0,0 +1,34 @@
+From 9fef4b7d024b99aac9101bfa8b45cf78eef6508b Mon Sep 17 00:00:00 2001
+From: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
+Date: Wed, 10 Apr 2024 16:55:18 +0200
+Subject: [PATCH] Restore old interface if TLS connection failed
+
+This was reported as creating a segfault in [0]
+
+[0] https://github.com/profanity-im/profanity/issues/1963
+
+Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
+---
+ src/conn.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/conn.c b/src/conn.c
+index 73a2737a..d8c7ab1e 100644
+--- a/src/conn.c
++++ b/src/conn.c
+@@ -1092,6 +1092,7 @@ int conn_tls_start(xmpp_conn_t *conn)
+     }
+ 
+     if (conn->tls != NULL) {
++        struct conn_interface old_intf = conn->intf;
+         conn->intf = tls_intf;
+         conn->intf.conn = conn;
+         if (tls_start(conn->tls)) {
+@@ -1102,6 +1103,7 @@ int conn_tls_start(xmpp_conn_t *conn)
+             tls_free(conn->tls);
+             conn->tls = NULL;
+             conn->tls_failed = 1;
++            conn->intf = old_intf;
+         }
+     }
+     if (rc != 0) {

ci/install.sh

@@ -16,9 +16,15 @@ build_dir=~/build
 
 mkdir -p "$build_dir"
 curl -L "https://github.com/strophe/libstrophe/archive/$LIBSTROPHE_VERSION.tar.gz" | tar -xzC "$build_dir"
-pushd "$build_dir/libstrophe-$LIBSTROPHE_VERSION"
+if [[ "$LIBSTROPHE_VERSION" == "0.13.1" ]]; then
+	# https://github.com/strophe/libstrophe/commit/9fef4b7d024b99aac9101bfa8b45cf78eef6508b
+	patch -p1 -d "$build_dir/libstrophe-$LIBSTROPHE_VERSION" < ci/0.13.1-tls-segfault.patch
+fi
+cd "$build_dir/libstrophe-$LIBSTROPHE_VERSION"
 ./bootstrap.sh
 ./configure --prefix=/usr
 sudo make -j"$(nproc)" install
-popd
-sudo systemctl start ejabberd
+cd -
+
+sudo sed -ri 's/starttls_required: true/starttls_required: false\n    starttls: true/' /etc/ejabberd/ejabberd.yml
+sudo systemctl restart ejabberd

ci/script.sh

@@ -7,27 +7,30 @@ verlte() {
 	[ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
 }
 
-if verlte "0.9.3" "$LIBSTROPHE_VERSION"; then
-	ARGS="--no-default-features --features=buildtime_bindgen,libstrophe-0_9_3"
+if verlte "0.14.0" "$LIBSTROPHE_VERSION"; then
+	cargo test -v -- --test-threads=1
+	cargo test -v --release -- --test-threads=1
+	cargo test -v --features=buildtime_bindgen -- --test-threads=1
+	cargo test -v --release --features=buildtime_bindgen -- --test-threads=1
+elif verlte "0.13.0" "$LIBSTROPHE_VERSION"; then
+	ARGS="--no-default-features --features=buildtime_bindgen,libstrophe-0_13"
 	cargo test -v $ARGS -- --test-threads=1
 	cargo test -v $ARGS --release -- --test-threads=1
-fi
-
-if verlte "0.10.0" "$LIBSTROPHE_VERSION"; then
-	ARGS="--no-default-features --features=buildtime_bindgen,libstrophe-0_10_0"
+elif verlte "0.12.0" "$LIBSTROPHE_VERSION"; then
+	ARGS="--no-default-features --features=buildtime_bindgen,libstrophe-0_12_0"
 	cargo test -v $ARGS -- --test-threads=1
 	cargo test -v $ARGS --release -- --test-threads=1
-fi
-
-if verlte "0.11.0" "$LIBSTROPHE_VERSION"; then
+elif verlte "0.11.0" "$LIBSTROPHE_VERSION"; then
 	ARGS="--no-default-features --features=buildtime_bindgen,libstrophe-0_11_0"
 	cargo test -v $ARGS -- --test-threads=1
 	cargo test -v $ARGS --release -- --test-threads=1
+elif verlte "0.10.0" "$LIBSTROPHE_VERSION"; then
+	ARGS="--no-default-features --features=buildtime_bindgen,libstrophe-0_10_0"
+	cargo test -v $ARGS -- --test-threads=1
+	cargo test -v $ARGS --release -- --test-threads=1
+elif verlte "0.9.3" "$LIBSTROPHE_VERSION"; then
+	ARGS="--no-default-features --features=buildtime_bindgen,libstrophe-0_9_3"
+	cargo test -v $ARGS -- --test-threads=1
+	cargo test -v $ARGS --release -- --test-threads=1
 fi
 
-if verlte "0.12.0" "$LIBSTROPHE_VERSION"; then
-	cargo test -v -- --test-threads=1
-	cargo test -v --release -- --test-threads=1
-	cargo test -v --features=buildtime_bindgen -- --test-threads=1
-	cargo test -v --release --features=buildtime_bindgen -- --test-threads=1
-fi

libstrophe-sys-bindgen/build.rs

@@ -16,8 +16,10 @@ fn build_wrapper() {
 		}
 
 		fn int_macro(&self, name: &str, _value: i64) -> Option<IntKind> {
-			if name == "XMPP_EOK" {
-				Some(IntKind::I32)
+			if name.starts_with("XMPP_E") {
+				Some(IntKind::Int)
+			} else if name.starts_with("XMPP_CONN_FLAG_") {
+				Some(IntKind::Long)
 			} else {
 				None
 			}

libstrophe-sys-bindgen/src/ffi.rs

@@ -17,18 +17,18 @@ pub const XMPP_NS_REGISTER: &[u8; 19] = b"jabber:iq:register\0";
 pub const XMPP_NS_SM: &[u8; 14] = b"urn:xmpp:sm:3\0";
 pub const XMPP_NS_COMPRESSION: &[u8; 36] = b"http://jabber.org/protocol/compress\0";
 pub const XMPP_NS_FEATURE_COMPRESSION: &[u8; 36] = b"http://jabber.org/features/compress\0";
-pub const XMPP_EOK: i32 = 0;
-pub const XMPP_EMEM: i32 = -1;
-pub const XMPP_EINVOP: i32 = -2;
-pub const XMPP_EINT: i32 = -3;
-pub const XMPP_CONN_FLAG_DISABLE_TLS: u32 = 1;
-pub const XMPP_CONN_FLAG_MANDATORY_TLS: u32 = 2;
-pub const XMPP_CONN_FLAG_LEGACY_SSL: u32 = 4;
-pub const XMPP_CONN_FLAG_TRUST_TLS: u32 = 8;
-pub const XMPP_CONN_FLAG_LEGACY_AUTH: u32 = 16;
-pub const XMPP_CONN_FLAG_DISABLE_SM: u32 = 32;
-pub const XMPP_CONN_FLAG_ENABLE_COMPRESSION: u32 = 64;
-pub const XMPP_CONN_FLAG_COMPRESSION_DONT_RESET: u32 = 128;
+pub const XMPP_EOK: ::std::os::raw::c_int = 0;
+pub const XMPP_EMEM: ::std::os::raw::c_int = -1;
+pub const XMPP_EINVOP: ::std::os::raw::c_int = -2;
+pub const XMPP_EINT: ::std::os::raw::c_int = -3;
+pub const XMPP_CONN_FLAG_DISABLE_TLS: ::std::os::raw::c_long = 1;
+pub const XMPP_CONN_FLAG_MANDATORY_TLS: ::std::os::raw::c_long = 2;
+pub const XMPP_CONN_FLAG_LEGACY_SSL: ::std::os::raw::c_long = 4;
+pub const XMPP_CONN_FLAG_TRUST_TLS: ::std::os::raw::c_long = 8;
+pub const XMPP_CONN_FLAG_LEGACY_AUTH: ::std::os::raw::c_long = 16;
+pub const XMPP_CONN_FLAG_DISABLE_SM: ::std::os::raw::c_long = 32;
+pub const XMPP_CONN_FLAG_ENABLE_COMPRESSION: ::std::os::raw::c_long = 64;
+pub const XMPP_CONN_FLAG_COMPRESSION_DONT_RESET: ::std::os::raw::c_long = 128;
 pub const XMPP_SHA1_DIGEST_SIZE: u32 = 20;
 pub type __u_char = ::std::os::raw::c_uchar;
 pub type __u_short = ::std::os::raw::c_ushort;

libstrophe-sys-bindgen/src/lib.rs

@@ -3,7 +3,7 @@
 //! This crate provides bindings to [libstrophe] C library which enables you the creation of XMPP
 //! clients and servers. The bindings were statically generated using [bindgen] so the crate doesn't
 //! have a hard dependency on bindgen. If you still want to regenerate the bindings during building
-//! of the create, enable `buildtime_bindgen` feature.
+//! of the crate, enable `buildtime_bindgen` feature.
 //!
 //! Usage of this crate creates runtime dependency on libstrophe.so so be sure to install that using
 //! your package manager.

src/alloc_context.rs

@@ -1,7 +1,8 @@
-use std::ffi::c_void;
-use std::mem::{align_of, size_of};
-use std::ptr::NonNull;
-use std::{alloc, ptr};
+use core::ffi::c_void;
+use core::mem::{align_of, size_of};
+use core::ptr;
+use core::ptr::NonNull;
+use std::alloc;
 
 /// Internal `Context` that only specifies allocation functions and uses null logger. Needed to not pass
 /// `Context` to e.g. `Stanza` because it uses only allocation functions from `Context`.
@@ -23,23 +24,23 @@ impl AllocContext {
 	unsafe fn write_real_alloc(p: *mut u8, size: usize) -> *mut c_void {
 		#![allow(clippy::cast_ptr_alignment)]
 		// it's ok to cast it as *mut AllocUnit=usize because we align to it during allocation and p points to the beginning of that buffer
-		let out = p as *mut AllocUnit;
+		let out = p.cast::<AllocUnit>();
 		out.write(size);
-		out.add(1) as _
+		out.add(1).cast::<c_void>()
 	}
 
 	#[inline(always)]
 	unsafe fn read_real_alloc(p: *mut c_void) -> (*mut u8, alloc::Layout) {
 		if p.is_null() {
 			(
-				p as _,
+				p.cast::<u8>(),
 				alloc::Layout::from_size_align(0, align_of::<AllocUnit>()).expect("Cannot create layout"),
 			)
 		} else {
-			let memory = (p as *mut AllocUnit).sub(1);
+			let memory = p.cast::<AllocUnit>().sub(1);
 			let size = memory.read();
 			(
-				memory as _,
+				memory.cast::<u8>(),
 				alloc::Layout::from_size_align(size, align_of::<AllocUnit>()).expect("Cannot create layout"),
 			)
 		}
@@ -82,12 +83,12 @@ impl AllocContext {
 		self.inner.as_ptr()
 	}
 
-	/// [xmpp_free](https://strophe.im/libstrophe/doc/0.12.2/ctx_8c.html#acc734a5f5f115629c9e7775a4d3796e2)
+	/// [xmpp_free](https://strophe.im/libstrophe/doc/0.13.0/ctx_8c.html#acc734a5f5f115629c9e7775a4d3796e2)
 	///
 	/// # Safety
 	/// p must be non-null and allocated by the libstrophe library (xmpp_alloc function)
 	pub unsafe fn free<T>(&self, p: *mut T) {
-		sys::xmpp_free(self.inner.as_ptr(), p as _)
+		sys::xmpp_free(self.inner.as_ptr(), p.cast::<c_void>())
 	}
 }