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 4c9PfN3sPjz2yyD for ; Mon, 25 Aug 2025 08:51:24 +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 4c9PfJ6yhRz2xQ9 for ; Mon, 25 Aug 2025 08:51:20 +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 4c9PfJ0csmzf1; Mon, 25 Aug 2025 08:51:20 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1756111880; 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=mfcQezQkbJ2jYzUfsGWms+CjXUlHb2XAD0LwDgKJOtY=; b=cNocn8qyqRC3A3vvq+Q7AdGHavuWppHFLdSNjVAh3P8PLCH3jWIV3GmrVO8STegRMFu4fZ Ild12ZOuD5JKdTBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1756111880; 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=mfcQezQkbJ2jYzUfsGWms+CjXUlHb2XAD0LwDgKJOtY=; b=LxSXnsusbH4Omt5JriPrmJdaGUa2H3R58H5LIyiF4YgZhfgvjD1eDUcMUjgdewRdw7EIev x9Kks8DiZLK49T//0lgJ870OFv3QdGZumbpqygQyE/pc6h9vSQAD+6c+M3y5d8wXv72l7W 6JbXiiqEE+9DuvrXRDJ1qSWjpDobNbgjiRrAFLgfMpJwiHn9ECHIrXRR37DqWkB/cUjntS rYdlx3XRzn8ZGJxLrE4RPwOKTkvCtMz7zPTzi+D0BjIV42yDPZcxIgCaiwmUP+Jm2gi5JJ otbTzzbNwt/JHBgjPwHhE07fvPiJBuhh6v8xBwDQZazERqf2ur+12B0AZ6S9Nw== Message-ID: <68d888b8-e445-4555-bd29-e9d604adece6@ipfire.org> Date: Mon, 25 Aug 2025 10:51:16 +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: Apply default settings when neccessary From: Adolf Belka To: Stefan Schantl Cc: "IPFire: Development-List" References: <118761f0-24cd-4a62-b064-8d87dffc6b89@ipfire.org> <20250819183916.5083-1-stefan.schantl@ipfire.org> Content-Language: en-GB In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Stefan, On 23/08/2025 14:55, Adolf Belka wrote: > Hi Stefan, > > I tried out the CU197 Testing update with this patch in place. It works fine for a new install, where there is no existing settings file but for updates or when a restore from an old backup is being done then a settings file already exists and then the default settings are not applied and this results in the settings file having no CIPHERS entry but having a fallback DCIPHER entry. > > In the update where the OpenVPN RW server is stopped before updating and started again afterwards this causes the server to fail to start as there is no CIPHER entry. When a restore from backup is done then the same thing happens with no CIPHERS entry, just a DCIPHER one but as the server is running when the restore is done, it stays running with the old settings but if the Save button is pressed then it Stops because the settings file now has no CIPHERS entry. > > Not sure how to fix this at the moment. Maybe it needs to be if the settings file exists and it contains a CIPHERS entry but I am not sure that is the right approach or not. Figured out how to fix this. Your patch in ovpnmain.cgi stays the same. I just needed to add in some additional lines into backup.pl and the CU197 update.sh file. I just check if ncp-disable is present in server.conf and if it is then delete it and then add in the default DATACIPHERS=AES-256-GCM|AES-128-GCM|CHACHA20-POLY1305 into the settings file. If ncp-disable is in the server.conf then the restore is from prior to openvpn-2.6 and there will be no DATACIPHERS entry. I have tested this out with the backup.pl changes and your patch in place and everything works correctly again. I will submit patches for these additional changes. Regards, Adolf. > > Regards, > > Adolf. > > On 19/08/2025 20:39, Stefan Schantl wrote: >> Only apply the default settings in case nothing has been configured yet, >> otherwise existing settings may get overwritten. >> >> Signed-off-by: Stefan Schantl >> --- >>   html/cgi-bin/ovpnmain.cgi | 2 +- >>   1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi >> index 83f9fdc02..a2f95dc9a 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'}); >