mirror of
https://github.com/frappe/bench.git
synced 2025-01-09 08:30:39 +00:00
fix: add safety filter for untarring
This commit is contained in:
parent
36c3cf4415
commit
e8ea98552c
@ -24,6 +24,7 @@ from bench.exceptions import NotInBenchDirectoryError
|
||||
from bench.utils import (
|
||||
UNSET_ARG,
|
||||
fetch_details_from_tag,
|
||||
get_app_cache_extract_filter,
|
||||
get_available_folder_name,
|
||||
get_bench_cache_path,
|
||||
is_bench_directory,
|
||||
@ -343,7 +344,11 @@ class App(AppMeta):
|
||||
|
||||
click.secho(f"Getting {self.app_name} from cache", fg="yellow")
|
||||
with tarfile.open(cache_path, mode) as tar:
|
||||
tar.extractall(app_path.parent)
|
||||
try:
|
||||
tar.extractall(app_path.parent, filter=get_app_cache_extract_filter())
|
||||
except:
|
||||
shutil.rmtree(app_path)
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
@ -9,7 +9,8 @@ from functools import lru_cache
|
||||
from glob import glob
|
||||
from pathlib import Path
|
||||
from shlex import split
|
||||
from typing import List, Optional, Tuple
|
||||
from tarfile import data_filter, AbsoluteLinkError, TarInfo
|
||||
from typing import Callable, List, Optional, Tuple
|
||||
|
||||
# imports - third party imports
|
||||
import click
|
||||
@ -569,3 +570,28 @@ def get_cmd_from_sysargv():
|
||||
break
|
||||
|
||||
return cmd_from_ctx
|
||||
|
||||
|
||||
def get_app_cache_extract_filter(
|
||||
count_threshold: int = 10_000,
|
||||
size_threshold: int = 1_000_000_000,
|
||||
) -> Callable[[TarInfo, str], TarInfo | None]:
|
||||
state = dict(count=0, size=0)
|
||||
|
||||
def filter_function(member: TarInfo, dest_path: str) -> Optional[TarInfo]:
|
||||
state["count"] += 1
|
||||
state["size"] += member.size
|
||||
|
||||
if state["count"] > count_threshold:
|
||||
raise Exception(f"Number of entries exceeds threshold ({state['count']})")
|
||||
|
||||
if state["size"] > size_threshold:
|
||||
raise Exception(f"Extracted size exceeds threshold ({state['size']})")
|
||||
|
||||
try:
|
||||
return data_filter(member, dest_path)
|
||||
except AbsoluteLinkError:
|
||||
# Links created by `frappe` after extraction
|
||||
return None
|
||||
|
||||
return filter_function
|
||||
|
Loading…
Reference in New Issue
Block a user