fix: start container only after attach in ddev auth ssh, fixes #7664
#7681
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Download the artifacts for this pull request:
See Testing a PR.
|
4 tasks
rfay
force-pushed
the
20251001_stasadev_auth_ssh
branch
from
8ce4184 to
9761d02
Compare
|
Rebased. |
github-actions
bot
added
the
dependencies
stasadev
changed the title
ddev auth ssh, fixes #7664ddev auth ssh, fixes #7664
rfay
reviewed
Oct 2, 2025
cmd/ddev/cmd/auth-ssh.go
Outdated
| config := &dockerContainer.Config{ | ||
| Image: docker.GetSSHAuthImage() + "-built", | ||
| Cmd: dockerStrslice.StrSlice{"bash", "-c", `cp -r /tmp/sshtmp ~/.ssh && chmod -R go-rwx ~/.ssh && cd ~/.ssh && mapfile -t keys < <(grep -l '^-----BEGIN .* PRIVATE KEY-----' *) && ((${#keys[@]})) || { echo "No SSH private keys found" >&2; exit 1; } && for key in "${keys[@]}"; do ssh-add "$key" || exit $?; done`}, | ||
| Cmd: dockerStrslice.StrSlice{"bash", "-c", `cp -r /tmp/sshtmp ~/.ssh && chmod -R go-rwx ~/.ssh && cd ~/.ssh && mapfile -t keys < <(grep -l '^-----BEGIN .* PRIVATE KEY-----' *) && ((${#keys[@]})) || { echo "No SSH private keys found" >&2; exit 1; } && for key in "${keys[@]}"; do printf "\nRunning command: ssh-add %s\n" "$key"; ssh-add "$key" || exit $?; done`}, |
There was a problem hiding this comment.
Most people don't know what ssh-add is or what it means in this context. Maybe simplify to "Adding key %s" ?
There was a problem hiding this comment.
Done.
In addition, I fixed the output for ddev auth ssh -j, it should only produce JSON output.
This comment was marked as outdated.
This comment was marked as outdated.
rfay
approved these changes
Oct 6, 2025
There was a problem hiding this comment.
I retested (without this) and was able to replicate the problem on WSL2.
Then I used this and it worked perfectly:
rfay@ubuntu-len:~/workspace/ddev$ ddev poweroff
The ddev-ssh-agent container has been removed. When you start it again you will have to use 'ddev auth ssh' to provide key authentication again.
rfay@ubuntu-len:~/workspace/ddev$ ddev auth ssh
Network ddev_default created
[+] Pulling 7/7
✔ ddev-ddev-ssh-agent-20250824_akibaat_buildx_arm_builder Pulled 1.9s
✔ d107e437f729 Already exists 0.0s
✔ 19e48215f278 Already exists 0.0s
✔ 44b7382c3380 Already exists 0.0s
✔ 4f4fb700ef54 Already exists 0.0s
✔ df9423e98b41 Already exists 0.0s
✔ e41c6c43a147 Already exists 0.0s
Container ddev-ssh-agent Created
Container ddev-ssh-agent Started
ssh-agent container is running: If you want to add authentication to the ssh-agent container, run 'ddev auth ssh' to enable your keys.
Adding 3 SSH private key(s)...
Adding key id_ed25519
Enter passphrase for id_ed25519:
Identity added: id_ed25519 (andreas@LS-PC-42)
Adding key id_rsa
Enter passphrase for id_rsa:
Identity added: id_rsa (andreas@LS-PC-42)
Adding key id_rsa (new 2022-12-27)
Enter passphrase for id_rsa (new 2022-12-27):
Identity added: id_rsa (new 2022-12-27) (id_rsa (new 2022-12-27))
Successfully added 3 SSH private key(s).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Issue
ddev auth sshhangs on Windows with WSL2 if first key has password #7664How This PR Solves The Issue
ssh-add.ddev/ddev-ssh-agent, because it doesn't show that it pulls it when there are no DDEV images.ddev auth ssh -joutput. (It should always be JSON compatible.)Manual Testing Instructions
Prepare keys:
key1has "key1" passphrasekey2has "key2" passphraseSee new output "Running: ssh-add key1", "Running: ssh-add key2":
ddev auth sshsilently pulled the image (when there was no such image), which was wrong. Now it shows the actual pull:Automated Testing Overview
Release/Deployment Notes