From 0076386bca8b1e49673f50323cd147ac080cfc2f Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Fri, 25 Oct 2024 15:27:23 +0200 Subject: API + HTTP + Exports: Cleaner TLS1.3 enforcement using a custom DefaultTransport Also fix where TLS 1.3 was not properly enforced for the endpoint cache --- exports/exports_test_wrapper.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'exports') diff --git a/exports/exports_test_wrapper.go b/exports/exports_test_wrapper.go index a52c0fe..a7305dd 100644 --- a/exports/exports_test_wrapper.go +++ b/exports/exports_test_wrapper.go @@ -24,6 +24,8 @@ import ( "github.com/eduvpn/eduvpn-common/internal/test" "github.com/eduvpn/eduvpn-common/types/error" "github.com/eduvpn/eduvpn-common/util" + + httpw "github.com/eduvpn/eduvpn-common/internal/http" ) func getString(in *C.char) string { @@ -264,8 +266,7 @@ func testServerList(t *testing.T) { t.Fatalf("failed to obtain server client: %v", err) } - // TODO: can we do this better - http.DefaultTransport = sclient.Client.Transport + httpw.DefaultTransport = sclient.Client.Transport.(*http.Transport) gerr := getError(t, AddServer(ck, 3, listS, nil)) if gerr != "" { @@ -417,8 +418,7 @@ func testGetConfig(t *testing.T) { t.Fatalf("failed to obtain server client: %v", err) } - // TODO: can we do this better - http.DefaultTransport = sclient.Client.Transport + httpw.DefaultTransport = sclient.Client.Transport.(*http.Transport) _, cfgErr := GetConfig(ck, 3, listS, 0, 0) cfgErrS := getError(t, cfgErr) @@ -501,8 +501,7 @@ func testLetsConnectDiscovery(t *testing.T) { t.Fatalf("failed to obtain server client: %v", err) } - // TODO: can we do this better - http.DefaultTransport = sclient.Client.Transport + httpw.DefaultTransport = sclient.Client.Transport.(*http.Transport) // try to add an institute access server exptErr := fmt.Sprintf("An internal error occurred. The cause of the error is: Adding a non-custom server when the client does not use discovery is not supported, identifier: %s, type: 1.", list) -- cgit v1.2.3