extract: refuse parser-differential archives; post-extract link check is the authority
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>
This commit is contained in:
1 parent
4788ca4957
commit
52b1e656c3
4 files changed
+221
-76
No files matched your search
+12
-76
@@ -106,72 +106,14 @@ fi
|
||||
# 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"
|
||||
# A Maildir has no legitimate symlinks. scan-symlinks.php only strips
|
||||
# DANGEROUS (absolute system-path) targets, so a relative symlink
|
||||
# (../../../../etc/shadow, ../other-domain/box) would survive into the
|
||||
# extract. Strip EVERY symlink entry under the mail tree. Hard links
|
||||
# are different: Dovecot copies a message between folders as a hard
|
||||
# link (maildir_copy_with_hardlinks, default yes), so a link whose name
|
||||
# AND target are both inside the same account's mail tree is real mail
|
||||
# and is kept. Any hard link crossing the mail-tree boundary (either
|
||||
# direction) or with a ".." in its target is stripped. Read from the
|
||||
# archive's own member list (python tarfile: exact names and types, no
|
||||
# `tar -tv` text parsing); recorded as actions like the DANGEROUS
|
||||
# strips; escaped for tar's glob-style --exclude-from.
|
||||
MAIL_LINKS=$(python3 - "$TARBALL" "$EXCLUDES_FILE" "$ACTIONS_OUT" <<'PY'
|
||||
import json, re, sys, tarfile
|
||||
tar_path, excl_path, actions_path = sys.argv[1], sys.argv[2], sys.argv[3]
|
||||
mail = re.compile(r'^(cpmove-[^/]+)/homedir/mail(/|$)')
|
||||
def norm(n):
|
||||
while n.startswith('./'):
|
||||
n = n[2:]
|
||||
return n.lstrip('/')
|
||||
def mail_owner(n):
|
||||
"""The cpmove-<user> whose mail tree holds n, else None ('..' never counts)."""
|
||||
if '..' in n.split('/'):
|
||||
return None
|
||||
m = mail.match(n)
|
||||
return m.group(1) if m else None
|
||||
# Entries the DANGEROUS pass already strips are not listed twice.
|
||||
try:
|
||||
with open(actions_path) as ah:
|
||||
already = {a.get('path') for a in json.load(ah).get('actions', [])}
|
||||
except Exception:
|
||||
already = set()
|
||||
found = []
|
||||
with tarfile.open(tar_path, 'r|*') as tf:
|
||||
for m in tf:
|
||||
name = norm(m.name)
|
||||
if m.issym() and mail.match(name):
|
||||
found.append((m.name, 'symlink', m.linkname))
|
||||
elif m.islnk():
|
||||
target = norm(m.linkname)
|
||||
in_name, in_target = mail_owner(name), mail_owner(target)
|
||||
crosses = (in_name or mail.match(name)) or (in_target or mail.match(target))
|
||||
if crosses and not (in_name is not None and in_name == in_target):
|
||||
found.append((m.name, 'hardlink', m.linkname))
|
||||
found = [f for f in found if f[0] not in already]
|
||||
with open(excl_path, 'a') as eh:
|
||||
for name, _, _ in found:
|
||||
eh.write(re.sub(r'([*?\[\\])', r'\\\1', name) + '\n')
|
||||
try:
|
||||
with open(actions_path) as ah:
|
||||
doc = json.load(ah)
|
||||
except Exception:
|
||||
doc = {'actions': [], 'count': 0}
|
||||
doc['actions'] += [
|
||||
{'action': 'stripped_mail_link', 'path': name, 'target': target,
|
||||
'reason': f'{kind} inside the mail tree (Maildirs have no legitimate links)'}
|
||||
for name, kind, target in found
|
||||
]
|
||||
doc['count'] = len(doc['actions'])
|
||||
with open(actions_path, 'w') as ah:
|
||||
json.dump(doc, ah, indent=2)
|
||||
for name, kind, target in found:
|
||||
sys.stderr.write(f' STRIP {kind}: {name} -> {target}\n')
|
||||
print(len(found))
|
||||
PY
|
||||
) || { log "mail-tree link scan failed; aborting"; exit 3; }
|
||||
# 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
|
||||
{
|
||||
@@ -211,16 +153,10 @@ tar --no-same-owner --no-same-permissions --no-overwrite-dir \
|
||||
$TAR_FLAGS "$TARBALL"
|
||||
|
||||
if [[ "$IMPORT_INCLUDE_MAIL" == "true" ]]; then
|
||||
# Belt: no symlink may remain under the mail tree (the excludes above
|
||||
# should already guarantee it). Remove and log each one.
|
||||
LEFT=0
|
||||
while IFS= read -r -d '' p; do
|
||||
log " REMOVE symlink left in the mail tree after extract: ${p#"$DEST"/}"
|
||||
rm -f -- "$p"
|
||||
LEFT=$((LEFT + 1))
|
||||
done < <(find "$DEST" -mindepth 3 -maxdepth 3 -path "$DEST/cpmove-*/homedir/mail" -prune \
|
||||
-exec find {} -type l -print0 \;)
|
||||
[[ $LEFT -eq 0 ]] || log "removed $LEFT symlink(s) from the mail tree after extract"
|
||||
# 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)"
|
||||
|
||||
Reference in new issue
Block a user