From mboxrd@z Thu Jan 1 00:00:00 1970 From: ummeegge To: development@lists.ipfire.org Subject: [PATCH v2 1/7] OpenVPN: Introduce advanced encryption section Date: Thu, 10 Dec 2020 16:59:19 +0000 Message-ID: <20201210165925.25037-1-erik.kapfer@ipfire.org> In-Reply-To: <20201203120807.20694-1-erik.kapfer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0774096222853728998==" List-Id: --===============0774096222853728998== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - The whole crypto section will be sorted out from the global section to an extra page while this patchset and a set of defaults should handle the encryption also for not experienced users. The WUI style has been adopted from the IPSec WUI. - The new directive '--data-ciphers algs' has been introduced for RWs with OpenVPN version 2.5.0. This directive negotiates with the clients the best but also available cipher. The selection for '--data-ciphers algs' is between the GCM family and the new CHACHA20-POLY1305. All ciphers can be combined with another. - The new directive '--data-ciphers algs' substitutes '--ncp-disable', theref= or '--ncp-disable' has been removed which fixes the deprecation warning in the new OpenVPN-2.5.0 server instance. - While client generation the client version can be set via a checkbox which enables, if client is >=3D2.5.0 a full cipher negotiation by printing also the '--data-cipher algs' directive into the client.ovpn, if the client version <=3D2.5.0 (checkbox off), the old deprecated '--cipher alg' will be w= ritten. Existing clients can also subsequently be enhanced via editing the connection. Signed-off-by: ummeegge --- html/cgi-bin/ovpnmain.cgi | 192 +++++++++++++++++++++++++++++++++++++- langs/de/cgi-bin/de.pl | 7 ++ langs/en/cgi-bin/en.pl | 7 ++ langs/es/cgi-bin/es.pl | 7 ++ langs/fr/cgi-bin/fr.pl | 7 ++ langs/it/cgi-bin/it.pl | 7 ++ langs/nl/cgi-bin/nl.pl | 7 ++ langs/pl/cgi-bin/pl.pl | 7 ++ langs/ru/cgi-bin/ru.pl | 7 ++ langs/tr/cgi-bin/tr.pl | 7 ++ 10 files changed, 251 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 68a70d147..40ae58673 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -75,6 +75,7 @@ my $name; my $col=3D""; my $local_serverconf =3D "${General::swroot}/ovpn/scripts/server.conf.local"; my $local_clientconf =3D "${General::swroot}/ovpn/scripts/client.conf.local"; +my @advcipherchar=3D(); =20 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); $cgiparams{'ENABLED'} =3D 'off'; @@ -98,6 +99,7 @@ $cgiparams{'number'} =3D ''; $cgiparams{'DCIPHER'} =3D ''; $cgiparams{'DAUTH'} =3D ''; $cgiparams{'TLSAUTH'} =3D ''; +$cgiparams{'DATACIPHERS'} =3D ''; $routes_push_file =3D "${General::swroot}/ovpn/routes_push"; # Perform crypto and configration test &pkiconfigcheck; @@ -325,8 +327,16 @@ sub writeserverconf { }=09 print CONF "status-version 1\n"; print CONF "status /var/run/ovpnserver.log 30\n"; - print CONF "ncp-disable\n"; print CONF "cipher $sovpnsettings{DCIPHER}\n"; + + # Data channel encryption + # Set seperator for data ciphers + @advcipherchar =3D ($sovpnsettings{'DATACIPHERS'} =3D~ s/\|/:/g); + # Add also algorithm from --cipher directive + if ($sovpnsettings{'DATACIPHERS'} ne '') { + print CONF "data-ciphers $sovpnsettings{'DATACIPHERS'}\n"; + } + print CONF "auth $sovpnsettings{'DAUTH'}\n"; # Set TLSv2 as minimum print CONF "tls-version-min 1.2\n"; @@ -911,6 +921,27 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'= }) { &writeserverconf();#hier ok } =20 +### +### Save Advanced encryption +### + +if ($cgiparams{'ACTION'} eq $Lang::tr{'save-enc-options'}) { + &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); + + $vpnsettings{'DATACIPHERS'} =3D $cgiparams{'DATACIPHERS'}; + + # --data-ciphers needs at least one cipher + if ($cgiparams{'DATACIPHERS'} eq '') { + $errormessage =3D $Lang::tr{'ovpn errmsg invalid data cipher input'}; + goto ADV_ENC_ERROR; + } + + &General::writehash("${General::swroot}/ovpn/settings", \%vpnsettings); + &writeserverconf(); +} + +### End Save advanced encryption + ### # m.a.d net2net ### @@ -2344,7 +2375,16 @@ else $zip->addFile( "${General::swroot}/ovpn/ca/cacert.pem", "cacert.pem") or d= ie "Can't add file cacert.pem\n"; $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"; + + # Set --data-ciphers for client >=3D2.5.0 or --cipher for <2.5.0 in client.= ovpn + if ($confighash{$cgiparams{'KEY'}}[45] eq 'on') { + # Set seperator for --data-ciphers algorithms + @advcipherchar =3D ($vpnsettings{'DATACIPHERS'} =3D~ s/\|/:/g); + print CLIENTCONF "data-ciphers $vpnsettings{'DATACIPHERS'}\r\n"; + } else { + print CLIENTCONF "cipher $vpnsettings{'DCIPHER'}\r\n"; + } + print CLIENTCONF "auth $vpnsettings{'DAUTH'}\r\n"; =20 if ($vpnsettings{'TLSAUTH'} eq 'on') { @@ -2859,7 +2899,132 @@ END &Header::closebigbox(); &Header::closepage(); exit(0); -=09 + +### +### Advanced encryption settings +### +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'ovpn advanced encryption'}) { + %cgiparams =3D (); + %confighash =3D (); + my @temp=3D(); + my $disabled; + &General::readhash("${General::swroot}/ovpn/settings", \%cgiparams); + + my $key =3D $cgiparams{'KEY'}; + if (! $key) { + $key =3D &General::findhasharraykey (\%confighash); + foreach my $i (39.. 45) { $confighash{$key}[$i] =3D ""; } + } + $confighash{$key}[42] =3D $cgiparams{'DATACIPHERS'}; + +ADV_ENC_ERROR: + + # Set default data channel ciphers + if ($cgiparams{'DATACIPHERS'} eq '') { + $cgiparams{'DATACIPHERS'} =3D 'ChaCha20-Poly1305|AES-256-GCM'; #[42]; + } + $checked{'DATACIPHERS'}{'ChaCha20-Poly1305'} =3D ''; + $checked{'DATACIPHERS'}{'AES-256-GCM'} =3D ''; + $checked{'DATACIPHERS'}{'AES-192-GCM'} =3D ''; + $checked{'DATACIPHERS'}{'AES-128-GCM'} =3D ''; + @temp =3D split('\|', $cgiparams{'DATACIPHERS'}); + foreach my $key (@temp) {$checked{'DATACIPHERS'}{$key} =3D "selected=3D'sel= ected'"; } + + # Save settings and display default if not configured + if ($cgiparams{'ACTION'} eq $Lang::tr{'save-enc-options'}) { + $confighash{$cgiparams{'KEY'}}[42] =3D $cgiparams{'DATACIPHERS'}; + } else { + $cgiparams{'DATACIPHERS'} =3D $vpnsettings{'DATACIPHERS'}; + } + +ADV_ENC_ERROR: + + &Header::showhttpheaders(); + &Header::openpage($Lang::tr{'ovpn'}, 1, ''); + &Header::openbigbox('100%', 'left', '', $errormessage); + if ($errormessage) { + &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + print "$errormessage"; + print " "; + &Header::closebox(); + } + + if ($warnmessage) { + &Header::openbox('100%', 'left', "$Lang::tr{'warning messages'}:"); + print "$warnmessage"; + print " "; + &Header::closebox(); + } + + print "
"; + &Header::openbox('100%', 'left', "$Lang::tr{'ovpn advanced encryption'}:"); + print< + + + + + + + + + + + + + + +
$Lang::tr{'ovpn data channel'}
$Lang::tr{'ovpn data encryption'} + + +
+
+END +; + + if ( -e "/var/run/openvpn.pid") { + print"
$Lang::tr{'attention'}:<= br>$Lang::tr{'server restart'}

"; + print< + +   + + +   + + + +END +; + + } else { + print< + +   + + +   + + + +END +; + + } + + &Header::closebox(); + &Header::closebigbox(); + &Header::closepage(); + exit(0); + +### END advanced encryption =20 # A.Marx CCD Add,delete or edit CCD net =20 @@ -3595,6 +3760,8 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'DAUTH'} =3D $confighash{$cgiparams{'KEY'}}[39]; $cgiparams{'DCIPHER'} =3D $confighash{$cgiparams{'KEY'}}[40]; $cgiparams{'TLSAUTH'} =3D $confighash{$cgiparams{'KEY'}}[41]; + # Index from [39] to [44] has been reserved by advanced encryption + $cgiparams{'CLIENTVERSION'} =3D $confighash{$cgiparams{'KEY'}}[45]; } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) { $cgiparams{'REMARK'} =3D &Header::cleanhtml($cgiparams{'REMARK'}); =09 @@ -4338,6 +4505,8 @@ if ($cgiparams{'TYPE'} eq 'net') { if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} eq "")) { $confighash{$key}[41] =3D "no-pass"; } + # Index from [39] to [44] has been reserved by advanced encryption + $confighash{$key}[45] =3D $cgiparams{'CLIENTVERSION'}; =20 &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash= ); =09 @@ -4749,6 +4918,7 @@ if ($cgiparams{'TYPE'} eq 'host') { print"

"; my $name=3D$cgiparams{'CHECK1'}; $checked{'RG'}{$cgiparams{'RG'}} =3D 'CHECKED'; + $checked{'CLIENTVERSION'}{$cgiparams{'CLIENTVERSION'}} =3D 'CHECKED'; =09 if (! -z "${General::swroot}/ovpn/ccd.conf"){=09 print""; @@ -4884,7 +5054,12 @@ if ($cgiparams{'TYPE'} eq 'host') { =09 print < - + + + + +
$Lang::tr{'ccd name'}$Lang::tr{'network'}$Lang::tr{'ccd clientip'}
Redirect Gateway:
Redirect Gateway:
$Lang::tr{'ovpn client version 25 cipher negotiation'}:= +  $Lang::tr{'ovpn client version 25 warning'}

$Lang::tr{'ccd routes'}
 
$Lang::tr{'ccd iroute'}