BUG/MEDIUM: hcl: prevent multiple escaping

copier does not do a deep copy properly

Signed-off-by: Zlatko Bratkovic <[email protected]>

Author: oktalz

configuration/file-storage-hcl.go

@@ -16,12 +16,13 @@
 package configuration
 
 import (
+	"bytes"
+	"encoding/gob"
 	"io/ioutil"
 	"strings"
 
 	"github.com/haproxytech/dataplaneapi/log"
 	"github.com/hashicorp/hcl"
-	"github.com/jinzhu/copier"
 	"github.com/rodaine/hclencoder"
 )
 
@@ -63,17 +64,17 @@ func (s *StorageHCL) SaveAs(filename string) error {
 	var err error
 	var hcl []byte
 	var localCopy StorageDataplaneAPIConfiguration
-	err = copier.Copy(&localCopy, &s.cfg)
-	if err != nil {
+
+	var b bytes.Buffer
+	e := gob.NewEncoder(&b)
+	if err := e.Encode(s.cfg); err != nil {
 		return err
 	}
-	// check if we have cluster log targets in config file
-	if s.cfg.Cluster != nil && len(s.cfg.Cluster.ClusterLogTargets) > 0 {
-		// since this can contain " character, escape it
-		for index, value := range localCopy.Cluster.ClusterLogTargets {
-			localCopy.Cluster.ClusterLogTargets[index].LogFormat = strings.Replace(value.LogFormat, `"`, `\"`, -1)
-		}
+	d := gob.NewDecoder(&b)
+	if err := d.Decode(&localCopy); err != nil {
+		return err
 	}
+
 	// check if we have cluster log targets in config file
 	if localCopy.Cluster != nil && len(localCopy.Cluster.ClusterLogTargets) > 0 {
 		// since this can contain " character, escape it
@@ -84,7 +85,6 @@ func (s *StorageHCL) SaveAs(filename string) error {
 	if localCopy.LogTargets != nil && len(*localCopy.LogTargets) > 0 {
 		var logTargets []log.Target
 		for _, value := range *localCopy.LogTargets {
-			value.LogFormat = strings.Replace(value.LogFormat, `"`, `\"`, -1)
 			value.ACLFormat = strings.Replace(value.ACLFormat, `"`, `\"`, -1)
 			logTargets = append(logTargets, value)
 		}
@@ -95,10 +95,6 @@ func (s *StorageHCL) SaveAs(filename string) error {
 			aclF := strings.Replace(*localCopy.Log.ACLFormat, `"`, `\"`, -1)
 			localCopy.Log.ACLFormat = &aclF
 		}
-		if localCopy.Log.LogFormat != nil {
-			logF := strings.Replace(*localCopy.Log.LogFormat, `"`, `\"`, -1)
-			localCopy.Log.LogFormat = &logF
-		}
 	}
 
 	hcl, err = hclencoder.Encode(localCopy)

go.mod

@@ -31,7 +31,6 @@ require (
 	github.com/hashicorp/hcl v1.0.0
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/jinzhu/copier v0.3.4
 	github.com/lestrrat-go/apache-logformat v0.0.0-20210106032603-24d066f940f8
 	github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc // indirect
 	github.com/nathanaelle/syslog5424/v2 v2.0.5

go.sum

@@ -222,8 +222,6 @@ github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uc
 github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jinzhu/copier v0.3.4 h1:mfU6jI9PtCeUjkjQ322dlff9ELjGDu975C2p/nrubVI=
-github.com/jinzhu/copier v0.3.4/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=