[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c293ac4b282da94f2d4b7449738c4be2a590c86e

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c293ac4b282da94f2d4b7449738c4be2a590c86e

[Michael Tremer]

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 <adolf.belka@ipfire.org>
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 <adolf.belka@ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit e04f5376ba18767a6a9eccf104c472295a75340b
Author: Stefan Schantl <stefan.schantl@ipfire.org>
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 <stefan.schantl@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

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