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

Jump to bottom

Support for setting Vault CA from VAULT_CACERT_BYTES env #1782

Merged
merged 3 commits into from
Aug 2, 2023
Merged

Support for setting Vault CA from VAULT_CACERT_BYTES env #1782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f038a50
WIP: Add parsing of VAULT_CACERT_BYTES for custom CA
tomhjp Aug 1, 2023
0ad2ed2
Add tests
tomhjp Aug 2, 2023
e5d6576
Test fixes
tomhjp Aug 2, 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
15 changes: 8 additions & 7 deletions config/consul_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,14 @@ func TestConsulConfig_Finalize(t *testing.T) {
Attempts: Int(DefaultRetryAttempts),
},
SSL: &SSLConfig{
CaCert: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
CaCert: String(""),
CaCertBytes: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
},
Token: String(""),
TokenFile: String(""),
Expand Down
75 changes: 40 additions & 35 deletions config/nomad_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,14 @@ func TestNomadConfig_Finalize(t *testing.T) {
Enabled: Bool(false),
Namespace: String(""),
SSL: &SSLConfig{
CaCert: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
CaCert: String(""),
CaCertBytes: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
},
Token: String(""),
AuthUsername: String(""),
Expand Down Expand Up @@ -266,13 +267,14 @@ func TestNomadConfig_Finalize(t *testing.T) {
Enabled: Bool(true),
Namespace: String(""),
SSL: &SSLConfig{
CaCert: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
CaCert: String(""),
CaCertBytes: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
},
Token: String(""),
AuthUsername: String(""),
Expand Down Expand Up @@ -311,13 +313,14 @@ func TestNomadConfig_Finalize(t *testing.T) {
Enabled: Bool(true),
Namespace: String(""),
SSL: &SSLConfig{
CaCert: String("ca.crt"),
CaPath: String(""),
Cert: String("foo.crt"),
Enabled: Bool(true),
Key: String("foo.key"),
ServerName: String("server.global.nomad"),
Verify: Bool(true),
CaCert: String("ca.crt"),
CaCertBytes: String(""),
CaPath: String(""),
Cert: String("foo.crt"),
Enabled: Bool(true),
Key: String("foo.key"),
ServerName: String("server.global.nomad"),
Verify: Bool(true),
},
Token: String(""),
AuthUsername: String(""),
Expand Down Expand Up @@ -351,13 +354,14 @@ func TestNomadConfig_Finalize(t *testing.T) {
Enabled: Bool(true),
Namespace: String(""),
SSL: &SSLConfig{
CaCert: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
CaCert: String(""),
CaCertBytes: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
},
Token: String(""),
AuthUsername: String(""),
Expand Down Expand Up @@ -395,13 +399,14 @@ func TestNomadConfig_Finalize(t *testing.T) {
Enabled: Bool(false),
Namespace: String(""),
SSL: &SSLConfig{
CaCert: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
CaCert: String(""),
CaCertBytes: String(""),
CaPath: String(""),
Cert: String(""),
Enabled: Bool(false),
Key: String(""),
ServerName: String(""),
Verify: Bool(true),
},
Token: String(""),
AuthUsername: String(""),
Expand Down
27 changes: 20 additions & 7 deletions config/ssl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ const (

// SSLConfig is the configuration for SSL.
type SSLConfig struct {
CaCert *string `mapstructure:"ca_cert"`
CaPath *string `mapstructure:"ca_path"`
Cert *string `mapstructure:"cert"`
Enabled *bool `mapstructure:"enabled"`
Key *string `mapstructure:"key"`
ServerName *string `mapstructure:"server_name"`
Verify *bool `mapstructure:"verify"`
CaCert *string `mapstructure:"ca_cert"`
CaCertBytes *string `mapstructure:"ca_cert_bytes"`
CaPath *string `mapstructure:"ca_path"`
Cert *string `mapstructure:"cert"`
Enabled *bool `mapstructure:"enabled"`
Key *string `mapstructure:"key"`
ServerName *string `mapstructure:"server_name"`
Verify *bool `mapstructure:"verify"`
}

// DefaultSSLConfig returns a configuration that is populated with the
Expand All @@ -35,6 +36,7 @@ func (c *SSLConfig) Copy() *SSLConfig {

var o SSLConfig
o.CaCert = c.CaCert
o.CaCertBytes = c.CaCertBytes
o.CaPath = c.CaPath
o.Cert = c.Cert
o.Enabled = c.Enabled
Expand Down Expand Up @@ -70,6 +72,10 @@ func (c *SSLConfig) Merge(o *SSLConfig) *SSLConfig {
r.CaCert = o.CaCert
}

if o.CaCertBytes != nil {
r.CaCertBytes = o.CaCertBytes
}

if o.CaPath != nil {
r.CaPath = o.CaPath
}
Expand Down Expand Up @@ -99,6 +105,7 @@ func (c *SSLConfig) Finalize() {
c.Enabled = Bool(false ||
StringPresent(c.Cert) ||
StringPresent(c.CaCert) ||
StringPresent(c.CaCertBytes) ||
StringPresent(c.CaPath) ||
StringPresent(c.Key) ||
StringPresent(c.ServerName) ||
Expand All @@ -113,6 +120,10 @@ func (c *SSLConfig) Finalize() {
c.CaCert = String("")
}

if c.CaCertBytes == nil {
c.CaCertBytes = String("")
}

if c.CaPath == nil {
c.CaPath = String("")
}
Expand All @@ -138,6 +149,7 @@ func (c *SSLConfig) GoString() string {

return fmt.Sprintf("&SSLConfig{"+
"CaCert:%s, "+
"CaCertBytes:%s, "+
"CaPath:%s, "+
"Cert:%s, "+
"Enabled:%s, "+
Expand All @@ -146,6 +158,7 @@ func (c *SSLConfig) GoString() string {
"Verify:%s"+
"}",
StringGoString(c.CaCert),
StringGoString(c.CaCertBytes),
StringGoString(c.CaPath),
StringGoString(c.Cert),
BoolGoString(c.Enabled),
Expand Down
Loading
Loading