From: Vsevolod Stakhov Date: Tue, 5 Aug 2025 13:10:11 +0000 (+0100) Subject: [Minor] Some more logic fixes X-Git-Tag: 3.13.0~37^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81417aeec848adead5415b0aec29e5e2aa1309d0;p=thirdparty%2Frspamd.git [Minor] Some more logic fixes --- diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c index b683547a14..b085c69d75 100644 --- a/src/libserver/protocol.c +++ b/src/libserver/protocol.c @@ -1668,8 +1668,21 @@ void rspamd_protocol_http_reply(struct rspamd_http_message *msg, } } - if ((task->protocol_flags & RSPAMD_TASK_PROTOCOL_FLAG_COMPRESSED) && - rspamd_libs_reset_compression(task->cfg->libs_ctx)) { + /* Check if we should compress the response */ + gboolean should_compress = FALSE; + + /* Rule 1: If request had compression, preserve it (existing behavior) */ + if (task->protocol_flags & RSPAMD_TASK_PROTOCOL_FLAG_COMPRESSED) { + should_compress = TRUE; + } + + /* Rule 2: If client supports zstd compression, honor it (takes precedence) */ + const rspamd_ftok_t *accept_encoding = rspamd_task_get_request_header(task, "Accept-Encoding"); + if (accept_encoding && rspamd_substring_search_caseless(accept_encoding->begin, accept_encoding->len, "zstd", 4) != -1) { + should_compress = TRUE; + } + + if (should_compress && rspamd_libs_reset_compression(task->cfg->libs_ctx)) { /* We can compress output */ ZSTD_inBuffer zin; ZSTD_outBuffer zout; diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c index be5e162c70..c31e9ab629 100644 --- a/src/rspamd_proxy.c +++ b/src/rspamd_proxy.c @@ -211,6 +211,11 @@ enum rspamd_proxy_legacy_support { LEGACY_SUPPORT_SPAMC }; +enum rspamd_proxy_session_flags { + RSPAMD_PROXY_SESSION_FLAG_USE_KEEPALIVE = 1 << 0, + RSPAMD_PROXY_SESSION_FLAG_CLIENT_SUPPORTS_COMPRESSION = 1 << 1, +}; + struct rspamd_proxy_session { struct rspamd_worker *worker; rspamd_mempool_t *pool; @@ -230,7 +235,7 @@ struct rspamd_proxy_session { enum rspamd_proxy_legacy_support legacy_support; int retries; ref_entry_t ref; - gboolean use_keepalive; /* Whether to use keepalive for this session */ + enum rspamd_proxy_session_flags flags; }; static gboolean proxy_send_master_message(struct rspamd_proxy_session *session); @@ -1071,7 +1076,7 @@ proxy_backend_close_connection(struct rspamd_proxy_backend_connection *conn) rspamd_http_connection_reset(conn->backend_conn); rspamd_http_connection_unref(conn->backend_conn); - if (!(conn->s && conn->s->use_keepalive)) { + if (!(conn->s && (conn->s->flags & RSPAMD_PROXY_SESSION_FLAG_USE_KEEPALIVE))) { /* Only close socket if we're not using keepalive */ close(conn->backend_sock); } @@ -1418,6 +1423,7 @@ proxy_session_refresh(struct rspamd_proxy_session *session) nsession->client_sock = session->client_sock; session->client_sock = -1; nsession->mirror_conns = g_ptr_array_sized_new(nsession->ctx->mirrors->len); + nsession->flags = session->flags; REF_INIT_RETAIN(nsession, proxy_session_dtor); @@ -1585,7 +1591,7 @@ proxy_backend_mirror_finish_handler(struct rspamd_http_connection *conn, } } - if (is_keepalive && session->use_keepalive && + if (is_keepalive && (session->flags & RSPAMD_PROXY_SESSION_FLAG_USE_KEEPALIVE) && bk_conn->up && session->ctx->http_ctx) { /* Store connection in keepalive pool */ const char *up_name = rspamd_upstream_name(bk_conn->up); @@ -2093,7 +2099,7 @@ proxy_backend_master_finish_handler(struct rspamd_http_connection *conn, rspamd_upstream_ok(bk_conn->up); /* Handle keepalive for master connection */ - if (is_keepalive && session->use_keepalive && + if (is_keepalive && (session->flags & RSPAMD_PROXY_SESSION_FLAG_USE_KEEPALIVE) && bk_conn->up && session->ctx->http_ctx) { /* Store connection in keepalive pool */ const char *up_name = rspamd_upstream_name(bk_conn->up); @@ -2123,7 +2129,7 @@ proxy_backend_master_finish_handler(struct rspamd_http_connection *conn, } /* Push to keepalive if needed */ - if (is_keepalive && session->use_keepalive && + if (is_keepalive && (session->flags & RSPAMD_PROXY_SESSION_FLAG_USE_KEEPALIVE) && bk_conn->up && session->ctx->http_ctx) { const char *up_name = rspamd_upstream_name(bk_conn->up); if (up_name) { @@ -2147,9 +2153,13 @@ proxy_backend_master_finish_handler(struct rspamd_http_connection *conn, rspamd_http_message_remove_header(msg, "Content-Type"); } - /* Check if client supports compression and compress response if needed */ - const rspamd_ftok_t *accept_encoding = rspamd_http_message_find_header(session->client_message, "Accept-Encoding"); - if (accept_encoding && rspamd_substring_search_caseless(accept_encoding->begin, accept_encoding->len, "zstd", 4) != -1) { + /* Clear any compression headers from backend response */ + rspamd_http_message_remove_header(msg, COMPRESSION_HEADER); + rspamd_http_message_remove_header(msg, CONTENT_ENCODING_HEADER); + + /* Compress response only if client supports compression and it's not a milter session */ + if (!session->client_milter_conn && + (session->flags & RSPAMD_PROXY_SESSION_FLAG_CLIENT_SUPPORTS_COMPRESSION)) { proxy_request_compress(msg); } @@ -2158,7 +2168,7 @@ proxy_backend_master_finish_handler(struct rspamd_http_connection *conn, bk_conn->timeout); /* Push to keepalive if needed */ - if (is_keepalive && session->use_keepalive && + if (is_keepalive && (session->flags & RSPAMD_PROXY_SESSION_FLAG_USE_KEEPALIVE) && bk_conn->up && session->ctx->http_ctx) { const char *up_name = rspamd_upstream_name(bk_conn->up); if (up_name) { @@ -2429,7 +2439,12 @@ proxy_send_master_message(struct rspamd_proxy_session *session) rspamd_http_message_remove_header(session->client_message, "Connection"); /* Set keepalive flag based on backend configuration */ - session->use_keepalive = backend ? backend->keepalive : FALSE; + if (backend && backend->keepalive) { + session->flags |= RSPAMD_PROXY_SESSION_FLAG_USE_KEEPALIVE; + } + else { + session->flags &= ~RSPAMD_PROXY_SESSION_FLAG_USE_KEEPALIVE; + } if (backend == NULL) { /* No backend */ @@ -2677,6 +2692,15 @@ proxy_client_finish_handler(struct rspamd_http_connection *conn, session->client_message = rspamd_http_connection_steal_msg( session->client_conn); session->shmem_ref = rspamd_http_message_shmem_ref(session->client_message); + + /* Check if client supports compression */ + const rspamd_ftok_t *accept_encoding = rspamd_http_message_find_header(session->client_message, "Accept-Encoding"); + if (accept_encoding && rspamd_substring_search_caseless(accept_encoding->begin, accept_encoding->len, "zstd", 4) != -1) { + session->flags |= RSPAMD_PROXY_SESSION_FLAG_CLIENT_SUPPORTS_COMPRESSION; + } + else { + session->flags &= ~RSPAMD_PROXY_SESSION_FLAG_CLIENT_SUPPORTS_COMPRESSION; + } rspamd_http_message_remove_header(msg, "Content-Length"); rspamd_http_message_remove_header(msg, "Transfer-Encoding"); rspamd_http_message_remove_header(msg, "Keep-Alive"); @@ -2739,6 +2763,8 @@ proxy_milter_finish_handler(int fd, session->master_conn->name = "master"; session->client_message = msg; + /* Milter protocol doesn't support compression, so no need to set compression flag */ + proxy_open_mirror_connections(session); proxy_send_master_message(session); }