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

Fix: new certificates not upgraded on existing servers #63

Merged
merged 1 commit into from
Jul 27, 2020
Merged

Fix: new certificates not upgraded on existing servers #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion haproxy/state/from_ha_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,6 @@ func TestFromHA(t *testing.T) {
cfgDir, err := ioutil.TempDir("", fmt.Sprintf("%s_*", t.Name()))
require.NoError(t, err)

state := GetTestHAConfig(cfgDir)
state := GetTestHAConfig(cfgDir, "")
testCfg(t, cfgDir, state)
}
42 changes: 28 additions & 14 deletions haproxy/state/snapshot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func GetTestConsulConfig() consul.Config {
}
}

func GetTestHAConfig(baseCfg string) State {
func GetTestHAConfig(baseCfg string, certVersion string) State {
s := State{
Frontends: []Frontend{

Expand All @@ -59,8 +59,8 @@ func GetTestHAConfig(baseCfg string) State {
Address: "127.0.0.2",
Port: int64p(9999),
Ssl: true,
SslCafile: baseCfg + "/ca",
SslCertificate: baseCfg + "/cert",
SslCafile: baseCfg + "/ca" + certVersion,
SslCertificate: baseCfg + "/cert" + certVersion,
Verify: models.BindVerifyRequired,
},
LogTarget: &models.LogTarget{
Expand Down Expand Up @@ -160,8 +160,8 @@ func GetTestHAConfig(baseCfg string) State {
Port: int64p(8080),
Weight: int64p(5),
Ssl: models.ServerSslEnabled,
SslCafile: baseCfg + "/ca",
SslCertificate: baseCfg + "/cert",
SslCafile: baseCfg + "/ca" + certVersion,
SslCertificate: baseCfg + "/cert" + certVersion,
Verify: models.BindVerifyRequired,
Maintenance: models.ServerMaintenanceDisabled,
},
Expand All @@ -171,8 +171,8 @@ func GetTestHAConfig(baseCfg string) State {
Port: int64p(8081),
Weight: int64p(8),
Ssl: models.ServerSslEnabled,
SslCafile: baseCfg + "/ca",
SslCertificate: baseCfg + "/cert",
SslCafile: baseCfg + "/ca" + certVersion,
SslCertificate: baseCfg + "/cert" + certVersion,
Verify: models.BindVerifyRequired,
Maintenance: models.ServerMaintenanceDisabled,
},
Expand Down Expand Up @@ -227,17 +227,17 @@ func TestSnapshotDownstream(t *testing.T) {
generated, err := Generate(TestOpts, TestCertStore, State{}, GetTestConsulConfig())
require.Nil(t, err)

require.Equal(t, GetTestHAConfig("/"), generated)
require.Equal(t, GetTestHAConfig("/", ""), generated)
}

func TestServerUpdate(t *testing.T) {
consulCfg := GetTestConsulConfig()
consulCfg.Upstreams[0].Nodes = consulCfg.Upstreams[0].Nodes[1:]

oldState := GetTestHAConfig("/")
oldState := GetTestHAConfig("/", "")

// remove first server
expectedNewState := GetTestHAConfig("/")
expectedNewState := GetTestHAConfig("/", "")
expectedNewState.Backends[1].Servers[0].Maintenance = models.ServerMaintenanceEnabled
expectedNewState.Backends[1].Servers[0].Address = "127.0.0.1"
expectedNewState.Backends[1].Servers[0].Port = int64p(1)
Expand All @@ -250,7 +250,7 @@ func TestServerUpdate(t *testing.T) {
// re-add first server
generated, err = Generate(TestOpts, TestCertStore, generated, GetTestConsulConfig())
require.Nil(t, err)
require.Equal(t, GetTestHAConfig("/"), generated)
require.Equal(t, GetTestHAConfig("/", ""), generated)

// add another one
consulCfg = GetTestConsulConfig()
Expand All @@ -260,7 +260,7 @@ func TestServerUpdate(t *testing.T) {
Weight: 10,
})

expectedNewState = GetTestHAConfig("/")
expectedNewState = GetTestHAConfig("/", "")
expectedNewState.Backends[1].Servers = append(expectedNewState.Backends[1].Servers,
models.Server{
Name: "srv_2",
Expand Down Expand Up @@ -291,8 +291,22 @@ func TestServerUpdate(t *testing.T) {
require.Equal(t, expectedNewState, generated)
}

type fakeCertStore struct{}
func TestCertificateUpgrade(t *testing.T) {
generated, err := Generate(TestOpts, fakeCertStore{"1"}, State{}, GetTestConsulConfig())
require.Nil(t, err)

generated, err = Generate(TestOpts, fakeCertStore{"2"}, generated, GetTestConsulConfig())
require.Nil(t, err)

haCfg := GetTestHAConfig("/", "2")

require.Equal(t, haCfg, generated)
}

type fakeCertStore struct {
suffix string
}

func (s fakeCertStore) CertsPath(t consul.TLS) (string, string, error) {
return "//ca", "//cert", nil
return "//ca" + s.suffix, "//cert" + s.suffix, nil
}
7 changes: 5 additions & 2 deletions haproxy/state/upstream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,11 @@ func generateUpstreamServers(opts Options, certStore CertificateStore, cfg consu

// Add new servers
for _, s := range cfg.Nodes {
_, ok := serversIdx[idxConsulNode(s)]
i, ok := serversIdx[idxConsulNode(s)]
if ok {
// if the server exists, just update its certificate in case they changed
servers[i].SslCafile = caPath
servers[i].SslCertificate = crtPath
continue
}

Expand All @@ -149,7 +152,7 @@ func generateUpstreamServers(opts Options, certStore CertificateStore, cfg consu
}
}

i := emptyServerSlots[0]
i = emptyServerSlots[0]
emptyServerSlots = emptyServerSlots[1:]

servers[i].Address = s.Host
Expand Down