mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
e401ae44b2
The 'data_filter' is far too restrictive, this filter doesn't apply any mode bits to directories which in turn will result in unexpected directory permissions of the amongst others msg.[ls]ock directories. With 'data_filter' and a 'patched' python at best we experience CI failures with samba-ad-back1 & samba-ad-back2 CI jobs due to server startup failures, at worst user/admins will need to adjust directory permissions post backup. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15390 Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
95 lines
3.7 KiB
Python
95 lines
3.7 KiB
Python
# Unix SMB/CIFS implementation.
|
|
# Copyright (C) Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
#
|
|
# 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
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
import os
|
|
import tarfile
|
|
from pathlib import Path
|
|
from tarfile import ExtractError, TarInfo, TarFile as UnsafeTarFile
|
|
|
|
|
|
class TarFile(UnsafeTarFile):
|
|
"""This TarFile implementation is trying to ameliorate CVE-2007-4559,
|
|
where tarfile.TarFiles can step outside of the target directory
|
|
using '../../'.
|
|
"""
|
|
|
|
try:
|
|
# New in version 3.11.4 (also has been backported)
|
|
# https://docs.python.org/3/library/tarfile.html#tarfile.TarFile.extraction_filter
|
|
# https://peps.python.org/pep-0706/
|
|
extraction_filter = staticmethod(tarfile.tar_filter)
|
|
except AttributeError:
|
|
def extract(self, member, path="", set_attrs=True, *,
|
|
numeric_owner=False):
|
|
self._safetarfile_check()
|
|
super().extract(member, path, set_attrs=set_attrs,
|
|
numeric_owner=numeric_owner)
|
|
|
|
def extractall(self, path, members=None, *, numeric_owner=False):
|
|
self._safetarfile_check()
|
|
super().extractall(path, members,
|
|
numeric_owner=numeric_owner)
|
|
|
|
def _safetarfile_check(self):
|
|
for tarinfo in self.__iter__():
|
|
if self._is_traversal_attempt(tarinfo=tarinfo):
|
|
raise ExtractError(
|
|
"Attempted directory traversal for "
|
|
f"member: {tarinfo.name}")
|
|
if self._is_unsafe_symlink(tarinfo=tarinfo):
|
|
raise ExtractError(
|
|
"Attempted directory traversal via symlink for "
|
|
f"member: {tarinfo.linkname}")
|
|
if self._is_unsafe_link(tarinfo=tarinfo):
|
|
raise ExtractError(
|
|
"Attempted directory traversal via link for "
|
|
f"member: {tarinfo.linkname}")
|
|
|
|
def _resolve_path(self, path):
|
|
return os.path.realpath(os.path.abspath(path))
|
|
|
|
def _is_path_in_dir(self, path, basedir):
|
|
return self._resolve_path(os.path.join(basedir,
|
|
path)).startswith(basedir)
|
|
|
|
def _is_traversal_attempt(self, tarinfo):
|
|
if (tarinfo.name.startswith(os.sep)
|
|
or ".." + os.sep in tarinfo.name):
|
|
return True
|
|
return False
|
|
|
|
def _is_unsafe_symlink(self, tarinfo):
|
|
if tarinfo.issym():
|
|
symlink_file = Path(
|
|
os.path.normpath(os.path.join(os.getcwd(),
|
|
tarinfo.linkname)))
|
|
if not self._is_path_in_dir(symlink_file, os.getcwd()):
|
|
return True
|
|
return False
|
|
|
|
def _is_unsafe_link(self, tarinfo):
|
|
if tarinfo.islnk():
|
|
link_file = Path(
|
|
os.path.normpath(os.path.join(os.getcwd(),
|
|
tarinfo.linkname)))
|
|
if not self._is_path_in_dir(link_file, os.getcwd()):
|
|
return True
|
|
return False
|
|
|
|
|
|
open = TarFile.open
|