Skip to content
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

Feat/gpg agent forwarding #599

Merged
merged 30 commits into from
Oct 27, 2023
Merged

Feat/gpg agent forwarding #599

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
aee1836
chore: migrate ssh server library to loft-sh/ssh
89luca89 Aug 9, 2023
31e3c22
feat: add reverse forwarding of ports
89luca89 Aug 9, 2023
ba2495e
feat: add reverse-forwarding flag to ssh cli
89luca89 Aug 9, 2023
ddcee2e
feat: add gpg-agent-forwarding to up cli
89luca89 Aug 9, 2023
bc8d838
fix: gpg-agent-forwarding should default to false
89luca89 Aug 9, 2023
f847392
fix: add context option for gpg-agent forwarding
89luca89 Aug 10, 2023
5386533
fix: do not return on IDE calls
89luca89 Aug 10, 2023
3b46930
feat: make ssh forwarding/reverse-forwarding non-blocking
89luca89 Aug 10, 2023
d416375
feat: add setup-gpg command to workspace agent, to setup gpg-agent fo…
89luca89 Aug 10, 2023
cdd4046
feat: ssh-server simulate StreamLocalBindUnlink=yes
89luca89 Aug 10, 2023
ab5fcb5
feat: up remove commands and use agent's new setup-gpg command
89luca89 Aug 10, 2023
0736674
fix: remove unreachable code
89luca89 Aug 10, 2023
7bc7f25
fix: move gpg-agent-forwarding from Up to SSH command. Make so that c…
89luca89 Aug 10, 2023
5c82dc6
fix: configure ssh if either CLI flag or context conf
89luca89 Aug 10, 2023
de4038f
chore: better way to detect existing forwardings without using lock f…
89luca89 Aug 11, 2023
9b59735
fix: handle situations where the original socket is not readable by t…
89luca89 Aug 11, 2023
25808e1
docs: update docs for new gpg forwarding feature
89luca89 Aug 11, 2023
10a47a9
fix: force creation of the socket for conseguent runs
89luca89 Sep 21, 2023
e67d5a5
fix: unstuck ssh commands on different systems
89luca89 Sep 21, 2023
1199ad5
docs: fix typo
89luca89 Sep 26, 2023
1d2755f
fix: deduplicate coding between Forward and ReverseForward
89luca89 Sep 26, 2023
d04ef47
fix: remove unused argument from setupGpgAgent
89luca89 Sep 26, 2023
6fdcad3
fix: split remote gpg-agent setup in smaller steps
89luca89 Sep 26, 2023
257782b
fix: compatibility with older go versions
89luca89 Sep 26, 2023
119bdf7
fix: move gpg setup to own package
89luca89 Sep 26, 2023
2cfe47d
fix: double forwarding bug
89luca89 Oct 19, 2023
f93a96d
chore: extract config file path to function
89luca89 Oct 19, 2023
358db46
chore: fix naming, comments, debug leftovers
89luca89 Oct 19, 2023
d32bf62
chore: extract timeout parsing to function
89luca89 Oct 19, 2023
127db61
tests: add e2e test for gpg agent forwarding
89luca89 Oct 25, 2023
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
Prev Previous commit
Next Next commit
fix: remove unused argument from setupGpgAgent 
Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>
  • Loading branch information
@89luca89
89luca89 committed Oct 25, 2023
commit d04ef477450385815020f01950cbe169d2492b3e
3 changes: 1 addition & 2 deletions cmd/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ func (cmd *SSHCmd) startTunnel(ctx context.Context, devPodConfig *config.Config,
if err == nil && len(out.Bytes()) > 1 {
log.Debugf("gpg: exporting already running, skipping")
} else {
err := cmd.setupGPGAgent(ctx, devPodConfig, containerClient, log)
err := cmd.setupGPGAgent(ctx, containerClient, log)
if err != nil {
return err
}
Expand Down Expand Up @@ -434,7 +434,6 @@ func (cmd *SSHCmd) startServices(
// this works by using cmd/agent/workspace/setup_gpg
func (cmd *SSHCmd) setupGPGAgent(
89luca89 marked this conversation as resolved.
Show resolved Hide resolved
ctx context.Context,
devPodConfig *config.Config,
containerClient *ssh.Client,
log log.Logger,
) error {
Expand Down