fix new json/yaml marshalling output for frontend

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

auditor/auditor.report.go

@@ -3,10 +3,14 @@ package auditor
 import (
 	"crypto/sha1" // #nosec G505
 	"encoding/json"
+	"fmt"
 	"regexp"
+	"sort"
+	"strings"
 	"sync"
 	"time"
 
+	"github.com/webdevops/go-common/utils/to"
 	yaml "sigs.k8s.io/yaml"
 
 	"github.com/webdevops/azure-auditor/auditor/types"
@@ -32,12 +36,14 @@ type (
 	}
 
 	AzureAuditorReportLine struct {
-		Resource map[string]interface{} `json:"resource"`
-		RuleID   string                 `json:"rule"`
-		GroupBy  interface{}            `json:"groupBy"`
-		Status   string                 `json:"status"`
-		Count    uint64                 `json:"count"`
+		Resource AzureAuditorReportLineResource `json:"resource"`
+		RuleID   string                         `json:"rule"`
+		GroupBy  interface{}                    `json:"groupBy"`
+		Status   string                         `json:"status"`
+		Count    uint64                         `json:"count"`
 	}
+
+	AzureAuditorReportLineResource map[string]interface{}
 )
 
 func NewAzureAuditorReport() *AzureAuditorReport {
@@ -56,15 +62,13 @@ func (reportLine *AzureAuditorReportLine) Hash() [20]byte {
 func (reportLine *AzureAuditorReportLine) MarshalJSON() ([]byte, error) {
 	data := map[string]interface{}{}
 
-	resourceInfo, _ := yaml.Marshal(reportLine.Resource)
-	data["resource"] = string(resourceInfo)
+	resourceInfo, _ := reportLine.Resource.MarshalJSON()
+	data["resource"] = yamlCleanupRegexp.ReplaceAllString(string(resourceInfo), "$1: $2")
 	data["rule"] = reportLine.RuleID
 	data["status"] = reportLine.Status
 	data["groupBy"] = reportLine.GroupBy
 	data["count"] = reportLine.Count
 
-	data["resource"] = yamlCleanupRegexp.ReplaceAllString(data["resource"].(string), "$1: $2")
-
 	return json.Marshal(data)
 }
 
@@ -82,7 +86,7 @@ func (report *AzureAuditorReport) Add(resource *validator.AzureObject, ruleID st
 	report.Lines = append(
 		report.Lines,
 		&AzureAuditorReportLine{
-			Resource: *resource,
+			Resource: AzureAuditorReportLineResource(*resource),
 			RuleID:   ruleID,
 			Status:   status.String(),
 		},
@@ -97,3 +101,34 @@ func (report *AzureAuditorReport) Add(resource *validator.AzureObject, ruleID st
 		report.Summary.Allow++
 	}
 }
+
+func (resource *AzureAuditorReportLineResource) MarshalJSON() ([]byte, error) {
+	lines := map[string]string{}
+
+	for key, value := range *resource {
+		switch v := value.(type) {
+		case []*string:
+			lines[key] = strings.Join(to.Slice(v), ", ")
+		case []string:
+			lines[key] = strings.Join(v, ", ")
+		case map[string]interface{}:
+			data, _ := yaml.Marshal(v)
+			lines[key] = string(data)
+		default:
+			lines[key] = fmt.Sprintf("%v", v)
+		}
+	}
+
+	keys := make([]string, 0, len(lines))
+	for k := range lines {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	ret := ""
+	for _, key := range keys {
+		ret += fmt.Sprintf("%s: %s\n", key, lines[key])
+	}
+
+	return []byte(ret), nil
+}

auditor/validator/validation.field.go

@@ -21,8 +21,8 @@ type (
 		regexp *regexp.Regexp `json:"-"`
 
 		// STRINGLIST type
-		AllOf *[]string `json:"allOf,omitempty,flow"`
-		AnyOf *[]string `json:"anyOf,omitempty,flow"`
+		AllOf *[]string `json:"allOf,omitempty"`
+		AnyOf *[]string `json:"anyOf,omitempty"`
 
 		// NUMERIC
 		Min *float64 `json:"min,omitempty"`

auditor/validator/validation.rule.go

@@ -29,7 +29,7 @@ type (
 		CustomFunction *string `json:"func,omitempty"`
 		customFunction *otto.Script
 
-		Stats AuditConfigValidationRuleStats `json:"stats,flow"`
+		Stats AuditConfigValidationRuleStats `json:"stats"`
 	}
 
 	AuditConfigValidationRuleStats struct {

templates/report.html

@@ -153,7 +153,7 @@ <h2>{{if $root.RequestReport}}{{ $root.ReportTitle }} report "{{ $root.RequestRe
 
                             <div class="input-group mb-3">
                                 <label class="input-group-text" id="reportFilterResourceLabel">
-                                    <span class="d-inline-block" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-title="Resource filters" data-bs-content="One filter per line, formats:\n\nfilter by content (contains):\n<strong>field: value</strong>\n\nregexp filter:\n<strong>field: /regexp/">
+                                    <span class="d-inline-block" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-title="Resource filters" data-bs-content="One filter per line, formats:\n\nfulltext search (like, contains):\n<strong>search term</strong>\n\nfulltext regexp:\n<strong>/regexp/</strong>\n\nfilter by content (must match):\n<strong>field: search term</strong>\n\nregexp filter:\n<strong>field: /regexp/">
                                         Resource
                                     </span>
                                 </label>