TASK: Beautify XML protocol CLI output

Author: dfeyer

logger/logger.go

@@ -5,19 +5,34 @@
 package logger
 
 import (
+	"encoding/xml"
+	"os"
+	"regexp"
+	"strings"
+
+	"github.com/clbanning/mxj"
 	"github.com/dfeyer/flow-debugproxy/config"
 
 	"bytes"
 	"fmt"
+
 	"github.com/mgutz/ansi"
 )
 
 var (
-	debugize = ansi.ColorFunc("green+h:black")
-	greenize = ansi.ColorFunc("green")
-	redize   = ansi.ColorFunc("red")
+	debugize          = ansi.ColorFunc("green+h:black")
+	greenize          = ansi.ColorFunc("green")
+	redize            = ansi.ColorFunc("red")
+	regexpFirstNumber = regexp.MustCompile(`^[0-9]*`)
 )
 
+type node struct {
+	Attr     []xml.Attr
+	XMLName  xml.Name
+	Children []node `xml:",any"`
+	Text     string `xml:",chardata"`
+}
+
 // Logger handle log message
 type Logger struct {
 	Config *config.Config
@@ -45,6 +60,30 @@ func (l *Logger) Colorize(str, style string) string {
 	return ansi.Color(str, style)
 }
 
+func normalizeXMLProtocol(buffer []byte) string {
+	b := bytes.Replace(buffer, []byte("\x00"), []byte("\n"), -1)
+	buf := make([]rune, len(b))
+	for i, b := range b {
+		buf[i] = rune(b)
+	}
+	s := strings.Replace(string(buf), "iso-8859-1", "utf-8", 1)
+	s = regexpFirstNumber.ReplaceAllString(s, "")
+	s = strings.Replace(s, "<?xml version=\"1.0\" encoding=\"utf-8\"?>", "", 1)
+	s = strings.Trim(s, "\n")
+	return s
+}
+
+//FormatXMLProtocol beautify XML output
+func (l *Logger) FormatXMLProtocol(protocol []byte) []byte {
+	p := normalizeXMLProtocol(protocol)
+	output, err := mxj.BeautifyXml([]byte(p), "", "  ")
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	return output
+}
+
 //FormatTextProtocol replace NULL by a line break for output formatting
 func (l *Logger) FormatTextProtocol(protocol []byte) []byte {
 	return bytes.Trim(bytes.Replace(protocol, []byte("\x00"), []byte("\n"), -1), "\n")

xdebugproxy/xdebugproxy.go

@@ -107,7 +107,7 @@ func (p *Proxy) pipe(src, dst *net.TCPConn) {
 		p.log(h, f)
 		if p.Config.VeryVerbose {
 			if isFromDebugger {
-				p.log("Raw protocol:\n%s\n", p.Logger.Colorize(fmt.Sprintf(h, b), "blue"))
+				p.log("Raw protocol:\n%s\n", p.Logger.Colorize(fmt.Sprintf(h, p.Logger.FormatXMLProtocol(b)), "blue"))
 			} else {
 				p.log("Raw protocol:\n%s\n", p.Logger.Colorize(fmt.Sprintf(h, p.Logger.FormatTextProtocol(b)), "blue"))
 			}
@@ -132,7 +132,7 @@ func (p *Proxy) pipe(src, dst *net.TCPConn) {
 		// show output
 		if p.Config.VeryVerbose {
 			if isFromDebugger {
-				p.log("Processed protocol:\n%s\n", p.Logger.Colorize(fmt.Sprintf(h, b), "blue"))
+				p.log("Processed protocol:\n%s\n", p.Logger.Colorize(fmt.Sprintf(h, p.Logger.FormatXMLProtocol(b)), "blue"))
 			} else {
 				p.log("Processed protocol:\n%s\n", p.Logger.Colorize(fmt.Sprintf(h, p.Logger.FormatTextProtocol(b)), "blue"))
 			}