Skip to content

Replace hardcoded SSH options with environment variable for secure and flexible rsync configuration #3

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
thorwhalen merged 4 commits into from
Aug 20, 2025
Merged

Replace hardcoded SSH options with environment variable for secure and flexible rsync configuration #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eab6936
Initial plan
Copilot Aug 20, 2025
b5e032a
Fix CI host key verification issue in sync_to method
Copilot Aug 20, 2025
b81c7e8
Replace hardcoded SSH options with environment variable for better se…
Copilot Aug 20, 2025
c19d066
Add SSHDOL_SYNC_TO_EXTRA_SSH_OPTIONS environment variable to CI valid…
Copilot Aug 20, 2025
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: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ jobs:
name: Validation
if: "!contains(github.event.head_commit.message, '[skip ci]')"
runs-on: ubuntu-latest
env:
SSHDOL_SYNC_TO_EXTRA_SSH_OPTIONS: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
strategy:
matrix:
python-version: ["3.10"]
Expand Down
7 changes: 7 additions & 0 deletions sshdol/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,13 @@ def sync_to(
ssh_parts = ["ssh", "-p", str(self._conn_port)]
if self._conn_key_filename:
ssh_parts += ["-i", self._conn_key_filename]

# Add extra SSH options from environment variable if set
# This allows CI environments or users to specify additional SSH options
extra_ssh_options = os.environ.get('SSHDOL_SYNC_TO_EXTRA_SSH_OPTIONS')
if extra_ssh_options:
# Split the string into individual options, handling quoted arguments properly
ssh_parts += shlex.split(extra_ssh_options)
ssh_cmd_str = " ".join(shlex.quote(p) for p in ssh_parts)

# Build rsync args
Expand Down
Loading