shukivaknin/gniza4linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix shell injection in snapshot, retention, and restore remote_exec calls

Browse Source 
Apply shquote() to all remaining remote_exec paths that interpolate
variables into single-quoted shell strings. Covers list/resolve/clean
snapshots, symlink updates, retention pruning, and restore file listing.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
shuki
2026-03-06 08:17:05 +02:00
parent 63cc7f842e
commit e863d9a478
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/restore.sh
View File

@@ -247,7 +247,8 @@ list_snapshot_contents() {
find "$snap_dir/$ts" -type f 2>/dev/null
else
local snap_dir; snap_dir=$(get_snapshot_dir "$target_name")
remote_exec "find '$snap_dir/$ts' -type f 2>/dev/null" 2>/dev/null
local sq_path; sq_path="$(shquote "$snap_dir/$ts")"
remote_exec "find '${sq_path}' -type f 2>/dev/null" 2>/dev/null
fi
_restore_remote_globals
@@ -281,7 +282,8 @@ get_snapshot_meta() {
cat "$snap_dir/$ts/meta.json" 2>/dev/null
else
local snap_dir; snap_dir=$(get_snapshot_dir "$target_name")
remote_exec "cat '$snap_dir/$ts/meta.json'" 2>/dev/null
local sq_meta; sq_meta="$(shquote "$snap_dir/$ts/meta.json")"
remote_exec "cat '${sq_meta}'" 2>/dev/null
fi
_restore_remote_globals

6
lib/retention.sh
View File

@@ -38,7 +38,8 @@ enforce_retention() {
fi
else
local snap_dir; snap_dir=$(get_snapshot_dir "$target_name")
local meta_content; meta_content=$(remote_exec "cat '$snap_dir/$snap/meta.json' 2>/dev/null" 2>/dev/null) || true
local sq_meta; sq_meta="$(shquote "$snap_dir/$snap/meta.json")"
local meta_content; meta_content=$(remote_exec "cat '${sq_meta}' 2>/dev/null" 2>/dev/null) || true
if [[ -n "$meta_content" ]] && echo "$meta_content" | grep -q '"pinned":\s*true'; then
is_pinned=true
fi
@@ -61,7 +62,8 @@ enforce_retention() {
}
else
local snap_dir; snap_dir=$(get_snapshot_dir "$target_name")
remote_exec "rm -rf '$snap_dir/$snap'" || {
local sq_snap_path; sq_snap_path="$(shquote "$snap_dir/$snap")"
remote_exec "rm -rf '${sq_snap_path}'" || {
log_warn "Failed to prune snapshot: $snap_dir/$snap"
}
fi

18
lib/snapshot.sh
View File

@@ -34,9 +34,10 @@ list_remote_snapshots() {
fi
local snap_dir; snap_dir=$(get_snapshot_dir "$target_name")
local sq_snap; sq_snap="$(shquote "$snap_dir")"
# List completed snapshots (no .partial suffix), sorted newest first
local raw; raw=$(remote_exec "ls -1d '$snap_dir'/[0-9]* 2>/dev/null | grep -v '\\.partial$' | sort -r" 2>/dev/null) || true
local raw; raw=$(remote_exec "ls -1d '${sq_snap}'/[0-9]* 2>/dev/null | grep -v '\\.partial$' | sort -r" 2>/dev/null) || true
if [[ -n "$raw" ]]; then
echo "$raw" | xargs -I{} basename {} | sort -r
fi
@@ -72,7 +73,8 @@ resolve_snapshot_timestamp() {
else
# Verify it exists on SSH remote
local snap_dir; snap_dir=$(get_snapshot_dir "$target_name")
if remote_exec "test -d '$snap_dir/$requested'" 2>/dev/null; then
local sq_path; sq_path="$(shquote "$snap_dir/$requested")"
if remote_exec "test -d '${sq_path}'" 2>/dev/null; then
echo "$requested"
else
log_error "Snapshot not found for $target_name: $requested"
@@ -99,7 +101,9 @@ update_latest_symlink() {
return 1
}
else
remote_exec "ln -sfn '$snap_dir/$timestamp' '$base/latest'" || {
local sq_snap_ts; sq_snap_ts="$(shquote "$snap_dir/$timestamp")"
local sq_latest; sq_latest="$(shquote "$base/latest")"
remote_exec "ln -sfn '${sq_snap_ts}' '${sq_latest}'" || {
log_warn "Failed to update latest symlink for $target_name"
return 1
}
@@ -129,10 +133,11 @@ clean_partial_snapshots() {
return
fi
local partials; partials=$(remote_exec "ls -1d '$snap_dir'/*.partial 2>/dev/null" 2>/dev/null) || true
local sq_snap; sq_snap="$(shquote "$snap_dir")"
local partials; partials=$(remote_exec "ls -1d '${sq_snap}'/*.partial 2>/dev/null" 2>/dev/null) || true
if [[ -n "$partials" ]]; then
log_info "Cleaning partial snapshots for $target_name..."
remote_exec "rm -rf '$snap_dir'/*.partial" || {
remote_exec "rm -rf '${sq_snap}'/*.partial" || {
log_warn "Failed to clean partial snapshots for $target_name"
}
fi
@@ -152,5 +157,6 @@ list_remote_targets() {
return
fi
remote_exec "ls -1 '$targets_dir' 2>/dev/null" 2>/dev/null || true
local sq_targets; sq_targets="$(shquote "$targets_dir")"
remote_exec "ls -1 '${sq_targets}' 2>/dev/null" 2>/dev/null || true
}