finished

Signed-off-by: gang.liu <[email protected]>

Author: izturn

conv.go

@@ -1,11 +1,14 @@
 package main
 
 import (
+	"bytes"
 	"encoding/json"
 	"encoding/xml"
 	"errors"
+	"io"
 	"log"
 
+	mxj "github.com/clbanning/mxj/v2"
 	typev3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 	ep "github.com/wrossmorrow/envoy-extproc-sdk-go"
 )
@@ -37,14 +40,23 @@ func detectFormat(data []byte) (string, error) {
 		return kJSON, nil
 	}
 
-	var xmlObj any
-	if err := xml.Unmarshal(data, &xmlObj); err == nil {
+	if isValidXML(data) {
 		return kXML, nil
 	}
 
 	return "", errors.New("unknown format")
 }
 
+func isValidXML(input []byte) bool {
+	decoder := xml.NewDecoder(bytes.NewReader(input))
+	for {
+		err := decoder.Decode(new(any))
+		if err != nil {
+			return err == io.EOF
+		}
+	}
+}
+
 func (s *convRequestProcessor) ProcessRequestBody(ctx *ep.RequestContext, body []byte) error {
 	cancel := func(code int32) error {
 		return ctx.CancelRequest(code, map[string]ep.HeaderValue{}, typev3.StatusCode_name[code])
@@ -98,22 +110,34 @@ func (s *convRequestProcessor) Init(opts *ep.ProcessingOptions, nonFlagArgs []st
 
 func (s *convRequestProcessor) Finish() {}
 
+// jsonToXML converts a JSON byte array to XML byte array.
+func jsonToXML(data []byte) ([]byte, error) {
+	mxj.XMLEscapeChars(true)
+	m, err := mxj.NewMapJsonReader(bytes.NewReader(data))
+	if err != nil {
+		return nil, err
+	}
+
+	buf := &bytes.Buffer{}
+	err = m.XmlIndentWriter(buf, "", "\t")
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
 // xmlToJSON converts XML data to JSON.
 func xmlToJSON(data []byte) ([]byte, error) {
-	var m map[string]any
-	err := xml.Unmarshal(data, &m)
+	mxj.XMLEscapeChars(true)
+	m, err := mxj.NewMapXmlReader(bytes.NewReader(data))
 	if err != nil {
 		return nil, err
 	}
-	return json.Marshal(m)
-}
 
-// jsonToXML converts JSON data to XML.
-func jsonToXML(data []byte) ([]byte, error) {
-	var m map[string]any
-	err := json.Unmarshal(data, &m)
+	buf := &bytes.Buffer{}
+	err = m.JsonIndentWriter(buf, "", "\t")
 	if err != nil {
 		return nil, err
 	}
-	return xml.Marshal(m)
+	return buf.Bytes(), nil
 }

deployment.yaml

@@ -19,7 +19,7 @@ spec:
       containers:
         - name: xml-json-conv-demo-container
           image: >-
-            release.daocloud.io/skoala/envoy-extproc-payloadlimit-demo-go@sha256:dcc5ba7aa2790e87b0cd46799363367b54202585794ebfe87248264f111e63d8
+            release.daocloud.io/skoala/envoy-extproc-xml-json-conv-demo-go:v0.0.1
           ports:
             - containerPort: 50051
               protocol: TCP

envoy.yaml

@@ -2,7 +2,7 @@ static_resources:
   listeners:
     - name: listener
       address:
-        socket_address: {address: 0.0.0.0, port_value: 8000}
+        socket_address: {address: 0.0.0.0, port_value: 8080}
       filter_chains:
         - filters:
             - name: envoy.filters.network.http_connection_manager
@@ -68,8 +68,8 @@ static_resources:
                 hostname: upstream
                 address:
                   socket_address:
-                    address: upstream
-                    port_value: 8000
+                    address: 127.0.0.1 # if in a k8s cluster, use the service name
+                    port_value: 5678
   - name: xml-json-conv
     dns_lookup_family: V4_ONLY
     lb_policy: LEAST_REQUEST
@@ -80,7 +80,7 @@ static_resources:
         - endpoint:
             address:
               socket_address:
-                address: xml-json-conv
+                address: 127.0.0.1 # if in a k8s cluster, use the service name
                 port_value: 50051
             hostname: xml-json-conv
     type: LOGICAL_DNS

go.mod

@@ -3,6 +3,7 @@ module github.com/projectsesame/envoy-extproc-xml-json-conv-demo-go
 go 1.21
 
 require (
+	github.com/clbanning/mxj/v2 v2.7.0
 	github.com/envoyproxy/go-control-plane v0.12.0
 	github.com/wrossmorrow/envoy-extproc-sdk-go v0.0.21
 )

go.sum

@@ -1,3 +1,5 @@
+github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME=
+github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
 github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
 github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
 github.com/envoyproxy/go-control-plane v0.12.0 h1:4X+VP1GHd1Mhj6IB5mMeGbLCleqxjletLK6K0rbxyZI=