Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 0 additions & 1 deletion auth/cert/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ func LoadCertificate(clientCertPath, clientCertKeyPath string) (certificate tls.
}

func GetTransportWithLoadedCert(certificatesDirPath string, insecureTls bool, transport *http.Transport) (*http.Transport, error) {
// Remove once SystemCertPool supports windows
caCertPool, err := loadSystemRoots()
err = errorutils.CheckError(err)
if err != nil {
Expand Down
34 changes: 34 additions & 0 deletions auth/cert/loader_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package cert

import (
"crypto/tls"
"net/http"
"path/filepath"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestLoadSystemRootsNeverReturnsNilPool(t *testing.T) {
pool, err := loadSystemRoots()
require.NoError(t, err)
assert.NotNil(t, pool)
}

func TestGetTransportWithLoadedCert(t *testing.T) {
transport := &http.Transport{}
result, err := GetTransportWithLoadedCert(filepath.Join(t.TempDir(), "missing-certs"), false, transport)
require.NoError(t, err)
require.NotNil(t, result.TLSClientConfig)
assert.NotNil(t, result.TLSClientConfig.RootCAs)
assert.Equal(t, uint16(tls.VersionTLS12), result.TLSClientConfig.MinVersion)
assert.False(t, result.TLSClientConfig.InsecureSkipVerify)
}

func TestGetTransportWithLoadedCertInsecureTls(t *testing.T) {
transport := &http.Transport{}
result, err := GetTransportWithLoadedCert("", true, transport)
require.NoError(t, err)
assert.True(t, result.TLSClientConfig.InsecureSkipVerify)
}
13 changes: 13 additions & 0 deletions auth/cert/sslutils.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package cert

import (
"crypto/x509"
)

func loadSystemRoots() (*x509.CertPool, error) {
pool, err := x509.SystemCertPool()
if pool == nil {
pool = x509.NewCertPool()
}
return pool, err
}
12 changes: 0 additions & 12 deletions auth/cert/sslutils_default.go

This file was deleted.

45 changes: 0 additions & 45 deletions auth/cert/sslutils_windows.go

This file was deleted.

Loading