libsoup: Upgrade 3.6.6 -> 3.8.0
PATCH 1/1 libsoup: Upgrade 3.6.6 -> 3.8.0
NEWS: https://github.com/GNOME/libsoup/blob/3.8.0/NEWS
- Drop CVE patches which are part of release
Signed-off-by Jaipaul Cheernam <[email protected]>
---
.../libsoup/libsoup/CVE-2025-32049-1.patch | 229 -----------
.../libsoup/libsoup/CVE-2025-32049-2.patch | 34 --
.../libsoup/libsoup/CVE-2025-32049-3.patch | 133 -------
.../libsoup/libsoup/CVE-2025-32049-4.patch | 291 --------------
.../libsoup/libsoup/CVE-2026-1539.patch | 97 -----
.../libsoup/libsoup/CVE-2026-2708.patch | 218 -----------
.../libsoup/libsoup/CVE-2026-4271.patch | 362 ------------------
.../libsoup/libsoup/CVE-2026-5119.patch | 122 ------
.../{libsoup_3.6.6.bb => libsoup_3.8.0.bb} | 12 +-
9 files changed, 1 insertion(+), 1497 deletions(-)
delete mode 100644 meta/recipes-support/libsoup/libsoup/CVE-2025-32049-1.patch
delete mode 100644 meta/recipes-support/libsoup/libsoup/CVE-2025-32049-2.patch
delete mode 100644 meta/recipes-support/libsoup/libsoup/CVE-2025-32049-3.patch
delete mode 100644 meta/recipes-support/libsoup/libsoup/CVE-2025-32049-4.patch
delete mode 100644 meta/recipes-support/libsoup/libsoup/CVE-2026-1539.patch
delete mode 100644 meta/recipes-support/libsoup/libsoup/CVE-2026-2708.patch
delete mode 100644 meta/recipes-support/libsoup/libsoup/CVE-2026-4271.patch
delete mode 100644 meta/recipes-support/libsoup/libsoup/CVE-2026-5119.patch
rename meta/recipes-support/libsoup/{libsoup_3.6.6.bb => libsoup_3.8.0.bb} (83%)meta/recipes-support/libsoup/libsoup/CVE-2025-32049-1.patch deleted +0 -229
@@ -1,229 +0,0 @@ -From 46338bccc2ad9c34f892af19123f64ca2d9d866f Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <[email protected]> -Date: Wed, 24 Jul 2024 15:20:35 +0200 -Subject: [PATCH 1/4] websocket: add a way to restrict the total message size - -Otherwise a client could send small packages smaller than -total-incoming-payload-size but still to break the server -with a big allocation - -Fixes: #390 - -Change SOUP_AVAILABLE_IN_3_8 to SOUP_AVAILABLE_IN_3_6 -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/db87805ab565d67533dfed2cb409dbfd63c7fdce] -CVE: CVE-2025-32049 - -Signed-off-by: Changqing Li <[email protected]> ---- - libsoup/websocket/soup-websocket-connection.c | 106 +++++++++++++++++- - libsoup/websocket/soup-websocket-connection.h | 7 ++ - 2 files changed, 110 insertions(+), 3 deletions(-) - -diff --git a/libsoup/websocket/soup-websocket-connection.c b/libsoup/websocket/soup-websocket-connection.c -index 36e8459..a4fc36e 100644 ---- a/libsoup/websocket/soup-websocket-connection.c -+++ b/libsoup/websocket/soup-websocket-connection.c -@@ -78,6 +78,7 @@ enum { - PROP_KEEPALIVE_INTERVAL, - PROP_KEEPALIVE_PONG_TIMEOUT, - PROP_EXTENSIONS, -+ PROP_MAX_TOTAL_MESSAGE_SIZE, - - LAST_PROPERTY - }; -@@ -120,6 +121,7 @@ typedef struct { - char *origin; - char *protocol; - guint64 max_incoming_payload_size; -+ guint64 max_total_message_size; - guint keepalive_interval; - guint keepalive_pong_timeout; - guint64 last_keepalive_seq_num; -@@ -164,6 +166,7 @@ typedef struct { - } SoupWebsocketConnectionPrivate; - - #define MAX_INCOMING_PAYLOAD_SIZE_DEFAULT 128 * 1024 -+#define MAX_TOTAL_MESSAGE_SIZE_DEFAULT 128 * 1024 - #define READ_BUFFER_SIZE 1024 - #define MASK_LENGTH 4 - -@@ -696,8 +699,8 @@ bad_data_error_and_close (SoupWebsocketConnection *self) - } - - static void --too_big_error_and_close (SoupWebsocketConnection *self, -- guint64 payload_len) -+too_big_incoming_payload_error_and_close (SoupWebsocketConnection *self, -+ guint64 payload_len) - { - SoupWebsocketConnectionPrivate *priv = soup_websocket_connection_get_instance_private (self); - GError *error; -@@ -713,6 +716,24 @@ too_big_error_and_close (SoupWebsocketConnection *self, - emit_error_and_close (self, error, TRUE); - } - -+static void -+too_big_message_error_and_close (SoupWebsocketConnection *self, -+ guint64 len) -+{ -+ SoupWebsocketConnectionPrivate *priv = soup_websocket_connection_get_instance_private (self); -+ GError *error; -+ -+ error = g_error_new_literal (SOUP_WEBSOCKET_ERROR, -+ SOUP_WEBSOCKET_CLOSE_TOO_BIG, -+ priv->connection_type == SOUP_WEBSOCKET_CONNECTION_SERVER ? -+ "Received WebSocket payload from the client larger than configured max-total-message-size" : -+ "Received WebSocket payload from the server larger than configured max-total-message-size"); -+ g_debug ("%s received message of size %" G_GUINT64_FORMAT " or greater, but max supported size is %" G_GUINT64_FORMAT, -+ priv->connection_type == SOUP_WEBSOCKET_CONNECTION_SERVER ? "server" : "client", -+ len, priv->max_total_message_size); -+ emit_error_and_close (self, error, TRUE); -+} -+ - static void - close_connection (SoupWebsocketConnection *self, - gushort code, -@@ -973,6 +994,12 @@ process_contents (SoupWebsocketConnection *self, - switch (priv->message_opcode) { - case 0x01: - case 0x02: -+ /* Safety valve */ -+ if (priv->max_total_message_size > 0 && -+ (priv->message_data->len + payload_len) > priv->max_total_message_size) { -+ too_big_message_error_and_close (self, (priv->message_data->len + payload_len)); -+ return; -+ } - g_byte_array_append (priv->message_data, payload, payload_len); - break; - default: -@@ -1111,7 +1138,7 @@ process_frame (SoupWebsocketConnection *self) - /* Safety valve */ - if (priv->max_incoming_payload_size > 0 && - payload_len > priv->max_incoming_payload_size) { -- too_big_error_and_close (self, payload_len); -+ too_big_incoming_payload_error_and_close (self, payload_len); - return FALSE; - } - -@@ -1428,6 +1455,10 @@ soup_websocket_connection_get_property (GObject *object, - g_value_set_pointer (value, priv->extensions); - break; - -+ case PROP_MAX_TOTAL_MESSAGE_SIZE: -+ g_value_set_uint64 (value, priv->max_total_message_size); -+ break; -+ - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -1486,6 +1517,10 @@ soup_websocket_connection_set_property (GObject *object, - priv->extensions = g_value_get_pointer (value); - break; - -+ case PROP_MAX_TOTAL_MESSAGE_SIZE: -+ priv->max_total_message_size = g_value_get_uint64 (value); -+ break; -+ - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -1716,6 +1751,26 @@ soup_websocket_connection_class_init (SoupWebsocketConnectionClass *klass) - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_STRINGS); - -+ /** -+ * SoupWebsocketConnection:max-total-message-size: -+ * -+ * The total message size for incoming packets. -+ * -+ * The protocol expects or 0 to not limit it. -+ * -+ * Since: 3.8 -+ */ -+ properties[PROP_MAX_TOTAL_MESSAGE_SIZE] = -+ g_param_spec_uint64 ("max-total-message-size", -+ "Max total message size", -+ "Max total message size ", -+ 0, -+ G_MAXUINT64, -+ MAX_TOTAL_MESSAGE_SIZE_DEFAULT, -+ G_PARAM_READWRITE | -+ G_PARAM_CONSTRUCT | -+ G_PARAM_STATIC_STRINGS); -+ - g_object_class_install_properties (gobject_class, LAST_PROPERTY, properties); - - /** -@@ -2186,6 +2241,51 @@ soup_websocket_connection_set_max_incoming_payload_size (SoupWebsocketConnection - } - } - -+/** -+ * soup_websocket_connection_get_max_total_message_size: -+ * @self: the WebSocket -+ * -+ * Gets the maximum total message size allowed for packets. -+ * -+ * Returns: the maximum total message size. -+ * -+ * Since: 3.8 -+ */ -+guint64 -+soup_websocket_connection_get_max_total_message_size (SoupWebsocketConnection *self) -+{ -+ SoupWebsocketConnectionPrivate *priv = soup_websocket_connection_get_instance_private (self); -+ -+ g_return_val_if_fail (SOUP_IS_WEBSOCKET_CONNECTION (self), MAX_TOTAL_MESSAGE_SIZE_DEFAULT); -+ -+ return priv->max_total_message_size; -+} -+ -+/** -+ * soup_websocket_connection_set_max_total_message_size: -+ * @self: the WebSocket -+ * @max_total_message_size: the maximum total message size -+ * -+ * Sets the maximum total message size allowed for packets. -+ * -+ * It does not limit the outgoing packet size. -+ * -+ * Since: 3.8 -+ */ -+void -+soup_websocket_connection_set_max_total_message_size (SoupWebsocketConnection *self, -+ guint64 max_total_message_size) -+{ -+ SoupWebsocketConnectionPrivate *priv = soup_websocket_connection_get_instance_private (self); -+ -+ g_return_if_fail (SOUP_IS_WEBSOCKET_CONNECTION (self)); -+ -+ if (priv->max_total_message_size != max_total_message_size) { -+ priv->max_total_message_size = max_total_message_size; -+ g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MAX_TOTAL_MESSAGE_SIZE]); -+ } -+} -+ - /** - * soup_websocket_connection_get_keepalive_interval: - * @self: the WebSocket -diff --git a/libsoup/websocket/soup-websocket-connection.h b/libsoup/websocket/soup-websocket-connection.h -index f047c0a..ea0cb58 100644 ---- a/libsoup/websocket/soup-websocket-connection.h -+++ b/libsoup/websocket/soup-websocket-connection.h -@@ -88,6 +88,13 @@ SOUP_AVAILABLE_IN_ALL - void soup_websocket_connection_set_max_incoming_payload_size (SoupWebsocketConnection *self, - guint64 max_incoming_payload_size); - -+SOUP_AVAILABLE_IN_3_6 -+guint64 soup_websocket_connection_get_max_total_message_size (SoupWebsocketConnection *self); -+ -+SOUP_AVAILABLE_IN_3_6 -+void soup_websocket_connection_set_max_total_message_size (SoupWebsocketConnection *self, -+ guint64 max_total_message_size); -+ - SOUP_AVAILABLE_IN_ALL - guint soup_websocket_connection_get_keepalive_interval (SoupWebsocketConnection *self); - --- -2.34.1 -
meta/recipes-support/libsoup/libsoup/CVE-2025-32049-2.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From c00f1e961a17c0af1cd34881f64db2948f32bb65 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <[email protected]> -Date: Fri, 20 Sep 2024 12:12:38 +0200 -Subject: [PATCH 2/4] websocket-test: set the total message size - -This is required when sending a big amount of data - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/4904a46a2d9a014efa6be01a186ac353dbf5047b] -CVE: CVE-2025-32049 - -Signed-off-by: Changqing Li <[email protected]> ---- - tests/websocket-test.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tests/websocket-test.c b/tests/websocket-test.c -index c924601..1678042 100644 ---- a/tests/websocket-test.c -+++ b/tests/websocket-test.c -@@ -615,6 +615,11 @@ test_send_big_packets (Test *test, - soup_websocket_connection_set_max_incoming_payload_size (test->server, 1000 * 1000 + 1); - g_assert_true (soup_websocket_connection_get_max_incoming_payload_size (test->server) == (1000 * 1000 + 1)); - -+ soup_websocket_connection_set_max_total_message_size (test->client, 1000 * 1000 + 1); -+ g_assert (soup_websocket_connection_get_max_total_message_size (test->client) == (1000 * 1000 + 1)); -+ soup_websocket_connection_set_max_total_message_size (test->server, 1000 * 1000 + 1); -+ g_assert (soup_websocket_connection_get_max_total_message_size (test->server) == (1000 * 1000 + 1)); -+ - sent = g_bytes_new_take (g_strnfill (1000 * 1000, '?'), 1000 * 1000); - soup_websocket_connection_send_text (test->server, g_bytes_get_data (sent, NULL)); - WAIT_UNTIL (received != NULL); --- -2.34.1 -
meta/recipes-support/libsoup/libsoup/CVE-2025-32049-3.patch deleted +0 -133
133 lines not on this page · raw message
meta/recipes-support/libsoup/libsoup/CVE-2025-32049-4.patch deleted +0 -291
291 lines not on this page · raw message
meta/recipes-support/libsoup/libsoup/CVE-2026-1539.patch deleted +0 -97
97 lines not on this page · raw message
meta/recipes-support/libsoup/libsoup/CVE-2026-2708.patch deleted +0 -218
218 lines not on this page · raw message
meta/recipes-support/libsoup/libsoup/CVE-2026-4271.patch deleted +0 -362
362 lines not on this page · raw message
meta/recipes-support/libsoup/libsoup/CVE-2026-5119.patch deleted +0 -122
122 lines not on this page · raw message
meta/recipes-support/libsoup/libsoup_3.8.0.bb renamed from meta/recipes-support/libsoup/libsoup_3.6.6.bb +1 -11
@@ -11,17 +11,7 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl nghttp2" inherit gettext gnomebase upstream-version-is-even gobject-introspection gi-docgen vala -SRC_URI[archive.sha256sum] = "51ed0ae06f9d5a40f401ff459e2e5f652f9a510b7730e1359ee66d14d4872740" - -SRC_URI += "file://CVE-2025-32049-1.patch \ - file://CVE-2025-32049-2.patch \ - file://CVE-2025-32049-3.patch \ - file://CVE-2025-32049-4.patch \ - file://CVE-2026-1539.patch \ - file://CVE-2026-5119.patch \ - file://CVE-2026-2708.patch \ - file://CVE-2026-4271.patch \ -" +SRC_URI[archive.sha256sum] = "bbf08fa3e03a88c31a3d27a0d87cb422e9490f2d08e149211103df6d638a2238" PROVIDES = "libsoup-3.0"