From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH 1/3] ovpn_reorganize_encryption: Integrate HMAC selection to global section Date: Sat, 27 Apr 2019 16:05:49 +0200 Message-ID: <20190427140551.10647-1-ummeegge@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6174877989334090240==" List-Id: --===============6174877989334090240== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Fixes: #12009 and #11824 - Since HMACs will be used in any configuration it is better placed in the gl= obal menu. - Adapted global section to advanced and marked sections with a headline for = better overview. - Deleted old headline in advanced section cause it is not needed anymore. - Added check if settings do not includes 'DAUTH', if possible SHA512 will be= used and written to settings file. Old configurations with SHA1 will be untouched. Signed-off-by: Erik Kapfer --- html/cgi-bin/ovpnmain.cgi | 88 ++++++++++++++++++++++-----------------------= -- langs/de/cgi-bin/de.pl | 1 - langs/en/cgi-bin/en.pl | 1 - 3 files changed, 42 insertions(+), 48 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 812680328..80190dc34 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -332,11 +332,8 @@ sub writeserverconf { print CONF "status /var/run/ovpnserver.log 30\n"; print CONF "ncp-disable\n"; print CONF "cipher $sovpnsettings{DCIPHER}\n"; - if ($sovpnsettings{'DAUTH'} eq '') { - print CONF ""; - } else { print CONF "auth $sovpnsettings{'DAUTH'}\n"; - } + if ($sovpnsettings{'TLSAUTH'} eq 'on') { print CONF "tls-auth ${General::swroot}/ovpn/certs/ta.key\n"; } @@ -793,7 +790,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}= ) { $vpnsettings{'DHCP_DNS'} =3D $cgiparams{'DHCP_DNS'}; $vpnsettings{'DHCP_WINS'} =3D $cgiparams{'DHCP_WINS'}; $vpnsettings{'ROUTES_PUSH'} =3D $cgiparams{'ROUTES_PUSH'}; - $vpnsettings{'DAUTH'} =3D $cgiparams{'DAUTH'}; $vpnsettings{'TLSAUTH'} =3D $cgiparams{'TLSAUTH'}; my @temp=3D(); =20 @@ -1204,6 +1200,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgipa= rams{'TYPE'} eq '' && $cg $vpnsettings{'DMTU'} =3D $cgiparams{'DMTU'}; $vpnsettings{'DCOMPLZO'} =3D $cgiparams{'DCOMPLZO'}; $vpnsettings{'DCIPHER'} =3D $cgiparams{'DCIPHER'}; + $vpnsettings{'DAUTH'} =3D $cgiparams{'DAUTH'}; #wrtie enable =20 if ( $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {system("touch ${General::swro= ot}/ovpn/enable_blue 2>/dev/null");}else{system("unlink ${General::swroot}/ov= pn/enable_blue 2>/dev/null");} @@ -2341,11 +2338,8 @@ else $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}= }[1]cert.pem", "$confighash{$cgiparams{'KEY'}}[1]cert.pem") or die "Can't add= file $confighash{$cgiparams{'KEY'}}[1]cert.pem\n"; =20 } print CLIENTCONF "cipher $vpnsettings{DCIPHER}\r\n"; - if ($vpnsettings{'DAUTH'} eq '') { - print CLIENTCONF ""; - } else { print CLIENTCONF "auth $vpnsettings{'DAUTH'}\r\n"; - } + if ($vpnsettings{'TLSAUTH'} eq 'on') { if ($cgiparams{'MODE'} eq 'insecure') { print CLIENTCONF ";"; @@ -2651,9 +2645,6 @@ ADV_ERROR: if ($cgiparams{'LOG_VERB'} eq '') { $cgiparams{'LOG_VERB'} =3D '3'; } - if ($cgiparams{'DAUTH'} eq '') { - $cgiparams{'DAUTH'} =3D 'SHA512'; - } if ($cgiparams{'TLSAUTH'} eq '') { $cgiparams{'TLSAUTH'} =3D 'off'; } @@ -2682,12 +2673,6 @@ ADV_ERROR: $selected{'LOG_VERB'}{'10'} =3D ''; $selected{'LOG_VERB'}{'11'} =3D ''; $selected{'LOG_VERB'}{$cgiparams{'LOG_VERB'}} =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'; $checked{'TLSAUTH'}{'off'} =3D ''; $checked{'TLSAUTH'}{'on'} =3D ''; $checked{'TLSAUTH'}{$cgiparams{'TLSAUTH'}} =3D 'CHECKED'; @@ -2820,25 +2805,6 @@ print < =20
- - - - - - - =09 - - - - -
$Lang::tr{'ovpn crypt options'}
$Lang::tr{'ovpn ha'} - $Lang::tr{'openvpn default'}: SHA1 (160 $Lang::tr= {'bit'})
=20 @@ -4566,11 +4532,6 @@ if ($cgiparams{'TYPE'} eq 'net') { $selected{'DAUTH'}{'SHA384'} =3D ''; $selected{'DAUTH'}{'SHA256'} =3D ''; $selected{'DAUTH'}{'SHA1'} =3D ''; - # If no hash algorythm has been choosen yet, select - # the old default value (SHA1) for compatiblity reasons. - if ($cgiparams{'DAUTH'} eq '') { - $cgiparams{'DAUTH'} =3D 'SHA1'; - } $selected{'DAUTH'}{$cgiparams{'DAUTH'}} =3D 'SELECTED'; =20 if (1) { @@ -5107,8 +5068,17 @@ END $cgiparams{'MSSFIX'} =3D 'off'; } if ($cgiparams{'DAUTH'} eq '') { - $cgiparams{'DAUTH'} =3D 'SHA512'; - } + if (-z "${General::swroot}/ovpn/ovpnconfig") { + $cgiparams{'DAUTH'} =3D 'SHA512'; + } + foreach my $key (keys %confighash) { + if ($confighash{$key}[3] ne 'host') { + $cgiparams{'DAUTH'} =3D 'SHA512'; + } else { + $cgiparams{'DAUTH'} =3D 'SHA1'; + } + } + } if ($cgiparams{'DOVPN_SUBNET'} eq '') { $cgiparams{'DOVPN_SUBNET'} =3D '10.' . int(rand(256)) . '.' . int(rand(256= )) . '.0/255.255.255.0'; } @@ -5225,8 +5195,16 @@ END if (&haveOrangeNet()) { =20 print ""; print ""; - }=09 - print < + + + + + @@ -5236,6 +5214,24 @@ END + + + + + + + + + + + =20
$Lang::tr{'ovpn on orange'}
$Lang::tr{'net config'}:

$Lang::tr{'local = vpn hostname/ip'}:
 $Lang::tr{'ovpn subn= et'}
$Lang::tr{'protocol'}
$Lang::tr{'MTU'} 

$Lang::tr{'ovpn crypt options'}:

$Lang::tr{'ovpn ha'} + $Lang::tr{'cipher'}