Skip to content

vault: default tlsSkipVerify to false #26664

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

vault: default tlsSkipVerify to false #26664

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9b5719
vault: default tlsSkipVerify to false
mismithhisler Aug 29, 2025
837d9c4
refactor setFallback function
mismithhisler Aug 29, 2025
c94865e
adds changelog
mismithhisler Sep 2, 2025
751c2f6
Update .changelog/26664.txt
mismithhisler Sep 4, 2025
6cd9173
remove defaulting TLSSkipVerify in vault config
mismithhisler Sep 4, 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
25 changes: 14 additions & 11 deletions nomad/encrypter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,31 +118,34 @@ func NewEncrypter(srv *Server, keystorePath string) (*Encrypter, error) {
// fields
func fallbackVaultConfig(provider *structs.KEKProviderConfig, vaultcfg *config.VaultConfig) {

setFallback := func(key, fallback, env string) {
setFallback := func(key, cfg, env, fallback string) {
if provider.Config == nil {
provider.Config = map[string]string{}
}
if _, ok := provider.Config[key]; !ok {
if fallback != "" {
provider.Config[key] = fallback
if cfg != "" {
provider.Config[key] = cfg
} else if envVal := os.Getenv(env); envVal != "" {
provider.Config[key] = envVal
} else {
provider.Config[key] = os.Getenv(env)
provider.Config[key] = fallback
}
}
}

setFallback("address", vaultcfg.Addr, "VAULT_ADDR")
setFallback("token", vaultcfg.Token, "VAULT_TOKEN")
setFallback("tls_ca_cert", vaultcfg.TLSCaPath, "VAULT_CACERT")
setFallback("tls_client_cert", vaultcfg.TLSCertFile, "VAULT_CLIENT_CERT")
setFallback("tls_client_key", vaultcfg.TLSKeyFile, "VAULT_CLIENT_KEY")
setFallback("tls_server_name", vaultcfg.TLSServerName, "VAULT_TLS_SERVER_NAME")
setFallback("address", vaultcfg.Addr, "VAULT_ADDR", "")
setFallback("token", vaultcfg.Token, "VAULT_TOKEN", "")
setFallback("tls_ca_cert", vaultcfg.TLSCaPath, "VAULT_CACERT", "")
setFallback("tls_client_cert", vaultcfg.TLSCertFile, "VAULT_CLIENT_CERT", "")
setFallback("tls_client_key", vaultcfg.TLSKeyFile, "VAULT_CLIENT_KEY", "")
setFallback("tls_server_name", vaultcfg.TLSServerName, "VAULT_TLS_SERVER_NAME", "")

// default to false as this will be parsed by the go-kms-wrapping package
skipVerify := ""
if vaultcfg.TLSSkipVerify != nil {
skipVerify = fmt.Sprintf("%v", *vaultcfg.TLSSkipVerify)
}
setFallback("tls_skip_verify", skipVerify, "VAULT_SKIP_VERIFY")
setFallback("tls_skip_verify", skipVerify, "VAULT_SKIP_VERIFY", "false")
}

func (e *Encrypter) loadKeystore() error {
Expand Down
1 change: 1 addition & 0 deletions nomad/structs/config/vault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ func DefaultVaultConfig() *VaultConfig {
Addr: "https://vault.service.consul:8200",
JWTAuthBackendPath: "jwt-nomad",
ConnectionRetryIntv: DefaultVaultConnectRetryIntv,
TLSSkipVerify: pointer.Of(false),
}
}

Expand Down
Loading