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 4c7b0w3mpfz2xbb for ; Fri, 22 Aug 2025 09:46:08 +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 4c7b0r724pz2xQ9 for ; Fri, 22 Aug 2025 09:46:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4c7b0r0zZDz1HC for ; Fri, 22 Aug 2025 09:46:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1755855964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2YN8eA4vkcJFa4V/meSrJJtnPuPb+RH+8ABcnW9JGBQ=; b=KefCEZI/fYLzgZtZsqVhv59YpL6/+cljaOmoDcmZKAX+mihtCk1VwbJuTt2pOFoPcwEk74 mdAIyyAd+yYdbaBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1755855964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2YN8eA4vkcJFa4V/meSrJJtnPuPb+RH+8ABcnW9JGBQ=; b=ByPQhAyhS2OcG1AYUURlbcneJJJBAWMc/OSIB/0kgm1DoLJA1ZyE6JGFykvFNvCDBeIUKQ kcNvDLijI8YNnsQylI9jdV02II77kB4H7guW2qTOtitgA1xGKvXE2MekDdulWeSlNXSDrl +c3ZY+TyDYQbaMZVThbP+XSgGcWuWW8cph0bZqtknC9Y1CulXSDJqIBQcZKLNCZq41xaib v+Cc+5BLDcUD8okYsYZ0eOjkwheKAarux5nciOXVvF0GsxG6QqFM3gxIq8Sc5vOotek7zY tIR+h5isd0oEELTHrcTNnBJFgu75oNdrwwfRX4hj/DHTmIM134QQIiTgcQX0xA== Message-ID: <17d10023-b29a-4958-8ae5-1730e9350a66@ipfire.org> Date: Fri, 22 Aug 2025 11:45:59 +0200 Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Subject: Re: [PATCH] ovpnmain.cgi: Fixes bug13869 - shows values from vpnsettings in advanced server page To: development@lists.ipfire.org References: <20250820165147.21850-1-adolf.belka@ipfire.org> Content-Language: en-GB From: Adolf Belka In-Reply-To: <20250820165147.21850-1-adolf.belka@ipfire.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, I saw that this patch had been accepted and put into next (CU198). I had expected that it would also be put into CU197 Testing as the issue being fixed is part of the openvpn-2.6 changes. Regards, Adolf. On 20/08/2025 18:51, Adolf Belka wrote: > - 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 > --- > html/cgi-bin/ovpnmain.cgi | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi > index 83f9fdc02..3a85c11ac 100644 > --- a/html/cgi-bin/ovpnmain.cgi > +++ b/html/cgi-bin/ovpnmain.cgi > @@ -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, '');