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 4c6XyW1Gvkz2xVX for ; Wed, 20 Aug 2025 17:10:27 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4c6XyW12CCz2xMP for ; Wed, 20 Aug 2025 17:10:27 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4c6XyT5KR3zFR for ; Wed, 20 Aug 2025 17:10:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1755709825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=+kExQFvAyJk7kvdstllWhRxVIGY9V6OLxSQm/ChM4bY=; b=In+rttswLB32Cl0pzqJka9sKcJ33UgEIAq6VYdlucovoZSK7+QtcMC+OUM70IImmorQoys N2G84TvODE/VAfAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1755709825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=+kExQFvAyJk7kvdstllWhRxVIGY9V6OLxSQm/ChM4bY=; b=SpfQQOCFfKi3XH8lv3UYOFkKFmBMKsE0J99ybZ76F6Mz+ENXX4GYZHpED/L0WbRwJqkJCS APzs+KdTMCN0bZlR0GjkB+F816do5i/S3fp5Rad08Y2rfquM4K0vlzXD75rFuAowMIXGPM Z3XXGyy7TelU3PS2ZBUB8cQ3ev4GcnBe6gtSJ6l+2vIPgnrEXSCIDsRwzOqu6n1ka5F/cp dPWPG2ZA2GllGbqpK+TOzp5nhula84x/OA3LHLhu0J//L+a/FHP2rruwh5T32ackdkMf1U bcra48Fwa96Wl/dzwZdQtt742FWKXE9mYONmfovu0sLNgtDJTg11xEw3yz8nCg== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4c6XyT153pz2xT0; Wed, 20 Aug 2025 17:10:25 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 922c244692d7792ad3c57f3cf3a26aecc3398899 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 750377a96a2a380449d6612ddc2661cb782215ab X-Git-Newrev: 922c244692d7792ad3c57f3cf3a26aecc3398899 Message-Id: <4c6XyT153pz2xT0@people01.haj.ipfire.org> Date: Wed, 20 Aug 2025 17:10:25 +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, next has been updated via 922c244692d7792ad3c57f3cf3a26aecc3398899 (commit) via 77f1c6dc3999d2174079bf57f1a6078c5e74f7ab (commit) from 750377a96a2a380449d6612ddc2661cb782215ab (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 922c244692d7792ad3c57f3cf3a26aecc3398899 Author: Adolf Belka Date: Wed Aug 20 18:51:47 2025 +0200 ovpnmain.cgi: Fixes bug13869 - shows values from vpnsettings in advanced server page - In the previous version the cgiparams hash was filled from the ovpn/settings file. However with the new version of this file that is no longer done. For the values of protocol, redirect_gw, mssfix, dataciphers, route_push the hash file was changed from %cgiparams to %vpnsettings. This was not done for the values of dciphers, dauth or tlsauth. These values still got their entries from the %cgiparams hash but this hash is empty as it has not been filled. - This patch replaces the use of $cgiparams with $vpnsettings. - Tested this out on my vm testbed and confirmed that the saved values are now shown on the advanced settings wui page. Fixes: bug13869 Tested-by: Adolf Belka Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit 77f1c6dc3999d2174079bf57f1a6078c5e74f7ab Author: Stefan Schantl Date: Tue Aug 19 20:39:16 2025 +0200 ovpnmain.cgi: Apply default settings when neccessary Only apply the default settings in case nothing has been configured yet, otherwise existing settings may get overwritten. Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 83f9fdc02..dfe7f8ad5 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -132,7 +132,7 @@ my $col=""; "MAX_CLIENTS" => 100, "MSSFIX" => "off", "TLSAUTH" => "on", -}); +}) unless (%vpnsettings); # Load CGI parameters &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); @@ -2694,18 +2694,18 @@ ADV_ERROR: $selected{'DCIPHER'}{'CAST5-CBC'} = ''; $selected{'DCIPHER'}{'BF-CBC'} = ''; $selected{'DCIPHER'}{'DES-CBC'} = ''; - $selected{'DCIPHER'}{$cgiparams{'DCIPHER'}} = 'SELECTED'; + $selected{'DCIPHER'}{$vpnsettings{'DCIPHER'}} = 'SELECTED'; $selected{'DAUTH'}{'whirlpool'} = ''; $selected{'DAUTH'}{'SHA512'} = ''; $selected{'DAUTH'}{'SHA384'} = ''; $selected{'DAUTH'}{'SHA256'} = ''; $selected{'DAUTH'}{'SHA1'} = ''; - $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED'; + $selected{'DAUTH'}{$vpnsettings{'DAUTH'}} = 'SELECTED'; $checked{'TLSAUTH'}{'off'} = ''; $checked{'TLSAUTH'}{'on'} = ''; - $checked{'TLSAUTH'}{$cgiparams{'TLSAUTH'}} = 'CHECKED'; + $checked{'TLSAUTH'}{$vpnsettings{'TLSAUTH'}} = 'CHECKED'; &Header::showhttpheaders(); &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); hooks/post-receive -- IPFire 2.x development tree