Skip to content

Fix keyservice client for unix domain sockets #1910

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
felixfontein merged 2 commits into from
Sep 9, 2025
Merged

Fix keyservice client for unix domain sockets #1910

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bab8e61
Fix keyservice client for unix domain sockets
matheuscscp Aug 10, 2025
827a02a
Merge branch 'main' into fix-1846
felixfontein Sep 9, 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
22 changes: 13 additions & 9 deletions cmd/sops/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2221,22 +2221,26 @@ func keyservices(c *cli.Context) (svcs []keyservice.KeyServiceClient) {
continue
}
addr := url.Host
if url.Scheme == "unix" {
addr = url.Path
}
addrToUse := addr
opts := []grpc.DialOption{
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithContextDialer(
func(ctx context.Context, addr string) (net.Conn, error) {
return (&net.Dialer{}).DialContext(ctx, url.Scheme, addr)
},
),
}
if url.Scheme == "unix" {
addr = url.Path
addrToUse = uri
} else {
opts = append(opts,
grpc.WithContextDialer(
func(ctx context.Context, addr string) (net.Conn, error) {
return (&net.Dialer{}).DialContext(ctx, url.Scheme, addr)
},
))
}
log.WithField(
"address",
fmt.Sprintf("%s://%s", url.Scheme, addr),
).Infof("Connecting to key service")
conn, err := grpc.NewClient(addr, opts...)
conn, err := grpc.NewClient(addrToUse, opts...)
if err != nil {
log.Fatalf("failed to listen: %v", err)
}
Expand Down
Loading