extract: post-extract realpath check of every symlink; classifier refuses link chains (N2-1 review)
The lexical relative-target check missed chains: `a -> b/../..` with
`b -> ../..`, or `l1 -> l2/../../..`, each resolve inside the archive
lexically but above the extract through the other link.
- scripts/lib/strip-escaping-links.py (new, the authority): after tar,
lstat-walk the WHOLE extract (never following links), realpath(strict)
every symlink, and remove + record (stripped_escaping_symlink) any that
resolves outside the extract or to it, dangles or loops. Repeats to a
fixed point; a walk error fails the extract. Own-account absolute
/home[N]/<user>/ targets are kept (they cannot resolve in the sandbox and
resolve only inside the customer's site container on WHP).
- scan-symlinks.php: two passes; a relative link whose resolution passes
through another symlink entry of the archive is DANGEROUS.
- fixtures/tests: cpmove-chain (both shapes) and a hand-built tree for the
post-extract pass (chains, /etc, dangling .bak sidecar, escaping .bak,
loop, link to the top). 3 chain checks fail on a226b49.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
a226b496a2
commit
72b8fa9d08
5 files changed
+196
-7
No files matched your search
@@ -175,6 +175,23 @@ tar --no-same-owner --no-same-permissions --no-overwrite-dir \
|
||||
--exclude-from="$EXCLUDES_FILE" \
|
||||
$TAR_FLAGS "$TARBALL" || TAR_RC=$?
|
||||
|
||||
# N2-1 authority for the WHOLE tree: the classifier above resolves relative
|
||||
# targets lexically, so a chain through another link (a -> b/.., b -> x/y/z)
|
||||
# can pass it. strip-escaping-links.py asks realpath() where every extracted
|
||||
# symlink really lands and removes (records) any that leave $DEST, point at
|
||||
# $DEST itself, dangle or loop — own-account absolute /home/<user>/ targets
|
||||
# excepted. A walk error fails the extract closed.
|
||||
LINK_USERS=("$USERNAME")
|
||||
for top in "$DEST"/*/; do
|
||||
[[ -d "$top" && ! -L "${top%/}" ]] || continue
|
||||
t="$(basename "$top")"; t="${t#cpmove-}"; LINK_USERS+=("$t" "${t##*_}")
|
||||
done
|
||||
STRIP_RC=0
|
||||
ESCAPING=$(python3 -I "$SCRIPT_DIR/lib/strip-escaping-links.py" "$DEST" "$ACTIONS_OUT" "${LINK_USERS[@]}") || STRIP_RC=$?
|
||||
if [[ $STRIP_RC -eq 0 && "${ESCAPING:-0}" -gt 0 ]]; then
|
||||
log "stripped $ESCAPING symlink(s) that resolve outside the extract, dangle or loop (post-extract check)"
|
||||
fi
|
||||
|
||||
VERIFY_RC=0
|
||||
if [[ "$IMPORT_INCLUDE_MAIL" == "true" ]]; then
|
||||
# The authority: whatever the classifier above decided, no symlink, no
|
||||
@@ -185,6 +202,9 @@ fi
|
||||
if [[ $TAR_RC -ne 0 ]]; then
|
||||
fail_extract "$TAR_RC" "tar failed (rc=$TAR_RC)$( [[ $VERIFY_RC -ne 0 ]] && echo "; mail-tree verify also failed (rc=$VERIFY_RC)" ); aborting"
|
||||
fi
|
||||
if [[ $STRIP_RC -ne 0 ]]; then
|
||||
fail_extract 4 "post-extract symlink check failed (rc=$STRIP_RC); aborting"
|
||||
fi
|
||||
if [[ $VERIFY_RC -ne 0 ]]; then
|
||||
fail_extract 4 "extracted mail tree failed the link/readability check (see above); aborting — the same backup may import with 'Import without email'"
|
||||
fi
|
||||
|
||||
Reference in new issue
Block a user