Merge pull request #334 from jmpsec/encoding-error-bytea

Fix for encoding error enrolling new nodes
jmpsec · Jan 11, 2023 · b929e82 · b929e82
2 parents bcdd750 + b6e9b84
commit b929e82
Show file tree

Hide file tree

Showing 6 changed files with 507 additions and 11 deletions.
diff --git a/admin/handlers/utils.go b/admin/handlers/utils.go
@@ -143,10 +143,10 @@ func removeBackslash(rawString string) string {
 	return strings.ReplaceAll(rawString, "\\", " ")
 }
 
-// Helper to convert json.RawMessage into indented string
-func jsonRawIndent(raw json.RawMessage) string {
+// Helper to convert string into indented string
+func jsonRawIndent(raw string) string {
 	var out bytes.Buffer
-	if err := json.Indent(&out, raw, "", "    "); err != nil {
+	if err := json.Indent(&out, []byte(raw), "", "    "); err != nil {
 		return string(raw)
 	}
 	return string(out.Bytes())

diff --git a/admin/utils.go b/admin/utils.go
@@ -71,10 +71,10 @@ func incMetric(name string) {
 	}
 }
 
-// Helper to convert json.RawMessage into indented string
-func jsonRawIndent(raw json.RawMessage) string {
+// Helper to convert string into indented string
+func jsonRawIndent(raw string) string {
 	var out bytes.Buffer
-	if err := json.Indent(&out, raw, "", "    "); err != nil {
+	if err := json.Indent(&out, []byte(raw), "", "    "); err != nil {
 		return string(raw)
 	}
 	return string(out.Bytes())