Mirrors/ArchiveBox
2
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox synced 2024-11-22 12:13:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

add timeout limit to bin_version loading in config

Browse source
This commit is contained in:
Nick Sweeting 2024-09-21 01:55:09 -07:00
parent 575105006d
commit aa21c56ddd
No known key found for this signature in database
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
archivebox/config.py
View file

@ -909,7 +909,7 @@ def hint(text: Union[Tuple[str, ...], List[str], str], prefix=' ', config: Op
# Dependency Metadata Helpers # Dependency Metadata Helpers
def bin_version(binary: Optional[str], cmd: Optional[str]=None) -> Optional[str]: def bin_version(binary: Optional[str], cmd: Optional[str]=None, timeout: int=3) -> Optional[str]:
"""check the presence and return valid version line of a specified binary""" """check the presence and return valid version line of a specified binary"""
abspath = bin_path(binary) abspath = bin_path(binary)
@ -919,15 +919,23 @@ def bin_version(binary: Optional[str], cmd: Optional[str]=None) -> Optional[str]
try: try:
bin_env = os.environ | {'LANG': 'C'} bin_env = os.environ | {'LANG': 'C'}
is_cmd_str = cmd and isinstance(cmd, str) is_cmd_str = cmd and isinstance(cmd, str)
version_str = run(cmd or [abspath, "--version"], shell=is_cmd_str, stdout=PIPE, stderr=STDOUT, env=bin_env).stdout.strip().decode() version_str = (
run(cmd or [abspath, "--version"], timeout=timeout, shell=is_cmd_str, stdout=PIPE, stderr=STDOUT, env=bin_env)
.stdout.strip()
.decode()
)
if not version_str: if not version_str:
version_str = run(cmd or [abspath, "--version"], shell=is_cmd_str, stdout=PIPE, stderr=STDOUT).stdout.strip().decode() version_str = (
run(cmd or [abspath, "--version"], timeout=timeout, shell=is_cmd_str, stdout=PIPE, stderr=STDOUT)
.stdout.strip()
.decode()
)
# take first 3 columns of first line of version info # take first 3 columns of first line of version info
semver = SemVer.parse(version_str) semver = SemVer.parse(version_str)
if semver: if semver:
return str(semver) return str(semver)
except OSError: except (OSError, TimeoutExpired):
pass pass
# stderr(f'[X] Unable to find working version of dependency: {binary}', color='red') # stderr(f'[X] Unable to find working version of dependency: {binary}', color='red')
# stderr(' Make sure it\'s installed, then confirm it\'s working by running:') # stderr(' Make sure it\'s installed, then confirm it\'s working by running:')