Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15483 from jmhbnz/release-3.5-backport

Browse Source 
[3.5] Backport tls 1.3 support
This commit is contained in:
Benjamin Wang
2023-03-16 06:06:45 +08:00
committed by GitHub
parent 3a63da9609 358bcf3fb6
commit 11ca1d356a
10 changed files with 357 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/e2e/etcd_config_test.go
View File

@@ -21,6 +21,7 @@ import (
"strings"
"testing"
"github.com/stretchr/testify/assert"
"go.etcd.io/etcd/pkg/v3/expect"
)
@@ -374,3 +375,32 @@ func TestBootstrapDefragFlag(t *testing.T) {
t.Fatal(err)
}
}
func TestEtcdTLSVersion(t *testing.T) {
skipInShortMode(t)
d := t.TempDir()
proc, err := spawnCmd(
[]string{
binDir + "/etcd",
"--data-dir", d,
"--name", "e1",
"--listen-client-urls", "https://0.0.0.0:0",
"--advertise-client-urls", "https://0.0.0.0:0",
"--listen-peer-urls", fmt.Sprintf("https://127.0.0.1:%d", etcdProcessBasePort),
"--initial-advertise-peer-urls", fmt.Sprintf("https://127.0.0.1:%d", etcdProcessBasePort),
"--initial-cluster", fmt.Sprintf("e1=https://127.0.0.1:%d", etcdProcessBasePort),
"--peer-cert-file", certPath,
"--peer-key-file", privateKeyPath,
"--cert-file", certPath2,
"--key-file", privateKeyPath2,
"--tls-min-version", "TLS1.2",
"--tls-max-version", "TLS1.3",
}, nil,
)
assert.NoError(t, err)
assert.NoError(t, waitReadyExpectProc(proc, etcdServerReadyLines), "did not receive expected output from etcd process")
assert.NoError(t, proc.Stop())
}