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 4c7gVB2Sl3z2xxR for ; Fri, 22 Aug 2025 13:08:18 +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) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4c7gV65Nt1z2xQc for ; Fri, 22 Aug 2025 13:08:14 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4c7gV61pBzzD5; Fri, 22 Aug 2025 13:08:14 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1755868094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rS3AXnK3MB5cQzlCEeBbzgigMAuF9Dhi9lMXWXQ6F/g=; b=yJwNeRZ2R/IELC5xnhiLsxkU3Ewxv+ftr/dK051fYusiJ9aTKpq4xDqE9C4f1kTjUQ++ue AgqOaWk4w7bjoQDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1755868094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rS3AXnK3MB5cQzlCEeBbzgigMAuF9Dhi9lMXWXQ6F/g=; b=Gh5hYhFufQJaRk0TD6EJ53Zi3XtgNYR4pJzoMNtPb+gPhMMKW70IMy8hBPms+CHyoi0NYW iy1J2Y5E1iJzXRM6CqYw93GSFnLSNG4YLWMRkPOyzt84GQ9gIk6q/AQXJ8DI8S3U4uvbSy e5AjzfkZ+2HI0nXbxYQUefif0hj3IbogZTIjJ/Zm4939zqEPFJAPMC4u/0Vpayct7wEJJs Loegk8loihyex4EndK880UFMUMy7RlnI4Dr1Up/3E7/k+U1snKbuv+aGHtpN2DkizZlSgC O/k/ikx6aa3GXKBnrQ1QMireInGx3CDP1au3wuqn7zA0OieUD6XPBgufBEFVZA== Content-Type: text/plain; charset=us-ascii 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 From: Michael Tremer In-Reply-To: <17d10023-b29a-4958-8ae5-1730e9350a66@ipfire.org> Date: Fri, 22 Aug 2025 14:08:10 +0100 Cc: development@lists.ipfire.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <20250820165147.21850-1-adolf.belka@ipfire.org> <17d10023-b29a-4958-8ae5-1730e9350a66@ipfire.org> To: Adolf Belka Yes, you are of course right. I did not think. I moved them over and = pushed them to master. > On 22 Aug 2025, at 10:45, Adolf Belka wrote: >=20 > Hi, >=20 > 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. >=20 > Regards, >=20 > Adolf. >=20 >=20 > 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'} =3D ''; >> $selected{'DCIPHER'}{'BF-CBC'} =3D ''; >> $selected{'DCIPHER'}{'DES-CBC'} =3D ''; >> - $selected{'DCIPHER'}{$cgiparams{'DCIPHER'}} =3D 'SELECTED'; >> + $selected{'DCIPHER'}{$vpnsettings{'DCIPHER'}} =3D 'SELECTED'; >> $selected{'DAUTH'}{'whirlpool'} =3D ''; >> $selected{'DAUTH'}{'SHA512'} =3D ''; >> $selected{'DAUTH'}{'SHA384'} =3D ''; >> $selected{'DAUTH'}{'SHA256'} =3D ''; >> $selected{'DAUTH'}{'SHA1'} =3D ''; >> - $selected{'DAUTH'}{$cgiparams{'DAUTH'}} =3D 'SELECTED'; >> + $selected{'DAUTH'}{$vpnsettings{'DAUTH'}} =3D 'SELECTED'; >> $checked{'TLSAUTH'}{'off'} =3D ''; >> $checked{'TLSAUTH'}{'on'} =3D ''; >> - $checked{'TLSAUTH'}{$cgiparams{'TLSAUTH'}} =3D 'CHECKED'; >> + $checked{'TLSAUTH'}{$vpnsettings{'TLSAUTH'}} =3D 'CHECKED'; >> &Header::showhttpheaders(); >> &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); >=20 >=20