From 735b9c2f31dc571675f9feaf277e20b27431deaa Mon Sep 17 00:00:00 2001
From: Arjan H <github@hakwerk.com>
Date: Fri, 13 Dec 2024 20:09:14 +0100
Subject: [PATCH] Dashboard: improve message parsing of JSON audit lines

---
 gui/dashboard.go | 44 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/gui/dashboard.go b/gui/dashboard.go
index 4e55af0..587ca00 100644
--- a/gui/dashboard.go
+++ b/gui/dashboard.go
@@ -45,6 +45,21 @@ func _removeAnsiColors(line string) string {
 	return line
 }
 
+func toJson(line string) (map[string]interface{}, int) {
+	var obj map[string]interface{}
+
+	idx := strings.Index(line, "JSON={")
+	if idx > -1 {
+		jsonStr := line[idx+5:]
+		err := json.Unmarshal([]byte(jsonStr), &obj)
+		if err != nil {
+			fmt.Println(err)
+		}
+	}
+
+	return obj, idx
+}
+
 func _parseLine(line string, loc *time.Location) Activity {
 	var activity Activity
 
@@ -107,15 +122,34 @@ func _parseLine(line string, loc *time.Location) Activity {
 	}
 
 	message := result[6]
-	idx := strings.Index(message, ".well-known/acme-challenge")
-	if idx > -1 {
-		message = message[0:idx]
-	}
+	var idx int
+	//idx := strings.Index(message, ".well-known/acme-challenge")
+	//if idx > -1 {
+	//	message = message[0:idx]
+	//}
 	if strings.Contains(message, "Checked CAA records for") {
 		message = message[0:strings.Index(message, ",")]
 	}
+
+	msgJson, jsonIdx := toJson(message)
+
 	if strings.Contains(message, "Validation result") {
-		message = message[0:30]
+		var ctyp string
+		var cstat string
+		if chall, ok := msgJson["Challenge"].(map[string]interface{}); ok {
+			ctyp = fmt.Sprintf(" Type=%s", chall["type"])
+			cstat = fmt.Sprintf(" Status=%s", chall["status"])
+		}
+		message = message[0:jsonIdx-1] + ":" + fmt.Sprintf(" Identifier=%s", msgJson["Identifier"]) + ctyp + cstat
+	}
+	if strings.Contains(message, "Signing precert") || strings.Contains(message, "Signing cert") {
+		var comnm string
+		var dnsnms string
+		if issreq, ok := msgJson["IssuanceRequest"].(map[string]interface{}); ok {
+			comnm = fmt.Sprintf(" CommonName=%s", issreq["CommonName"])
+			dnsnms = fmt.Sprintf(" DNSNames=%s", issreq["DNSNames"])
+		}
+		message = message[0:jsonIdx-1] + ":" + comnm + dnsnms + fmt.Sprintf(" Issuer=%s", msgJson["Issuer"])
 	}
 	idx = strings.Index(message, " csr=[")
 	if idx > -1 {