Add both uint64 and int64 to tlscommon types unpack methods (#198)

Add both uint64 and int64 to tlscommon types unpack methods

Author: michel-laterman

transport/tlscommon/server_config_test.go

@@ -173,3 +173,80 @@ func Test_ServerConfig_Repack(t *testing.T) {
 		})
 	}
 }
+
+func Test_ServerConfig_RepackJSON(t *testing.T) {
+	tests := []struct {
+		name string
+		json string
+		auth *TLSClientAuth
+	}{{
+		name: "with client auth",
+		json: `{
+    "enabled": true,
+    "verification_mode": "certificate",
+    "supported_protocols": ["TLSv1.1", "TLSv1.2"],
+    "cipher_suites": ["RSA-AES-256-CBC-SHA"],
+    "certificate_authorities": ["/path/to/ca.crt"],
+    "certificate": "/path/to/cert.crt",
+    "key": "/path/to/key.crt",
+    "curve_types": "P-521",
+    "renegotiation": "freely",
+    "ca_sha256": ["example"],
+    "ca_trusted_fingerprint": "fingerprint",
+    "client_authentication": "optional"
+    }`,
+		auth: &optional,
+	}, {
+		name: "nil client auth",
+		json: `{
+    "enabled": true,
+    "verification_mode": "certificate",
+    "supported_protocols": ["TLSv1.1", "TLSv1.2"],
+    "cipher_suites": ["RSA-AES-256-CBC-SHA"],
+    "certificate_authorities": ["/path/to/ca.crt"],
+    "certificate": "/path/to/cert.crt",
+    "key": "/path/to/key.crt",
+    "curve_types": "P-521",
+    "renegotiation": "freely",
+    "ca_sha256": ["example"],
+    "ca_trusted_fingerprint": "fingerprint"
+    }`,
+		auth: &required,
+	}, {
+		name: "nil client auth, no cas",
+		json: `{
+    "enabled": true,
+    "verification_mode": "certificate",
+    "supported_protocols": ["TLSv1.1", "TLSv1.2"],
+    "cipher_suites": ["RSA-AES-256-CBC-SHA"],
+    "certificate": "/path/to/cert.crt",
+    "key": "/path/to/key.crt",
+    "curve_types": "P-521",
+    "renegotiation": "freely",
+    "ca_sha256": ["example"]
+    }`,
+		auth: nil,
+	}}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			cfg := mustLoadServerConfigJSON(t, tc.json)
+			if tc.auth != nil {
+				require.Equal(t, *tc.auth, *cfg.ClientAuth)
+			} else {
+				require.Nil(t, cfg.ClientAuth)
+			}
+
+			tmp, err := ucfg.NewFrom(cfg)
+			require.NoError(t, err)
+
+			err = tmp.Unpack(&cfg)
+			require.NoError(t, err)
+			if tc.auth != nil {
+				require.Equal(t, *tc.auth, *cfg.ClientAuth)
+			} else {
+				require.Nil(t, cfg.ClientAuth)
+			}
+		})
+	}
+}

transport/tlscommon/tls_test.go

@@ -29,6 +29,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/elastic/elastic-agent-libs/config"
+
+	ucfg "github.com/elastic/go-ucfg"
+	"github.com/elastic/go-ucfg/json"
 )
 
 const (
@@ -76,6 +79,50 @@ func mustLoad(t *testing.T, yamlStr string) *Config {
 	return cfg
 }
 
+// copied from config.fromConfig
+func cfgConvert(in *ucfg.Config) *config.C {
+	return (*config.C)(in)
+}
+
+func loadJSON(jsonStr string) (*Config, error) {
+	var cfg Config
+	uc, err := json.NewConfig([]byte(jsonStr), ucfg.PathSep("."), ucfg.VarExp)
+	if err != nil {
+		return nil, err
+	}
+
+	c := cfgConvert(uc)
+
+	if err = c.Unpack(&cfg); err != nil {
+		return nil, err
+	}
+	return &cfg, nil
+}
+
+func loadServerConfigJSON(jsonStr string) (*ServerConfig, error) {
+	var cfg ServerConfig
+	uc, err := json.NewConfig([]byte(jsonStr), ucfg.PathSep("."), ucfg.VarExp)
+	if err != nil {
+		return nil, err
+	}
+
+	c := cfgConvert(uc)
+
+	if err = c.Unpack(&cfg); err != nil {
+		return nil, err
+	}
+	return &cfg, nil
+}
+
+func mustLoadServerConfigJSON(t *testing.T, jsonStr string) *ServerConfig {
+	t.Helper()
+	cfg, err := loadServerConfigJSON(jsonStr)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return cfg
+}
+
 func writeTestFile(t *testing.T, content string) string {
 	t.Helper()
 	f, err := os.CreateTemp(t.TempDir(), "")
@@ -647,6 +694,7 @@ mrPVWmOCMtwHJrO7kF1ENDgHPkhoZFcpFhu3lzOY7mhpW5mPZPVs87ZmI75G7zMV
 AcV8KJqa/7XTTpvIzXePw9FtSSux5SkU6iKAKqwUt82D1E73bbppSg==
 -----END CERTIFICATE-----
 `
+			//nolint:gosec // testing key
 			key := `
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED

transport/tlscommon/types.go

@@ -177,6 +177,8 @@ func (m *TLSVerificationMode) Unpack(in interface{}) error {
 			return fmt.Errorf("unknown verification mode '%v'", o)
 		}
 		*m = mode
+	case int64:
+		*m = TLSVerificationMode(o)
 	case uint64:
 		*m = TLSVerificationMode(o)
 	default:
@@ -244,6 +246,8 @@ func (cs *CipherSuite) Unpack(i interface{}) error {
 		}
 
 		*cs = suite
+	case int64:
+		*cs = CipherSuite(o)
 	case uint64:
 		*cs = CipherSuite(o)
 	default:
@@ -270,6 +274,8 @@ func (ct *tlsCurveType) Unpack(i interface{}) error {
 		}
 
 		*ct = t
+	case int64:
+		*ct = tlsCurveType(o)
 	case uint64:
 		*ct = tlsCurveType(o)
 	default:
@@ -296,6 +302,8 @@ func (r *TLSRenegotiationSupport) Unpack(i interface{}) error {
 		}
 
 		*r = t
+	case int64:
+		*r = TLSRenegotiationSupport(o)
 	case uint64:
 		*r = TLSRenegotiationSupport(o)
 	default: