feat(kuma-cp): remove value of secret when logging Secret Resources

api/system/v1alpha1/datasource_helpers.go

@@ -0,0 +1,20 @@
+package v1alpha1
+
+import util_proto "github.com/kumahq/kuma/pkg/util/proto"
+
+func (ds *DataSource) MaskInlineDatasource() *DataSource {
+	if ds == nil {
+		return nil
+	}
+	if ds.GetInline().String() != "" {
+		return &DataSource{
+			Type: &DataSource_Inline{Inline: util_proto.Bytes([]byte("***"))},
+		}
+	}
+	if ds.GetInlineString() != "" {
+		return &DataSource{
+			Type: &DataSource_InlineString{InlineString: "***"},
+		}
+	}
+	return nil
+}

api/system/v1alpha1/secret_helper.go

@@ -0,0 +1,5 @@
+package v1alpha1
+
+func (s *Secret) MarshalLog() interface{} {
+	return "***"
+}

go.mod

@@ -31,6 +31,7 @@ require (
 	github.com/kumahq/protoc-gen-kumadoc v0.3.1
 	github.com/lib/pq v1.10.7
 	github.com/miekg/dns v1.1.50
+	github.com/mitchellh/copystructure v1.2.0
 	github.com/natefinch/atomic v1.0.1
 	github.com/onsi/ginkgo/v2 v2.5.1
 	github.com/onsi/gomega v1.24.1
@@ -76,6 +77,7 @@ require (
 	sigs.k8s.io/yaml v1.3.0
 )
 
+
 require (
 	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.12.1 // indirect
@@ -147,7 +149,6 @@ require (
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
-	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect

pkg/core/resources/apis/mesh/external_service_helpers.go

@@ -0,0 +1,46 @@
+package mesh
+
+import (
+	"github.com/mitchellh/copystructure"
+
+	mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1"
+)
+
+func (es *ExternalServiceResource) IsReachableFromZone(zone string) bool {
+	return es.Spec.Tags[mesh_proto.ZoneTag] == "" || es.Spec.Tags[mesh_proto.ZoneTag] == zone
+}
+
+func (esl *ExternalServiceResourceList) MarshalLog() interface{} {
+	maskedList := make([]*ExternalServiceResource, len(esl.Items))
+	for _, es := range esl.Items {
+		maskedList = append(maskedList, es.MarshalLog().(*ExternalServiceResource))
+	}
+	return ExternalServiceResourceList{
+		Items:      maskedList,
+		Pagination: esl.Pagination,
+	}
+}
+
+func (es *ExternalServiceResource) MarshalLog() interface{} {
+	c, err := copystructure.Copy(es)
+	if err != nil {
+		return nil
+	}
+	esCopy := c.(*ExternalServiceResource)
+	spec := esCopy.Spec
+	if spec == nil {
+		return es
+	}
+	net := spec.GetNetworking()
+	if net == nil {
+		return es
+	}
+	tls := net.GetTls()
+	if tls == nil {
+		return es
+	}
+	tls.CaCert = tls.CaCert.MaskInlineDatasource()
+	tls.ClientCert = tls.ClientCert.MaskInlineDatasource()
+	tls.ClientKey = tls.ClientKey.MaskInlineDatasource()
+	return esCopy
+}

pkg/core/resources/apis/mesh/mesh_helpers.go

@@ -7,7 +7,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/mitchellh/copystructure"
+
 	mesh_proto "github.com/kumahq/kuma/api/mesh/v1alpha1"
+	"github.com/kumahq/kuma/pkg/plugins/ca/provided/config"
+	util_proto "github.com/kumahq/kuma/pkg/util/proto"
 )
 
 func (m *MeshResource) HasPrometheusMetricsEnabled() bool {
@@ -135,3 +139,48 @@ func ParseDuration(durationStr string) (time.Duration, error) {
 	}
 	return dur, nil
 }
+
+func (ml *MeshResourceList) MarshalLog() interface{} {
+	maskedList := make([]*MeshResource, len(ml.Items))
+	for _, mesh := range ml.Items {
+		maskedList = append(maskedList, mesh.MarshalLog().(*MeshResource))
+	}
+	return MeshResourceList{
+		Items:      maskedList,
+		Pagination: ml.Pagination,
+	}
+}
+
+func (m *MeshResource) MarshalLog() interface{} {
+	c, err := copystructure.Copy(m)
+	if err != nil {
+		return nil
+	}
+	meshCopy := c.(*MeshResource)
+	spec := meshCopy.Spec
+	if spec == nil {
+		return m
+	}
+	mtls := spec.Mtls
+	if mtls == nil {
+		return m
+	}
+	for _, backend := range mtls.Backends {
+		conf := backend.Conf
+		if conf == nil {
+			continue
+		}
+		cfg := &config.ProvidedCertificateAuthorityConfig{}
+		err := util_proto.ToTyped(conf, cfg)
+		if err != nil {
+			continue
+		}
+		cfg.Key = cfg.Key.MaskInlineDatasource()
+		cfg.Cert = cfg.Cert.MaskInlineDatasource()
+		backend.Conf, err = util_proto.ToStruct(cfg)
+		if err != nil {
+			continue
+		}
+	}
+	return meshCopy
+}

pkg/core/resources/apis/system/secret_resource_helper.go

@@ -0,0 +1,40 @@
+package system
+
+import (
+	"github.com/kumahq/kuma/pkg/core/resources/model"
+)
+
+type secretResource struct {
+	Meta model.ResourceMeta
+	Spec string
+}
+
+func (l *SecretResourceList) MarshalLog() interface{} {
+	list := make([]interface{}, len(l.Items))
+	for _, res := range l.Items {
+		list = append(list, res.MarshalLog())
+	}
+	return list
+}
+
+func (sr *SecretResource) MarshalLog() interface{} {
+	return secretResource{
+		Meta: sr.Meta,
+		Spec: "***",
+	}
+}
+
+func (l *GlobalSecretResourceList) MarshalLog() interface{} {
+	list := make([]interface{}, len(l.Items))
+	for _, res := range l.Items {
+		list = append(list, res.MarshalLog())
+	}
+	return list
+}
+
+func (gs *GlobalSecretResource) MarshalLog() interface{} {
+	return secretResource{
+		Meta: gs.Meta,
+		Spec: "***",
+	}
+}