From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] OpenVPN: Fix for N2N plausibility checks
Date: Thu, 16 Apr 2020 14:44:02 +0100
Message-ID: <62CCFF07-3D1C-4C14-8B1A-5FBB21245C5E@ipfire.org>
In-Reply-To: <20200415132404.25688-1-ummeegge@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1991915334025337780=="
List-Id: <development.lists.ipfire.org>

--===============1991915334025337780==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

Just for protocol, this patch is difficult to read.

I would not have noticed that only two lines have been added.

However, let=E2=80=99s just go ahead with it.

-Michael

> On 15 Apr 2020, at 14:24, Erik Kapfer <ummeegge(a)ipfire.org> wrote:
>=20
> Fixes #12335
> If no N2N name has been set, no directory and config has been created so it=
 can not be deleted.
>=20
> 'goto VPNCONF_ERROR;' has been missing for N2N checks.
> Fixed also code formatting.
>=20
> Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
> ---
> html/cgi-bin/ovpnmain.cgi | 55 ++++++++++++++++++++++++--------------------=
---
> 1 file changed, 28 insertions(+), 27 deletions(-)
>=20
> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
> index 00ecd77a0..1e61ddb42 100644
> --- a/html/cgi-bin/ovpnmain.cgi
> +++ b/html/cgi-bin/ovpnmain.cgi
> @@ -3765,41 +3765,42 @@ if ($cgiparams{'TYPE'} eq 'host') {
> #CCD End
>=20
> =09
> - if ($cgiparams{'TYPE'} !~ /^(host|net)$/) {
> -	    $errormessage =3D $Lang::tr{'connection type is invalid'};
> -	    if ($cgiparams{'TYPE'} eq 'net') {
> -      unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgipara=
ms{'NAME'}.conf") or die "Removing Configfile fail: $!";
> -	    rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "=
Removing Directory fail: $!";
> -      }
> -	    goto VPNCONF_ERROR;
> +	if ($cgiparams{'TYPE'} !~ /^(host|net)$/) {
> +		$errormessage =3D $Lang::tr{'connection type is invalid'};
> +		if ($cgiparams{'TYPE'} eq 'net') {
> +			unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{=
'NAME'}.conf") or die "Removing Configfile fail: $!";
> +			rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Re=
moving Directory fail: $!";
> +			goto VPNCONF_ERROR;
> +		}
> +		goto VPNCONF_ERROR;
> 	}
>=20
> -
> 	if ($cgiparams{'NAME'} !~ /^[a-zA-Z0-9]+$/) {
> -	    $errormessage =3D $Lang::tr{'name must only contain characters'};
> -      if ($cgiparams{'TYPE'} eq 'net') {
> -      unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgipara=
ms{'NAME'}.conf") or die "Removing Configfile fail: $!";
> -	    rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "=
Removing Directory fail: $!";
> -      }
> -      goto VPNCONF_ERROR;
> -  }
> +		$errormessage =3D $Lang::tr{'name must only contain characters'};
> +		if ($cgiparams{'TYPE'} eq 'net') {
> +			goto VPNCONF_ERROR;
> +		}
> +		goto VPNCONF_ERROR;
> +	}
>=20
> 	if ($cgiparams{'NAME'} =3D~ /^(host|01|block|private|clear|packetdefault)$=
/) {
> -	    $errormessage =3D $Lang::tr{'name is invalid'};
> -	    if ($cgiparams{'TYPE'} eq 'net') {
> -      unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgipara=
ms{'NAME'}.conf") or die "Removing Configfile fail: $!";
> -	    rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "=
Removing Directory fail: $!";
> -      }
> -	    goto VPNCONF_ERROR;
> +		$errormessage =3D $Lang::tr{'name is invalid'};
> +		if ($cgiparams{'TYPE'} eq 'net') {
> +			unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{=
'NAME'}.conf") or die "Removing Configfile fail: $!";
> +			rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Re=
moving Directory fail: $!";
> +			goto VPNCONF_ERROR;
> +		}
> +		goto VPNCONF_ERROR;
> 	}
>=20
> 	if (length($cgiparams{'NAME'}) >60) {
> -	    $errormessage =3D $Lang::tr{'name too long'};
> -	    if ($cgiparams{'TYPE'} eq 'net') {
> -      unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgipara=
ms{'NAME'}.conf") or die "Removing Configfile fail: $!";
> -	    rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "=
Removing Directory fail: $!";
> -      }
> -	    goto VPNCONF_ERROR;
> +		$errormessage =3D $Lang::tr{'name too long'};
> +		if ($cgiparams{'TYPE'} eq 'net') {
> +			unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{=
'NAME'}.conf") or die "Removing Configfile fail: $!";
> +			rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Re=
moving Directory fail: $!";
> +			goto VPNCONF_ERROR;
> +		}
> +		goto VPNCONF_ERROR;
> 	}
>=20
> ###
> --=20
> 2.12.2
>=20


--===============1991915334025337780==--