Skip to content

fix: sudo -n, SSH env passthrough, filepath.Clean for destDir #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bootjp merged 2 commits into from
Mar 20, 2026
Merged

fix: sudo -n, SSH env passthrough, filepath.Clean for destDir #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16b8ad2
Initial plan
Copilot Mar 20, 2026
e0994d5
Address review feedback: sudo -n, env SSH vars, filepath.Clean
Copilot Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ require (
github.com/emirpasic/gods v1.18.1
github.com/getsentry/sentry-go v0.27.0
github.com/hashicorp/go-hclog v1.6.3
github.com/hashicorp/go-msgpack/v2 v2.1.2
github.com/hashicorp/raft v1.7.3
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.23.2
Expand Down Expand Up @@ -66,7 +67,6 @@ require (
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-metrics v0.5.4 // indirect
github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/klauspost/compress v1.18.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions internal/raftstore/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ func prepareMigrationPaths(logsPath, stablePath, destDir string) (string, error)
return "", errors.New("destination dir is required")
}

destDir = filepath.Clean(destDir)

if err := requireExistingFile(logsPath); err != nil {
return "", err
}
Expand Down
61 changes: 35 additions & 26 deletions scripts/rolling-update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,24 +363,25 @@ update_one_node() {
copy_raftadmin_to_remote "$node_id" "$ssh_target"

ssh "${SSH_BASE_OPTS[@]}" "$ssh_target" \
IMAGE="$IMAGE" \
RAFTADMIN_BIN_PATH="$RAFTADMIN_REMOTE_BIN" \
CONTAINER_NAME="$CONTAINER_NAME" \
DATA_DIR="$DATA_DIR" \
SERVER_ENTRYPOINT="$SERVER_ENTRYPOINT" \
RAFT_PORT="$RAFT_PORT" \
REDIS_PORT="$REDIS_PORT" \
DYNAMO_PORT="$DYNAMO_PORT" \
HEALTH_TIMEOUT_SECONDS="$HEALTH_TIMEOUT_SECONDS" \
LEADERSHIP_TRANSFER_TIMEOUT_SECONDS="$LEADERSHIP_TRANSFER_TIMEOUT_SECONDS" \
LEADER_DISCOVERY_TIMEOUT_SECONDS="$LEADER_DISCOVERY_TIMEOUT_SECONDS" \
RAFTADMIN_RPC_TIMEOUT_SECONDS="$RAFTADMIN_RPC_TIMEOUT_SECONDS" \
NODE_ID="$node_id" \
NODE_HOST="$node_host" \
ALL_NODE_IDS_CSV="$all_node_ids_csv" \
ALL_NODE_HOSTS_CSV="$all_node_hosts_csv" \
RAFT_TO_REDIS_MAP="$RAFT_TO_REDIS_MAP" \
'bash -s' <<'REMOTE'
env \
IMAGE="$IMAGE" \
RAFTADMIN_BIN_PATH="$RAFTADMIN_REMOTE_BIN" \
CONTAINER_NAME="$CONTAINER_NAME" \
DATA_DIR="$DATA_DIR" \
SERVER_ENTRYPOINT="$SERVER_ENTRYPOINT" \
RAFT_PORT="$RAFT_PORT" \
REDIS_PORT="$REDIS_PORT" \
DYNAMO_PORT="$DYNAMO_PORT" \
HEALTH_TIMEOUT_SECONDS="$HEALTH_TIMEOUT_SECONDS" \
LEADERSHIP_TRANSFER_TIMEOUT_SECONDS="$LEADERSHIP_TRANSFER_TIMEOUT_SECONDS" \
LEADER_DISCOVERY_TIMEOUT_SECONDS="$LEADER_DISCOVERY_TIMEOUT_SECONDS" \
RAFTADMIN_RPC_TIMEOUT_SECONDS="$RAFTADMIN_RPC_TIMEOUT_SECONDS" \
NODE_ID="$node_id" \
NODE_HOST="$node_host" \
ALL_NODE_IDS_CSV="$all_node_ids_csv" \
ALL_NODE_HOSTS_CSV="$all_node_hosts_csv" \
RAFT_TO_REDIS_MAP="$RAFT_TO_REDIS_MAP" \
bash -s <<'REMOTE'
set -euo pipefail

IFS=, read -r -a ALL_NODE_IDS <<< "$ALL_NODE_IDS_CSV"
Expand Down Expand Up @@ -619,6 +620,13 @@ run_container() {
--raftRedisMap "$RAFT_TO_REDIS_MAP" >/dev/null
}

require_passwordless_sudo() {
if ! sudo -n true 2>/dev/null; then
echo "error: passwordless sudo is required on this host; configure NOPASSWD sudo for the remote user" >&2
exit 1
fi
}

archive_legacy_dir() {
local dir="$1"
local ts backup_dir moved
Expand All @@ -627,10 +635,10 @@ archive_legacy_dir() {
ts="$(date -u +%Y%m%dT%H%M%SZ)"
backup_dir="${dir%/}/legacy-boltdb-${ts}"

sudo mkdir -p "$backup_dir"
sudo -n mkdir -p "$backup_dir"
for name in logs.dat stable.dat; do
if sudo test -e "$dir/$name"; then
sudo mv "$dir/$name" "$backup_dir/$name"
if sudo -n test -e "$dir/$name"; then
sudo -n mv "$dir/$name" "$backup_dir/$name"
moved=1
fi
done
Expand All @@ -640,17 +648,17 @@ archive_legacy_dir() {
return 0
fi

sudo rmdir "$backup_dir" 2>/dev/null || true
sudo -n rmdir "$backup_dir" 2>/dev/null || true
return 1
}

archive_default_legacy_dir() {
local node_data_dir

node_data_dir="${DATA_DIR%/}/${NODE_ID}"
if sudo test -d "$node_data_dir"; then
if sudo -n test -d "$node_data_dir"; then
archive_legacy_dir "$node_data_dir" || true
sudo rm -rf "${node_data_dir}/raft.db.migrating" 2>/dev/null || true
sudo -n rm -rf "${node_data_dir}/raft.db.migrating" 2>/dev/null || true
fi
}

Expand All @@ -662,7 +670,7 @@ archive_legacy_dirs_from_logs() {
while IFS= read -r dir; do
[[ -n "$dir" ]] || continue
archive_legacy_dir "$dir" || true
sudo rm -rf "${dir}/raft.db.migrating" 2>/dev/null || true
sudo -n rm -rf "${dir}/raft.db.migrating" 2>/dev/null || true
found=1
done < <(
printf '%s\n' "$logs" |
Expand All @@ -686,7 +694,8 @@ if [[ "$new_image_id" == "$running_image_id" && "$running_status" == "running" ]
echo "container is running but gRPC is not reachable; recreating"
fi

sudo mkdir -p "$DATA_DIR"
require_passwordless_sudo
sudo -n mkdir -p "$DATA_DIR"
if [[ "$running_status" == "running" ]]; then
ensure_not_leader_before_restart
fi
Expand Down
Loading