From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] backup.pl: Fixes bug13734 - tar treats colon in filename
 as remote location
Date: Thu, 08 Aug 2024 22:02:41 +0200
Message-ID: <79b831f2-d7dc-44ce-ab90-0b281e6c05ba@ipfire.org>
In-Reply-To: <20240807140220.3445203-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7857185001989754290=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>


Am 07.08.2024 um 16:02 schrieb Adolf Belka:
> - When a user tries to restore on the console from a backup on IPFire that =
has a colon in
>     the filename the tar treats this as meaning that everything after the c=
olon is
>     information about a remote location to do the extraction to. This resul=
ts in a filename
>     that cannot be found, and a remote location that is not correct and the=
 tar operation
>     fails.
> - This has been confirmed by myself.
> - If the user tries a restore from a file downloaded to another computer th=
en for most, if
>     not all browsers, the colon will have been replaced by an underscore or=
 other character.
>     Firefox, Chromium and Vivaldi do this.
> - So any backup file that is selected to be restored using the WUI will no =
longer have a
>     colon in the filename.
> - This patch adds --force-local to the tar command, which means that tar wi=
ll treat the
>     colon as a character in the filename. This will ensure that if a user h=
as any backup
>     files stored on their IPFire system, with a colon in the filename then =
doing a restore
>     from this file will not cause tar to fail.
> - The NOW variable is also changed to replace the colon by a dash and to se=
parate the date
>     and time by an underscore. This filename will be accepted by browsers, =
without doing
>     any replacements. Tested out with Firefox, Chromium & Vivaldi.
> - The above ensures that both the new and old filename versions will work f=
or doing a
>     restore.
>=20
> Fixes: bug13734
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   config/backup/backup.pl | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>=20
> diff --git a/config/backup/backup.pl b/config/backup/backup.pl
> index d848084e9..7b2f95304 100644
> --- a/config/backup/backup.pl
> +++ b/config/backup/backup.pl
> @@ -2,7 +2,7 @@
>   #########################################################################=
######
>   #                                                                        =
     #
>   # IPFire.org - A linux based firewall                                    =
     #
> -# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>               =
      #
> +# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>               =
      #
>   #                                                                        =
     #
>   # This program is free software: you can redistribute it and/or modify   =
     #
>   # it under the terms of the GNU General Public License as published by   =
     #
> @@ -21,7 +21,7 @@
>  =20
>   shopt -s nullglob
>  =20
> -NOW=3D"$(date "+%Y-%m-%d-%H:%M")"
> +NOW=3D"$(date "+%Y-%m-%d_%H-%M")"
>  =20
>   list_addons() {
>   	local file
> @@ -82,7 +82,8 @@ restore_backup() {
>   	# Extract backup
>   	if ! tar xvzpf "${filename}" -C / \
>   			--exclude-from=3D"/var/ipfire/backup/exclude" \
> -			--exclude-from=3D"/var/ipfire/backup/exclude.user"; then
> +			--exclude-from=3D"/var/ipfire/backup/exclude.user" \
> +			--force-local; then
>   		echo "Could not extract backup" >&2
>   		return 1
>   	fi

--===============7857185001989754290==--