From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cs4V25bBMz2xXb for ; Wed, 22 Oct 2025 10:02:50 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cs4V25TZ3z2xMw for ; Wed, 22 Oct 2025 10:02:50 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "people01.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cs4Td2PxTz12Z for ; Wed, 22 Oct 2025 10:02:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1761127349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=OZVlal5pYdo08hgKsjEBu3gfxq+U4yoNm9pCLSD4AAE=; b=J36EEgFN8zsTHCdPQraFndD4xXa0g4kw28cgiek8MHfNtYkgdsE4TclU6V4Rv9cfQMOrF+ pWmeO5WcK6DDaCCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1761127349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=OZVlal5pYdo08hgKsjEBu3gfxq+U4yoNm9pCLSD4AAE=; b=BB66gmkHuU2TcUIEAqoaknBUMJN5bw3EVjhQjlYWej4PEaC3gXAwTAOmw1bTaNHuTKtKzQ oczutenogwK9hFHqm2ZYOOJgOipX5g/ahqPnejwFH4RPMkx64uwcr6PfzRAWqafrJNXKkP Jnpi6ab+WXf2aEax7yYj8e+Ln6QanqsvzaFnbz/S9Hz2O3fp1u5Apr6SIaVkf05wGL9+34 UVgaA7vXZ4z7V2ocq7ofFtoia4wbTGIfmdgaqXEQAMGxCH/4YpCRZRncDW4XGlxUmoYhze yZ7hmpazGFoDpcE6+dhvgNX4owEEySdwJL5vHYNXIsrbixO4XJ7G0qDUQIClRw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4cs4Td1pW2z2xTH; Wed, 22 Oct 2025 10:02:29 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, core198, updated. 018db0afbc778057f2fe03dfdbb2f03c05e5c1bd X-Git-Refname: refs/heads/core198 X-Git-Reftype: branch X-Git-Oldrev: f1e4331fa76b628c91057aca8e501c87de90283b X-Git-Newrev: 018db0afbc778057f2fe03dfdbb2f03c05e5c1bd Message-Id: <4cs4Td1pW2z2xTH@people01.haj.ipfire.org> Date: Wed, 22 Oct 2025 10:02:29 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core198 has been updated via 018db0afbc778057f2fe03dfdbb2f03c05e5c1bd (commit) via e99655e9c77c67b19fdf10575755b8d4f392570e (commit) via d451f131ff19cc090d78712adc9309dd5bed2990 (commit) from f1e4331fa76b628c91057aca8e501c87de90283b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 018db0afbc778057f2fe03dfdbb2f03c05e5c1bd Author: Michael Tremer Date: Wed Oct 22 10:01:53 2025 +0000 core198: Update squid.conf and reload Signed-off-by: Michael Tremer commit e99655e9c77c67b19fdf10575755b8d4f392570e Author: Adolf Belka Date: Mon Oct 20 12:48:29 2025 +0200 proxy.cgi: Mitigation for CVE-2025-62168 on squid - The full fix for CVE-2025-62168 is in version squid-7.2 - However there are a lot of changes in squid from version 6 to 7 with all the error language files no longer provided directly, they have to be obtained from separate langauage packs now. Also several tools like cachmgr.cgi have been removed as the options can be obtained via different approaches. - I have had a look at squid-7.2 and I believe I can do the upgrade but it will take some time to be sure it is working properly. - In the interim, this patch adds the mitigation "email_err_data off" into squid.conf that is referenced in the CVE report. - If someone else has already worked on squid-7.2 and has it ready to go now or soon, then this patch can be dropped. Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit d451f131ff19cc090d78712adc9309dd5bed2990 Author: Michael Tremer Date: Thu Oct 16 18:40:08 2025 +0200 general-functions.pl: Read output first before we wait for the process to terminate When generating IPS reports, the reporter could not write to the output, therefore blocked and the CGI script timed out. Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 4 ++-- config/rootfiles/core/198/filelists/files | 1 + config/rootfiles/core/198/update.sh | 4 ++++ html/cgi-bin/proxy.cgi | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 94d0e7440..1c3374d86 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -66,13 +66,13 @@ sub system_output($) { die "Could not execute @command: $!"; } - waitpid($pid, 0); - while () { push(@output, $_); } close(OUTPUT); + waitpid($pid, 0); + return @output; } diff --git a/config/rootfiles/core/198/filelists/files b/config/rootfiles/core/198/filelists/files index 709788ae8..bc82e6c2a 100644 --- a/config/rootfiles/core/198/filelists/files +++ b/config/rootfiles/core/198/filelists/files @@ -1,6 +1,7 @@ etc/rc.d/init.d/cleanfs etc/rc.d/init.d/suricata srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/proxy.cgi var/ipfire/graphs.pl var/ipfire/header.pl var/ipfire/ids-functions.pl diff --git a/config/rootfiles/core/198/update.sh b/config/rootfiles/core/198/update.sh index bb08f493e..12c1d5bf0 100644 --- a/config/rootfiles/core/198/update.sh +++ b/config/rootfiles/core/198/update.sh @@ -53,6 +53,10 @@ usermod -a -G mail suricata chmod 640 /var/ipfire/dma/auth.conf chown nobody:mail /var/ipfire/dma/auth.conf +# Upgrade the proxy configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi +/etc/init.d/squid reload + # update linker config ldconfig diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index fdb7c6a77..f0547e249 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3109,6 +3109,7 @@ sub writeconfig shutdown_lifetime 5 seconds icp_port 0 httpd_suppress_version_string on +email_err_data off END ; hooks/post-receive -- IPFire 2.x development tree