Skip to content

Commit

Permalink
Use TLSv1.3 as default for Cross Site
Browse files Browse the repository at this point in the history
  • Loading branch information
pruivo authored and ryanemerson committed Dec 12, 2023
1 parent 7c06555 commit 8548d5a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion api/v1/types_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ func (ispn *Infinispan) GetSiteTLSProtocol() string {
if !ispn.IsSiteTLSEnabled() {
return ""
}
return consts.GetWithDefault(string(ispn.Spec.Service.Sites.Local.Encryption.Protocol), string(TLSVersion12))
return consts.GetWithDefault(string(ispn.Spec.Service.Sites.Local.Encryption.Protocol), string(TLSVersion13))
}

// GetSiteTransportSecretName returns the secret name for the transport TLS keystore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The following tables provides fields and descriptions for encrypting cross-site
|Description

|`service.type.sites.local.encryption.protocol`
|Specifies the TLS protocol to use for cross-site connections. The default value is `TLSv1.2` but you can set `TLSv1.3` if required.
|Specifies the TLS protocol to use for cross-site connections. The default value is `TLSv1.3` but you can set `TLSv1.2` if required.

|`service.type.sites.local.encryption.transportKeyStore`
|Configures a keystore secret for relay pods.
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/xsite/xsite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ func TestDefaultTLSInternal(t *testing.T) {
testCrossSiteView(t, false, false, "", ispnv1.CrossSiteExposeTypeClusterIP, 0, 1, DefaultTLS, nil)
}

// TestDefaultTLSInternalVersion3 tests if the TLSv1.3 connection works for internal cross-site communication
func TestDefaultTLSInternalVersion3(t *testing.T) {
protocol := ispnv1.TLSVersion13
// TestDefaultTLSInternalVersion2 tests if the TLSv1.2 connection works for internal cross-site communication
func TestDefaultTLSInternalVersion2(t *testing.T) {
protocol := ispnv1.TLSVersion12
testCrossSiteView(t, false, false, "", ispnv1.CrossSiteExposeTypeClusterIP, 0, 1, DefaultTLS, &protocol)
}

Expand All @@ -204,9 +204,9 @@ func TestSingleTLSInternal(t *testing.T) {
testCrossSiteView(t, false, false, "", ispnv1.CrossSiteExposeTypeClusterIP, 0, 1, SingleKeyStoreTLS, nil)
}

// TestSingleTLSInternalVersion3 tests if the TLSv1.3 connection works for internal cross-site communication and custom keystore and truststore
func TestSingleTLSInternalVersion3(t *testing.T) {
protocol := ispnv1.TLSVersion13
// TestSingleTLSInternalVersion2 tests if the TLSv1.2 connection works for internal cross-site communication and custom keystore and truststore
func TestSingleTLSInternalVersion2(t *testing.T) {
protocol := ispnv1.TLSVersion12
testCrossSiteView(t, false, false, "", ispnv1.CrossSiteExposeTypeClusterIP, 0, 1, SingleKeyStoreTLS, &protocol)
}

Expand Down

0 comments on commit 8548d5a

Please sign in to comment.