Security review of4788ca4(inline python link classifier): 1. Names like cpmove-x/./homedir/mail/..., homedir//mail, homedir/../homedir or /cpmove-x/... were matched differently by the classifier than by tar, so a mail-tree symlink could escape the strip (measured: the dot, dslash and abs fixtures extracted with exit 0 on4788ca4). 2. A newline in a member name split one --exclude-from pattern in two. Moved the policy to scripts/lib/mail-tree-links.py: - scan (pre-extract, an optimisation): REFUSES the archive (exit 3) on any control character in a member name or link target, or any non-canonical member name / hard-link target (absolute, '..', or normpath() differing after one leading './'). Symlink targets are not canonical-checked: ordinary cPanel links (../public_html) are legitimate outside the mail tree, and every symlink inside it is stripped anyway. - verify (post-extract, the authority): lstat-walks each mail tree; exit 4 on any symlink, or any regular file whose st_nlink exceeds its names inside that same mail tree (a link leaving it). In-tree Dovecot hard-link copies (maildir_copy_with_hardlinks) are kept; a blanket nlink>1 refusal would drop real mail. - Fixtures: cpmove-bad-{dot,dslash,dotdot,abs,newline}; verify tests for symlinks and hard links into/out of/between mail trees surviving the pre-filter. 14 of the new checks fail on4788ca4. Only in IMPORT_INCLUDE_MAIL=true mode; the default path is unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
164 lines
7.0 KiB
Bash
Executable File
164 lines
7.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
#
|
|
# extract.sh — symlink scan + sanitized cpmove untar.
|
|
#
|
|
# Usage: extract.sh <tarball> <dest> <username> [<actions_out>]
|
|
#
|
|
# Env: IMPORT_INCLUDE_MAIL "true" = extract cpmove-*/homedir/mail too
|
|
# (WHP's mailbox import needs the Maildirs).
|
|
# Anything else (default) = skip the mail tree.
|
|
#
|
|
# Calls scripts/lib/scan-symlinks.php first, then untars the cpmove with
|
|
# every DANGEROUS-classified symlink entry stripped via tar --exclude.
|
|
# The stripped-symlinks list is written as JSON to <actions_out> (default
|
|
# $DEST/.cpanel-importer-stripped-symlinks.json) so the merge step in
|
|
# entrypoint.sh can fold the stripped entries into report.json's actions[].
|
|
#
|
|
# Sandbox-mode posture: never refuse. ALFA-class root symlinks and other
|
|
# DANGEROUS entries are silently excluded from extraction; the panel sees
|
|
# them as quarantine actions on the results page instead of an import abort.
|
|
|
|
set -euo pipefail
|
|
|
|
TARBALL="${1:?usage: extract.sh <tarball> <dest> <username> [<actions_out>]}"
|
|
DEST="${2:?usage: extract.sh <tarball> <dest> <username> [<actions_out>]}"
|
|
USERNAME="${3:?usage: extract.sh <tarball> <dest> <username> [<actions_out>]}"
|
|
ACTIONS_OUT="${4:-${DEST}/.cpanel-importer-stripped-symlinks.json}"
|
|
|
|
IMPORT_INCLUDE_MAIL="${IMPORT_INCLUDE_MAIL:-false}"
|
|
# Resolve sibling scripts relative to this file (/scripts in the image) so
|
|
# tests/run-tests.sh can run the same script from a checkout.
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
|
|
ts() { date -u +'%Y-%m-%dT%H:%M:%SZ'; }
|
|
log() { printf '[%s] extract: %s\n' "$(ts)" "$*"; }
|
|
|
|
[[ -f "$TARBALL" ]] || { log "tarball not found: $TARBALL"; exit 2; }
|
|
mkdir -p "$DEST"
|
|
|
|
# --- pre-extract symlink scan ---------------------------------------------
|
|
|
|
log "scanning tarball for dangerous symlinks (cpmove vector check)"
|
|
SYMLINK_REPORT=$(mktemp -p /tmp scan-symlinks.XXXXXX.json)
|
|
if ! php "$SCRIPT_DIR/lib/scan-symlinks.php" \
|
|
--tarball "$TARBALL" \
|
|
--username "$USERNAME" \
|
|
--report "$SYMLINK_REPORT"; then
|
|
log "scan-symlinks.php exited with usage/IO error; aborting (this is not a sanitize-able state)"
|
|
cat "$SYMLINK_REPORT" >&2 || true
|
|
exit 3
|
|
fi
|
|
|
|
# --- compute exclude list from dangerous findings -------------------------
|
|
|
|
# Build a newline-delimited list of archive_path strings for tar --exclude-
|
|
# from. Also build a JSON actions[] array so entrypoint.sh's merge step can
|
|
# fold the strip-actions into report.json without re-parsing scan-symlinks.
|
|
EXCLUDES_FILE=$(mktemp -p /tmp tar-excludes.XXXXXX)
|
|
DANGEROUS_COUNT=$(python3 - "$SYMLINK_REPORT" "$EXCLUDES_FILE" "$ACTIONS_OUT" <<'PY'
|
|
import json, sys
|
|
src, excl_path, actions_path = sys.argv[1], sys.argv[2], sys.argv[3]
|
|
try:
|
|
with open(src) as fh:
|
|
r = json.load(fh)
|
|
except Exception as e:
|
|
sys.stderr.write(f"failed to parse scan-symlinks report: {e}\n")
|
|
print(0)
|
|
sys.exit(0)
|
|
|
|
dangerous = [f for f in r.get('findings', []) if f.get('type') == 'DANGEROUS']
|
|
with open(excl_path, 'w') as eh:
|
|
for f in dangerous:
|
|
p = f.get('archive_path', '')
|
|
if p:
|
|
eh.write(p + '\n')
|
|
|
|
actions = [
|
|
{
|
|
'action': 'stripped_dangerous_symlink',
|
|
'path': f.get('archive_path', ''),
|
|
'target': f.get('target', ''),
|
|
'reason': f.get('reason', ''),
|
|
}
|
|
for f in dangerous
|
|
]
|
|
with open(actions_path, 'w') as ah:
|
|
json.dump({'actions': actions, 'count': len(actions)}, ah, indent=2)
|
|
print(len(dangerous))
|
|
PY
|
|
)
|
|
|
|
if [[ "$DANGEROUS_COUNT" -gt 0 ]]; then
|
|
log "stripping $DANGEROUS_COUNT dangerous symlink(s) via tar --exclude-from"
|
|
while IFS= read -r path; do
|
|
log " STRIP: $path"
|
|
done < "$EXCLUDES_FILE"
|
|
fi
|
|
|
|
# Mail tree (cpmove-*/homedir/mail). Skipped by default: a plain site
|
|
# import doesn't need it, and on real customer accounts the mail dir often
|
|
# dwarfs everything else (10+ GB of historical maildir). The exclude
|
|
# pattern uses tar's fnmatch globs and covers the whole tree at any depth.
|
|
#
|
|
# IMPORT_INCLUDE_MAIL=true (WHP passes it only when the import copies
|
|
# mailboxes) extracts it. The DANGEROUS-symlink strips computed above apply
|
|
# to the mail tree exactly as to the rest of the archive: scan-symlinks.php
|
|
# lists every entry in the tarball, mail included.
|
|
if [[ "$IMPORT_INCLUDE_MAIL" == "true" ]]; then
|
|
log "including mail tree (cpmove-*/homedir/mail) — IMPORT_INCLUDE_MAIL=true"
|
|
# Link policy for the mail tree (scripts/lib/mail-tree-links.py): every
|
|
# symlink in it, and every hard link crossing its boundary, is excluded
|
|
# here; Dovecot's in-tree hard-link copies are kept. The archive is
|
|
# refused outright if any member name could be read differently by the
|
|
# classifier and by tar (control characters, non-canonical paths).
|
|
# scan-symlinks.php alone only strips DANGEROUS absolute targets.
|
|
MAIL_LINKS=$(python3 -I "$SCRIPT_DIR/lib/mail-tree-links.py" scan "$TARBALL" "$EXCLUDES_FILE" "$ACTIONS_OUT") \
|
|
|| { log "mail-tree link scan refused the archive (see above); aborting"; exit 3; }
|
|
log "stripped $MAIL_LINKS symlink / boundary-crossing hard-link entr(y/ies) in the mail tree"
|
|
else
|
|
{
|
|
echo "cpmove-*/homedir/mail"
|
|
echo "cpmove-*/homedir/mail/*"
|
|
} >> "$EXCLUDES_FILE"
|
|
log "skipping mail tree (cpmove-*/homedir/mail) — IMPORT_INCLUDE_MAIL not set"
|
|
fi
|
|
|
|
# --- extract --------------------------------------------------------------
|
|
|
|
# Detect compression. cpmove can be .tar.gz / .tar.bz2 / .tar.
|
|
TAR_FLAGS="-xf"
|
|
case "$TARBALL" in
|
|
*.tar.gz|*.tgz) TAR_FLAGS="-xzf" ;;
|
|
*.tar.bz2|*.tbz2) TAR_FLAGS="-xjf" ;;
|
|
*.tar.xz|*.txz) TAR_FLAGS="-xJf" ;;
|
|
*.tar) TAR_FLAGS="-xf" ;;
|
|
esac
|
|
|
|
log "extracting with hardened tar flags into $DEST"
|
|
# Hardening flags (mirrored from CpanelBackupImporter::extractBackup):
|
|
# --no-same-owner / --no-same-permissions: drop archive-recorded
|
|
# uid/perm bits so the cpmove can't drop setuid binaries at us.
|
|
# --no-overwrite-dir: refuse to clobber existing directory metadata,
|
|
# closing one historical tar-symlink-escape vector.
|
|
# --exclude-from=$EXCLUDES_FILE: strip every DANGEROUS-classified
|
|
# symlink (target = /, /etc, /root, /boot, /proc, /sys, /dev).
|
|
# Empty file = no-op exclude. tar's --exclude pattern matching
|
|
# uses fnmatch but our archive_path entries don't contain glob
|
|
# metacharacters (they came verbatim from `tar -tvf`), so the
|
|
# match is effectively a literal-path skip.
|
|
# --absolute-names is NOT used — leading / in a member name is stripped.
|
|
cd "$DEST"
|
|
tar --no-same-owner --no-same-permissions --no-overwrite-dir \
|
|
--exclude-from="$EXCLUDES_FILE" \
|
|
$TAR_FLAGS "$TARBALL"
|
|
|
|
if [[ "$IMPORT_INCLUDE_MAIL" == "true" ]]; then
|
|
# The authority: whatever the classifier above decided, no symlink and
|
|
# no hard link leaving the mail tree may exist in the extract.
|
|
python3 -I "$SCRIPT_DIR/lib/mail-tree-links.py" verify "$DEST" \
|
|
|| { log "extracted mail tree contains links (see above); aborting"; exit 4; }
|
|
fi
|
|
|
|
log "extracted OK ($(find "$DEST" -type f | wc -l) files; $DANGEROUS_COUNT symlinks stripped)"
|
|
exit 0
|