BobBuildTool 1.3.0__tar.gz → 1.3.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/PKG-INFO +1 -1
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/BobBuildTool.egg-info/PKG-INFO +1 -1
- bobbuildtool-1.3.1/pym/BobBuildTool.egg-info/scm_version.json +8 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/scm/url.py +84 -40
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/utils.py +60 -6
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/version.py +3 -3
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/webdav.py +13 -3
- bobbuildtool-1.3.0/pym/BobBuildTool.egg-info/scm_version.json +0 -8
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/.gitattributes +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/.github/ISSUE_TEMPLATE/bug_report.md +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/.github/ISSUE_TEMPLATE/feature_request.md +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/.github/workflows/workflow.yaml +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/.gitignore +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/.readthedocs.yaml +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/LICENSE +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/MANIFEST.in +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/README.md +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/bob +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/bob.cmd +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/bash-completion/bob +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/cleanup-recipes.awk +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/create-release.sh +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/docker/Dockerfile +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/docker/install-packages.sh +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/notify.sh +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/plugins/command.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/plugins/jenkins-cobertura.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/plugins/override.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/plugins/path-fmt.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/contrib/sandbox.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/BOB_Logo.png +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/BOB_Logo.svg +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/Makefile +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/_build/.gitignore +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/_static/.gitkeep +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/_static/css/custom.css +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/_static/d3.v4.min.js +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/_static/sandbox.html +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/_templates/.gitkeep +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/cheatsheet/bob_cheatsheet.pdf +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/cheatsheet/bob_cheatsheet.tex +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/conf.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/glossary.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/images/jenkins.odg +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/images/jenkins.png +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/images/overview.odg +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/images/overview.png +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/images/recipe-flow.odg +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/images/recipe-flow.png +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/images/sandbox_graph.png +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/images/variant-management.odg +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/images/variant-management.png +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/index.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/installation.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-archive.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-build-dev.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-build.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-clean.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-dev.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-graph.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-init.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-jenkins.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-layers.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-ls-recipes.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-ls.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-project.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-query-meta.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-query-path.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-query-recipe.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-query-scm.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-show.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob-status.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bob.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/bobpaths.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/index.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manpages/std-opt-cfg.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manual/audit-trail.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manual/concepts.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manual/configuration.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manual/extending.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manual/index.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manual/introduction.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/manual/policies.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.13.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.14.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.15.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.16.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.17.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.18.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.19.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.20.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.21.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.22.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.23.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.24.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/0.25.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/1.0.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/1.1.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/1.2.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/1.3.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/releases/index.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/requirements.txt +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/tutorial/archive.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/tutorial/compile.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/tutorial/create.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/tutorial/fingerprints.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/tutorial/index.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/tutorial/jenkins.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/tutorial/provide-interpreter.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/doc/tutorial/virtual-packages.rst +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/BobBuildTool.egg-info/SOURCES.txt +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/BobBuildTool.egg-info/dependency_links.txt +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/BobBuildTool.egg-info/entry_points.txt +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/BobBuildTool.egg-info/not-zip-safe +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/BobBuildTool.egg-info/requires.txt +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/BobBuildTool.egg-info/scm_file_list.json +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/BobBuildTool.egg-info/top_level.txt +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/__init__.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/archive.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/audit.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/builder.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/__init__.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/archive.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/build/__init__.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/build/build.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/build/clean.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/build/project.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/build/query.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/build/state.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/build/status.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/graph.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/help.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/helpers.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/invoke.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/jenkins/__init__.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/jenkins/exec.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/jenkins/intermediate.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/jenkins/jenkins.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/layers.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/misc.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/cmds/show.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/develop/__init__.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/develop/make.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/develop/version.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/errors.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/generators/EclipseCdtGenerator.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/generators/QtCreatorGenerator.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/generators/VisualStudio.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/generators/VisualStudioCode.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/generators/__init__.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/generators/common.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/input.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/intermediate.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/invoker.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/languages.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/layers.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/pathspec.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/scm/__init__.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/scm/cvs.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/scm/git.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/scm/imp.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/scm/scm.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/scm/svn.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/scripts.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/share.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/state.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/stringparser.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pym/bob/tty.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/pyproject.toml +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/setup.cfg +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/setup.py +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/src/namespace-sandbox/namespace-sandbox.c +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/src/namespace-sandbox/network-tools.c +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/src/namespace-sandbox/network-tools.h +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/src/namespace-sandbox/process-tools.c +0 -0
- {bobbuildtool-1.3.0 → bobbuildtool-1.3.1}/src/namespace-sandbox/process-tools.h +0 -0
|
@@ -6,8 +6,10 @@
|
|
|
6
6
|
from .. import BOB_VERSION
|
|
7
7
|
from ..errors import BuildError, ParseError
|
|
8
8
|
from ..stringparser import IfExpression
|
|
9
|
-
from ..utils import asHexStr, hashFile, removeUserFromUrl,
|
|
10
|
-
|
|
9
|
+
from ..utils import asHexStr, hashFile, removeUserFromUrl, replacePath, \
|
|
10
|
+
tarfileOpen
|
|
11
|
+
from ..webdav import WebDav, WebdavError, WebdavAlreadyExistsError, \
|
|
12
|
+
WebdavNotFoundError, WebdavNotModifiedError
|
|
11
13
|
from .scm import Scm, ScmAudit
|
|
12
14
|
from http.client import HTTPException
|
|
13
15
|
from abc import abstractmethod
|
|
@@ -22,12 +24,10 @@ import re
|
|
|
22
24
|
import schema
|
|
23
25
|
import shutil
|
|
24
26
|
import signal
|
|
25
|
-
import ssl
|
|
26
27
|
import stat
|
|
27
28
|
import sys
|
|
28
29
|
import tempfile
|
|
29
30
|
import time
|
|
30
|
-
import urllib.error
|
|
31
31
|
import urllib.parse
|
|
32
32
|
import urllib.request
|
|
33
33
|
|
|
@@ -175,8 +175,12 @@ class Extractor():
|
|
|
175
175
|
canary = os.path.join(destDir, "."+destFile+".extracted")
|
|
176
176
|
if dirCreated or isYounger(destination, canary):
|
|
177
177
|
for cmd in cmds:
|
|
178
|
-
if
|
|
179
|
-
|
|
178
|
+
if callable(cmd):
|
|
179
|
+
# Native extraction in Python
|
|
180
|
+
await cmd(invoker)
|
|
181
|
+
elif shutil.which(cmd[0]) is None:
|
|
182
|
+
continue
|
|
183
|
+
elif stdout:
|
|
180
184
|
# Extracts to stdout. We must open the destination only
|
|
181
185
|
# after we have confirmed that we run the extractor!
|
|
182
186
|
# Otherwise we truncate the file.
|
|
@@ -206,11 +210,38 @@ class Extractor():
|
|
|
206
210
|
class TarExtractor(Extractor):
|
|
207
211
|
SUPPORT_STRIP = True
|
|
208
212
|
|
|
213
|
+
@staticmethod
|
|
214
|
+
def _extractTarfile(src, dst):
|
|
215
|
+
"""Extract tar file with Bob's extraction filter.
|
|
216
|
+
|
|
217
|
+
Runs in the invoker executor, i.e. probably in a different process.
|
|
218
|
+
Returns an error message or None on success.
|
|
219
|
+
"""
|
|
220
|
+
import tarfile
|
|
221
|
+
try:
|
|
222
|
+
with tarfileOpen(src) as tar:
|
|
223
|
+
tar.extractall(dst)
|
|
224
|
+
except BuildError as e:
|
|
225
|
+
return e.slogan
|
|
226
|
+
except (tarfile.TarError, OSError, EOFError) as e:
|
|
227
|
+
return "Error extracting '{}': {}".format(src, str(e))
|
|
228
|
+
return None
|
|
229
|
+
|
|
230
|
+
async def _extractNative(self, invoker):
|
|
231
|
+
src = self.getCompressedFilePath(invoker)
|
|
232
|
+
dst = invoker.joinPath(self.dir)
|
|
233
|
+
invoker.trace("<tarfile>", "-e", src, dst)
|
|
234
|
+
err = await invoker.runInExecutor(TarExtractor._extractTarfile, src, dst)
|
|
235
|
+
if err:
|
|
236
|
+
invoker.fail(err)
|
|
237
|
+
|
|
209
238
|
async def extract(self, invoker, dirCreated):
|
|
210
239
|
cmds = []
|
|
211
240
|
compressedFilePath = self.getCompressedFilePath(invoker)
|
|
212
241
|
if isWin32 and self.strip == 0:
|
|
213
|
-
|
|
242
|
+
# Do not use "python -m tarfile" because it does not apply our
|
|
243
|
+
# extraction filter. It might not even be the same interpreter.
|
|
244
|
+
cmds.append(self._extractNative)
|
|
214
245
|
|
|
215
246
|
cmd = ["tar", "-x", "--no-same-owner", "--no-same-permissions",
|
|
216
247
|
"-f", compressedFilePath]
|
|
@@ -483,23 +514,31 @@ class UrlScm(Scm):
|
|
|
483
514
|
except ValueError as e:
|
|
484
515
|
invoker.fail(str(e))
|
|
485
516
|
|
|
486
|
-
def
|
|
517
|
+
def __openHttpDownload(self, url, destination):
|
|
487
518
|
headers = {}
|
|
488
|
-
headers["User-Agent"] = "BobBuildTool/{}".format(BOB_VERSION)
|
|
489
519
|
headers.update(self.__headers)
|
|
490
|
-
|
|
491
|
-
if os.path.isfile(destination) and (url.scheme in ["http", "https"]):
|
|
520
|
+
if os.path.isfile(destination):
|
|
492
521
|
# Try to avoid download if possible
|
|
493
522
|
headers["If-Modified-Since"] = time2HTTPDate(os.stat(destination).st_mtime)
|
|
523
|
+
return WebDav(url, self.__sslVerify).openDownload("", headers=headers)
|
|
494
524
|
|
|
525
|
+
def __openFtpDownload(self, url):
|
|
526
|
+
req = urllib.request.Request(url=url.geturl())
|
|
527
|
+
return urllib.request.urlopen(req)
|
|
528
|
+
|
|
529
|
+
def _download(self, url, destination, mode):
|
|
495
530
|
tmpFileName = None
|
|
496
|
-
req = urllib.request.Request(url=url.geturl(), headers=headers)
|
|
497
531
|
try:
|
|
498
532
|
# Set default signal handler so that KeyboardInterrupt is raised.
|
|
499
533
|
# Needed to gracefully handle ctrl+c.
|
|
500
534
|
signal.signal(signal.SIGINT, signal.default_int_handler)
|
|
501
535
|
|
|
502
|
-
|
|
536
|
+
if url.scheme in ["http", "https"]:
|
|
537
|
+
rsp = self.__openHttpDownload(url, destination)
|
|
538
|
+
else:
|
|
539
|
+
rsp = self.__openFtpDownload(url)
|
|
540
|
+
|
|
541
|
+
with contextlib.closing(rsp):
|
|
503
542
|
with tempfile.NamedTemporaryFile(dir=os.path.dirname(destination), delete=False) as f:
|
|
504
543
|
tmpFileName = f.name
|
|
505
544
|
read = 0
|
|
@@ -521,12 +560,13 @@ class UrlScm(Scm):
|
|
|
521
560
|
replacePath(tmpFileName, destination)
|
|
522
561
|
tmpFileName = None
|
|
523
562
|
|
|
524
|
-
except
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
563
|
+
except WebdavNotModifiedError:
|
|
564
|
+
# HTTP 304 Not modifed -> local file up-to-date
|
|
565
|
+
return False, None, False
|
|
566
|
+
except WebdavNotFoundError:
|
|
567
|
+
return False, "HTTP error 404: Not Found", False
|
|
568
|
+
except WebdavError as e:
|
|
569
|
+
return False, "Failed to download: " + str(e), False
|
|
530
570
|
except HTTPException as e:
|
|
531
571
|
return False, "HTTP error: " + str(e), False
|
|
532
572
|
except OSError as e:
|
|
@@ -589,10 +629,10 @@ class UrlScm(Scm):
|
|
|
589
629
|
invoker.fail("Unsupported URL scheme: " + url.scheme)
|
|
590
630
|
|
|
591
631
|
def _upload(self, source, url):
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
632
|
+
# Address the file relative to the server root. Otherwise the parent
|
|
633
|
+
# directories could not be created.
|
|
634
|
+
path = url.path
|
|
635
|
+
webdav = WebDav(url._replace(path=""), self.__sslVerify)
|
|
596
636
|
try:
|
|
597
637
|
# Set default signal handler so that KeyboardInterrupt is raised.
|
|
598
638
|
# Needed to gracefully handle ctrl+c.
|
|
@@ -600,26 +640,30 @@ class UrlScm(Scm):
|
|
|
600
640
|
|
|
601
641
|
# First check if the file already exists. Only upload if there is a
|
|
602
642
|
# reason to do so.
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
643
|
+
if webdav.exists(path):
|
|
644
|
+
return None
|
|
645
|
+
|
|
646
|
+
# Quoting RFC 4918:
|
|
647
|
+
#
|
|
648
|
+
# A PUT that would result in the creation of a resource without an
|
|
649
|
+
# appropriately scoped parent collection MUST fail with a 409
|
|
650
|
+
# (Conflict).
|
|
651
|
+
#
|
|
652
|
+
# Thus make sure the parent directories exist.
|
|
653
|
+
(dirs, _, _) = path.strip("/").rpartition("/")
|
|
654
|
+
if dirs:
|
|
655
|
+
webdav.mkdir(dirs)
|
|
610
656
|
|
|
611
|
-
# Ok, HEAD returned a 404. Proceed with upload...
|
|
612
657
|
with open(source, "rb") as f:
|
|
613
|
-
|
|
614
|
-
f.seek(0)
|
|
615
|
-
req = urllib.request.Request(url=url.geturl(), method='PUT', data=f, headers=headers)
|
|
616
|
-
with urllib.request.urlopen(req, context=context):
|
|
617
|
-
pass
|
|
658
|
+
webdav.upload(path, f, False)
|
|
618
659
|
|
|
619
|
-
except
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
660
|
+
except WebdavAlreadyExistsError:
|
|
661
|
+
# Lost the race with a concurrent upload. Never mind...
|
|
662
|
+
pass
|
|
663
|
+
except WebdavError as e:
|
|
664
|
+
return "{}: HTTP error: {}".format(webdav.getRequestURL(path), str(e))
|
|
665
|
+
except OSError as e:
|
|
666
|
+
return "{}: {}".format(source, str(e))
|
|
623
667
|
finally:
|
|
624
668
|
# Restore signals to default so that Ctrl+C kills process. Needed
|
|
625
669
|
# to prevent ugly backtraces when user presses ctrl+c.
|
|
@@ -870,6 +870,11 @@ def _tarExtractFilter(member, path):
|
|
|
870
870
|
path = os.path.realpath(path)
|
|
871
871
|
name = member.name
|
|
872
872
|
|
|
873
|
+
# In case Bob runs as root, device nodes would allow writing anywhere (e.g.
|
|
874
|
+
# a block device followed by a regular file of the same name).
|
|
875
|
+
if member.ischr() or member.isblk():
|
|
876
|
+
raise BuildError(f"Refusing to extract special file '{name}'.")
|
|
877
|
+
|
|
873
878
|
# Strip absolute path names (GNU tar default)
|
|
874
879
|
if name.startswith(('/', os.sep)):
|
|
875
880
|
name = name.lstrip('/' + os.sep)
|
|
@@ -879,16 +884,65 @@ def _tarExtractFilter(member, path):
|
|
|
879
884
|
if os.path.isabs(name):
|
|
880
885
|
raise BuildError(f"Refusing to extract absolute path '{name}' from tar file.")
|
|
881
886
|
|
|
887
|
+
# We don't expect any internal '..' names. Simply always normalize the
|
|
888
|
+
# path. Without this step, tarfile could create intermediate directories
|
|
889
|
+
# outside the destination.
|
|
890
|
+
if '..' in name:
|
|
891
|
+
name = os.path.normpath(name)
|
|
892
|
+
member = member.replace(name=name, deep=False)
|
|
893
|
+
|
|
882
894
|
# Ensure we stay in the destination
|
|
883
|
-
|
|
884
|
-
if
|
|
885
|
-
|
|
895
|
+
target = os.path.join(path, name.rstrip('/' + os.sep))
|
|
896
|
+
if member.islnk() or member.issym():
|
|
897
|
+
# Links replace the directory entry itself. Check where the entry is
|
|
898
|
+
# located, not where it points to. This also prevents replacing `path`
|
|
899
|
+
# itself with a link (CVE-2026-7774), which would change its meaning.
|
|
900
|
+
parent, base = os.path.split(target)
|
|
901
|
+
parent = os.path.realpath(parent, strict=os.path.ALLOW_MISSING)
|
|
902
|
+
if base in ('', os.curdir, os.pardir) or \
|
|
903
|
+
os.path.commonpath([parent, path]) != path:
|
|
904
|
+
raise BuildError(f"Refusing to extract '{name}': path is outside of destination directory.")
|
|
905
|
+
else:
|
|
906
|
+
full_name = os.path.realpath(target, strict=os.path.ALLOW_MISSING)
|
|
907
|
+
if os.path.commonpath([full_name, path]) != path:
|
|
908
|
+
raise BuildError(f"Refusing to extract '{name}': path is outside of destination directory.")
|
|
909
|
+
|
|
910
|
+
# Hard links must only reference other archive members. The link target
|
|
911
|
+
# must not be normalized lexically! The kernel resolves '..' *after*
|
|
912
|
+
# following symlinks (e.g. "symlink/../file") -> use realpath().
|
|
913
|
+
#
|
|
914
|
+
# As far as Bob is concerned, symlinks can point outside of the workspace
|
|
915
|
+
# because that is not unusual as build result. Our realpath() checks above
|
|
916
|
+
# will catch later attempts to write through absolute symlinks.
|
|
917
|
+
if member.islnk():
|
|
918
|
+
if os.path.isabs(member.linkname):
|
|
919
|
+
raise BuildError(f"Refusing to extract '{name}': absolute link target")
|
|
920
|
+
linkname = os.path.realpath(os.path.join(path, member.linkname),
|
|
921
|
+
strict=os.path.ALLOW_MISSING)
|
|
922
|
+
if os.path.commonpath([linkname, path]) != path:
|
|
923
|
+
raise BuildError(f"Refusing to extract '{name}': hard link points outside of destination directory.")
|
|
886
924
|
|
|
887
925
|
return member
|
|
888
926
|
|
|
889
|
-
def tarfileOpen(*args, **kwargs):
|
|
927
|
+
def tarfileOpen(name=None, mode='r', *args, **kwargs):
|
|
890
928
|
import tarfile
|
|
891
|
-
|
|
892
|
-
|
|
929
|
+
|
|
930
|
+
if mode.startswith('r'):
|
|
931
|
+
# The checks below rely on realpath() failing on any error other than a
|
|
932
|
+
# missing path component. With strict=False, errors (e.g. ENAMETOOLONG,
|
|
933
|
+
# ELOOP) are silently ignored and the returned path might not match
|
|
934
|
+
# what the kernel resolves (CVE-2025-4517). Python versions lacking
|
|
935
|
+
# ALLOW_MISSING are affected by this CVE and cannot extract safely.
|
|
936
|
+
if not hasattr(os.path, "ALLOW_MISSING"):
|
|
937
|
+
raise BuildError("Refusing to extract tar file: Python version is too old to do this safely.",
|
|
938
|
+
help="Update Python to a release with the CVE-2025-4517 fix (os.path.ALLOW_MISSING).")
|
|
939
|
+
|
|
940
|
+
# To safely extract tar file, we need an extraction_filter. Refuse to
|
|
941
|
+
# work on unpatched Python versions.
|
|
942
|
+
if not hasattr(tarfile, 'data_filter'):
|
|
943
|
+
raise BuildError("Refusing to extract tar file: Python version is too old to do this safely.",
|
|
944
|
+
help="Update Python to a release where TarFile.extraction_filter has been implemented.")
|
|
945
|
+
|
|
946
|
+
ret = tarfile.open(name, mode, *args, **kwargs)
|
|
893
947
|
ret.extraction_filter = _tarExtractFilter
|
|
894
948
|
return ret
|
|
@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
|
|
|
18
18
|
commit_id: str | None
|
|
19
19
|
__commit_id__: str | None
|
|
20
20
|
|
|
21
|
-
__version__ = version = '1.3.
|
|
22
|
-
__version_tuple__ = version_tuple = (1, 3,
|
|
21
|
+
__version__ = version = '1.3.1'
|
|
22
|
+
__version_tuple__ = version_tuple = (1, 3, 1)
|
|
23
23
|
|
|
24
|
-
__commit_id__ = commit_id = '
|
|
24
|
+
__commit_id__ = commit_id = 'gc40b3ab34'
|
|
@@ -18,6 +18,9 @@ class WebdavNotFoundError(WebdavError):
|
|
|
18
18
|
class WebdavAlreadyExistsError(WebdavError):
|
|
19
19
|
pass
|
|
20
20
|
|
|
21
|
+
class WebdavNotModifiedError(WebdavError):
|
|
22
|
+
pass
|
|
23
|
+
|
|
21
24
|
|
|
22
25
|
def getNetLoc(url):
|
|
23
26
|
"""Get the network location of a parsed URL without the credentials.
|
|
@@ -120,11 +123,15 @@ class WebDav:
|
|
|
120
123
|
|
|
121
124
|
return False
|
|
122
125
|
|
|
123
|
-
def openDownload(self, path, offset=None, length=None, query=None
|
|
124
|
-
|
|
126
|
+
def openDownload(self, path, offset=None, length=None, query=None,
|
|
127
|
+
headers=None):
|
|
128
|
+
return self.__retry(lambda: self.__openDownload(path, offset, length,
|
|
129
|
+
query, headers))
|
|
125
130
|
|
|
126
|
-
def __openDownload(self, path, offset, length, query):
|
|
131
|
+
def __openDownload(self, path, offset, length, query, extraHeaders=None):
|
|
127
132
|
headers = self._getHeaders()
|
|
133
|
+
if extraHeaders is not None:
|
|
134
|
+
headers.update(extraHeaders)
|
|
128
135
|
if offset is not None and length is not None:
|
|
129
136
|
headers.update({'Range': 'bytes={}-{}'.format(offset, offset + length - 1)})
|
|
130
137
|
|
|
@@ -136,6 +143,9 @@ class WebDav:
|
|
|
136
143
|
e.fp.read()
|
|
137
144
|
if e.status == 404:
|
|
138
145
|
raise WebdavNotFoundError()
|
|
146
|
+
elif e.status == 304:
|
|
147
|
+
# Only possible if the caller passed "If-Modified-Since"
|
|
148
|
+
raise WebdavNotModifiedError()
|
|
139
149
|
else:
|
|
140
150
|
raise WebdavError("{} {}".format(e.status, e.reason))
|
|
141
151
|
except (http.client.HTTPException, OSError) as e:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|