lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

tokend: make sure Host is set to something sensible

Browse source
This commit is contained in:
Luke Granger-Brown 2023-07-19 16:28:02 +01:00
parent b3e38809c3
commit ca8f808647
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
go/tokend/tokend.go
View file

@ -215,8 +215,19 @@ func attachUserData(ctx context.Context, c net.Conn) context.Context {
func main() { func main() {
flag.Parse() flag.Parse()
d := &net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}
agentPath := strings.TrimPrefix(*agentAddr, "unix://")
agentDialer := func(ctx context.Context, network, addr string) (net.Conn, error) {
// Ignore what they want.
return d.DialContext(ctx, "unix", agentPath)
}
vcfg := vapi.DefaultConfig() vcfg := vapi.DefaultConfig()
vcfg.AgentAddress = *agentAddr vcfg.AgentAddress = "http://vault-agent"
vcfg.HttpClient.Transport.(*http.Transport).DialContext = agentDialer
v, err := vapi.NewClient(vcfg) v, err := vapi.NewClient(vcfg)
if err != nil { if err != nil {
log.Exitf("creating vault client against %v: %v", *agentAddr, err) log.Exitf("creating vault client against %v: %v", *agentAddr, err)
@ -238,17 +249,9 @@ func main() {
} }
} }
}() }()
d := &net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}
agentPath := strings.TrimPrefix(*agentAddr, "unix://")
vp := &vaultProxier{v: v, c: c, hc: &http.Client{ vp := &vaultProxier{v: v, c: c, hc: &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { DialContext: agentDialer,
// Ignore what they want.
return d.DialContext(ctx, "unix", agentPath)
},
ForceAttemptHTTP2: true, ForceAttemptHTTP2: true,
MaxIdleConns: 100, MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second, IdleConnTimeout: 90 * time.Second,