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 4c7gTW6w63z2xSN for ; Fri, 22 Aug 2025 13:07:43 +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 "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4c7gTW6fpTz2xQc for ; Fri, 22 Aug 2025 13:07:43 +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 4c7gTW2b5xzD5 for ; Fri, 22 Aug 2025 13:07:43 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1755868063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=8nYyiVawqUXzBFPZEyRt0SnvtW03z46EBUbKq94dh3k=; b=RXZXH0VUBW6H/ejCC+0QWGPZFciItu49nRXrSjG8UWKt3ZVZdx65BDYXrrmQVbYOUFH99m IjqKPG+tUH3l4TBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1755868063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=8nYyiVawqUXzBFPZEyRt0SnvtW03z46EBUbKq94dh3k=; b=oXR3/KwW9WfUfN5IgCG7BVxWfZRH+VX00HId2DAEOXBU+9WF3iDMtGgGRGl08QiOazxmox LTADj5Hspw9oP7cPfX0bgrrlCaB/tY9IV9EBkRCBpOROrN3nfm0NJOfXOsNh5NZMk+an5r Ii1Wemj7rHddKn2pCEDEFWqE3V0da5SmgC9Juub96D7B2AAICY+eeOom/+n5m9htMm4TTC 4Yb8RidaNfCuhNY32FlXL9HHSGO5Gf2TV7XnoCLrNVziBFNvfuMyBD2M0G0YnGdlsyp2yq EFhpwGQanpBeZZNCfCq9uHrR5y3NmVaaR++lDi9y/sIxHrJYzsEyeRPoVDVR3g== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4c7gTW1Rqzz2y1V; Fri, 22 Aug 2025 13:07:43 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c293ac4b282da94f2d4b7449738c4be2a590c86e X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 8d611ffd0424ba20aac45f63f5bdaa398b4cb557 X-Git-Newrev: c293ac4b282da94f2d4b7449738c4be2a590c86e Message-Id: <4c7gTW1Rqzz2y1V@people01.haj.ipfire.org> Date: Fri, 22 Aug 2025 13:07:43 +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, master has been updated via c293ac4b282da94f2d4b7449738c4be2a590c86e (commit) via e04f5376ba18767a6a9eccf104c472295a75340b (commit) from 8d611ffd0424ba20aac45f63f5bdaa398b4cb557 (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 c293ac4b282da94f2d4b7449738c4be2a590c86e 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 e04f5376ba18767a6a9eccf104c472295a75340b 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