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] backup.pl: Fixes Bug#13137 - Existing n2n client
 connection created with openssl-1.1.1x fails to start with openssl-3.x
Date: Mon, 05 Jun 2023 15:42:25 +0100
Message-ID: <C294FFE0-9D1C-4374-8F72-CD07A210BAE1@ipfire.org>
In-Reply-To: <20230605115529.5601-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0148588939278614419=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 5 Jun 2023, at 12:55, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - This code adds the "providers legacy default" line into OpenVPN N2N Clien=
t config files
>   when restoring them in case it is missing from a backup earlier than CU17=
5.
>   Only adds the line if it is not already present.
> - Tested out on my vm testbed system
>=20
> Fixes: Bug#13137
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/backup/backup.pl | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>=20
> diff --git a/config/backup/backup.pl b/config/backup/backup.pl
> index 96e794439..8d990c0f1 100644
> --- a/config/backup/backup.pl
> +++ b/config/backup/backup.pl
> @@ -189,6 +189,21 @@ restore_backup() {
>=20
> # Update OpenVPN CRL
> /etc/fcron.daily/openvpn-crl-updater
> +=20
> + # Update OpenVPN N2N Client Configs
> + ## Add providers legacy default line to n2n client config files
> + # Check if ovpnconfig exists and is not empty
> + if [ -s /var/ipfire/ovpn/ovpnconfig ]; then
> +       # Identify all n2n connections
> +       for y in $(awk -F',' '/net/ { print $3 }' /var/ipfire/ovpn/ovpnconf=
ig); do
> +           # Add the legacy option to all N2N client conf files if it does=
 not already exist
> + if [ $(grep -c "Open VPN Client Config" /var/ipfire/ovpn/n2nconf/${y}/${y=
}.conf) -eq 1 ] ; then
> + if [ $(grep -c "providers legacy default" /var/ipfire/ovpn/n2nconf/${y}/$=
{y}.conf) -eq 0 ] ; then
> + echo "providers legacy default" >> /var/ipfire/ovpn/n2nconf/${y}/${y}.conf
> + fi
> + fi
> +       done
> + fi
>=20
> return 0
> }
> --=20
> 2.40.1
>=20


--===============0148588939278614419==--