Skip to content

Commit

Permalink
fix: createTlsConfig test
Browse files Browse the repository at this point in the history
  • Loading branch information
mxab committed Sep 15, 2023
1 parent 46a5a69 commit da44818
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions nacp.go
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ func buildServer(c *config.Config, appLogger hclog.Logger) (*http.Server, error)
var tlsConfig *tls.Config

if c.Tls != nil && c.Tls.CaFile != "" {
tlsConfig, err = createTlsConfig(c)
tlsConfig, err = createTlsConfig(c.Tls.CaFile, c.Tls.NoClientCert)
if err != nil {
return nil, fmt.Errorf("failed to create tls config: %w", err)

Expand Down Expand Up @@ -505,15 +505,15 @@ func buildConfig(logger hclog.Logger) *config.Config {
return c
}

func createTlsConfig(c *config.Config) (*tls.Config, error) {
caCert, err := os.ReadFile(c.Tls.CaFile)
func createTlsConfig(caFile string, noClientCert bool) (*tls.Config, error) {
caCert, err := os.ReadFile(caFile)
if err != nil {
return nil, err
}
caCertPool := x509.NewCertPool()
caCertPool.AppendCertsFromPEM(caCert)
clientAuth := tls.RequireAndVerifyClientCert
if c.Tls.NoClientCert {
if noClientCert {
clientAuth = tls.NoClientCert
}
tlsConfig := &tls.Config{
Expand Down
2 changes: 1 addition & 1 deletion nacp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ func TestCreateMutatators(t *testing.T) {
func TestCreateTlsConfig(t *testing.T) {
caCertFileName, _, _, _, cleanup := generateTLSData(t)
defer cleanup()
config, err := createTlsConfig(caCertFileName)
config, err := createTlsConfig(caCertFileName, false)
assert.NoError(t, err)
assert.NotNil(t, config)
}
Expand Down

0 comments on commit da44818

Please sign in to comment.