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 4cBFqp734Cz30Cn for ; Tue, 26 Aug 2025 18:02:30 +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 4cBFql34Pwz2xQ9 for ; Tue, 26 Aug 2025 18:02:27 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4cBFqk4ZpkzCx; Tue, 26 Aug 2025 18:02:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1756231346; 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=CN/rlFGy/p3sVHrJEjXxg1/ImBJpmLXGiqEU51ijpoo=; b=vAp1Ttnab8nBYPBVFwYHukZAAAA6BS8HINP5ryoeK/bH07o87fOZk9Qj5+34U6iBER1LAr edfDFdaBDG+lLsBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1756231346; 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=CN/rlFGy/p3sVHrJEjXxg1/ImBJpmLXGiqEU51ijpoo=; b=CX1OJDlr0qsV2AvUCIYLsWTA3uDlCKMAL/DTC8SRtLsjW6irD1d64DBAhBb4s55Ng/Jjgm VThYGAB8CVWW2GlChNNWwT8MBsNzkve0zcSjR7qT/8BJoDm006RkNA6sLdrcDqNyrLGp5w IB+pZynxO/+dihlf4JRHlN0JmY3UZf97cVw0WiJKFqbZxv9to2BkboEmWy7rYYp4gLiItg O4EUDlLuryyAPgjrgeTFDi7wKNRyohQiTLH76FPkILAsrfEGh/clNaINGsXBPytqMF/VFE eX535GCxR0uUcDDUqKo5/0uSeNJX0/bNwnZv5l+R3kWXuuM4bJTjXMMpWHb7yg== Message-ID: <3e6b6533-1a23-4e38-b126-a5072d8ff93a@ipfire.org> Date: Tue, 26 Aug 2025 20:02:26 +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 To: Michael Tremer Cc: Stefan Schantl , "IPFire: Development-List" References: <118761f0-24cd-4a62-b064-8d87dffc6b89@ipfire.org> <20250819183916.5083-1-stefan.schantl@ipfire.org> <68d888b8-e445-4555-bd29-e9d604adece6@ipfire.org> <179609FF-E0E3-4FCB-85F9-474C3566A224@ipfire.org> Content-Language: en-GB From: Adolf Belka In-Reply-To: <179609FF-E0E3-4FCB-85F9-474C3566A224@ipfire.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Michael, On 26/08/2025 12:45, Michael Tremer wrote: > Hello Adolf, > > Hmm, maybe Stefan’s patch is not providing the full solution. > > I created a new function some time ago which is called “set_defaults” and the idea is that it would populate any fields that have not been initialized. That way, if we add anything new, there should always be a good default. > > I understand why Stefan is turning of that initialisation, but this does seem to create some more consequences. > > We should never have any server configurations left with ncp-disable, because that will not work any more. I thought regenerating the configuration files through the CGI should take care of this. If Stefan's patch is not present then yes it takes care of it for old restores with ncp-disable still in the server.conf file. If Stefan's patch is present then the default settings don't get used as the restore already has the settings values defined. However the old settings file has no DATACIPHERS entry in it and in ovpnmain.cgi there is still a section of code that checks if DATACIPHERS='' and if yes then it writes ncp-disable into server.conf and leaves DATACIPHERS='' and this causes the openvpn-rw daemon to fail to start. That code is in lines 294 to 298. I suspect those lines were not intended to be still in there. However this means that when an old (non ncp) restore is done then ncp-disable is written into the server.conf file. Maybe if that section of code checks if DATACIPHERS='' and if it is then enters the default values for DATACIPHERS then maybe my "fixes" in backup.pl and update.sh might not be needed. I could have a look at that. I have a little bit of time now to work on IPFire as my nephew and his family are now going back home so I can do some testing out of those scenarios. > > Maybe we need to rethink how we can make set_defaults() work so that we don’t have to add more and more hacks?! If this can be done then that would probably be a good idea. Regards, Adolf. > > Best, > -Michael > >> On 25 Aug 2025, at 09:51, Adolf Belka wrote: >> >> 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'}); >> >> >