diff --git a/.github/scripts/report/e2e-report b/.github/scripts/report/e2e-report
deleted file mode 100644
index 4616b566283..00000000000
Binary files a/.github/scripts/report/e2e-report and /dev/null differ
diff --git a/.github/scripts/report/go.sum b/.github/scripts/report/go.sum
index e83fb29040d..d9206ca3ae6 100644
--- a/.github/scripts/report/go.sum
+++ b/.github/scripts/report/go.sum
@@ -1,28 +1,28 @@
-github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
-github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/tdewolff/minify/v2 v2.9.21 h1:nO4s1PEMy7aRjlIlbr3Jgr+bJby8QYuifa2Vs2f9lh4=
-github.com/tdewolff/minify/v2 v2.9.21/go.mod h1:PoDBts2L7sCwUT28vTAlozGeD6qxjrrihtin4bR/RMM=
-github.com/tdewolff/parse/v2 v2.5.19 h1:Kjaj3KQOx/4elIxlBSglus4E2oMfdROphvbq2b+OBZ0=
-github.com/tdewolff/parse/v2 v2.5.19/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
-github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4=
-github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
+github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/tdewolff/minify/v2 v2.9.21 h1:nO4s1PEMy7aRjlIlbr3Jgr+bJby8QYuifa2Vs2f9lh4=
+github.com/tdewolff/minify/v2 v2.9.21/go.mod h1:PoDBts2L7sCwUT28vTAlozGeD6qxjrrihtin4bR/RMM=
+github.com/tdewolff/parse/v2 v2.5.19 h1:Kjaj3KQOx/4elIxlBSglus4E2oMfdROphvbq2b+OBZ0=
+github.com/tdewolff/parse/v2 v2.5.19/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
+github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4=
+github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/.github/scripts/report/main.go b/.github/scripts/report/main.go
index 3d0983453b9..e120914e4d7 100644
--- a/.github/scripts/report/main.go
+++ b/.github/scripts/report/main.go
@@ -7,6 +7,7 @@ import (
"math"
"os"
"path/filepath"
+ "regexp"
"sort"
"strings"
)
@@ -23,8 +24,26 @@ type Counters struct {
CountTotal int
}
+type ExpectedActual struct {
+ ExtraElements ActualExpectedWithStatus // list of extra elements
+ TestInfo []string
+ Messages ActualExpectedWithStatus
+ FailOutput []string
+}
+
+type ActualExpectedWithStatus struct {
+ ExpectedContent []CodeLineStatus
+ ActualContent []CodeLineStatus
+}
+
+type CodeLineStatus struct {
+ Line string
+ Status bool // differed or not
+}
+
type TestsData struct {
TestLog TestLog
+ ExpectedActual ExpectedActual
FailLog []string
}
@@ -42,6 +61,22 @@ type TestFail struct {
Output string `json:"Output"`
}
+const (
+ prefixActualPayload = "actualPayload"
+ prefixExpectedPayload = "expectedPayload"
+ prefixFail = "--- FAIL:"
+ prefixQueries = `"queries": [`
+ extraElementsListA = "extra elements in list A:"
+ extraElementsListB = "extra elements in list B:"
+ prefixTest = "Test:"
+ suffixExpectedQueries = "Expected Queries content: 'fixtures/{"
+ suffixActualQueries = "doesn't match the Actual Queries content: 'output/{"
+ prefixTypeInterface = "([]interface {})"
+ prefixTypeVulnerableFile = "(model.VulnerableFile) {"
+ expectedNumberOflines = "Expected file number of lines:"
+ actualNumberOfLines = "Actual file number of lines:"
+)
+
func FindTest(tests []TestsData, testName string) (*TestsData, bool) {
for i := range tests {
if tests[i].TestLog.Test == testName {
@@ -51,6 +86,256 @@ func FindTest(tests []TestsData, testName string) (*TestsData, bool) {
return nil, false
}
+func cleanOutput(s string) string {
+ // remove (len=N)
+ lenPattern := regexp.MustCompile(`\(len=\d+\)\s*`)
+ s = lenPattern.ReplaceAllString(s, "")
+ // Remove type annotations like (string), (int), (*string), (model.IssueType)...
+ typePattern := regexp.MustCompile(`\([a-zA-Z*\[][^)]*\)\s*`)
+ s = typePattern.ReplaceAllString(s, "")
+ return s
+}
+
+func extractPayloadDiffLines(failLog []string) ExpectedActual {
+ var testInfo []string
+ var messages ActualExpectedWithStatus
+ var failOutput []string
+
+ const (
+ stateNone = iota
+ stateMessagesExpected
+ stateMessagesActual
+ stateTestInfo
+ stateFailLog
+ )
+ state := stateTestInfo
+
+ for _, line := range failLog {
+ trimmed := strings.TrimSpace(line)
+ if strings.HasPrefix(trimmed, prefixActualPayload) {
+ state = stateMessagesActual
+ } else if strings.HasPrefix(trimmed, prefixExpectedPayload) {
+ state = stateMessagesExpected
+ } else if strings.HasPrefix(trimmed, prefixFail) {
+ state = stateFailLog
+ } else if strings.HasPrefix(trimmed, prefixQueries) {
+ state = stateNone
+ }
+
+ switch state {
+ case stateMessagesActual:
+ if !strings.HasPrefix(trimmed, prefixActualPayload) {
+ messages.ActualContent = append(messages.ActualContent, CodeLineStatus{
+ Line: line,
+ Status: false,
+ })
+ }
+ case stateMessagesExpected:
+ if !strings.HasPrefix(trimmed, prefixExpectedPayload) {
+ messages.ExpectedContent = append(messages.ExpectedContent, CodeLineStatus{
+ Line: line,
+ Status: false,
+ })
+ }
+ case stateFailLog:
+ failOutput = append(failOutput, line)
+ state = stateNone
+ case stateTestInfo:
+ testInfo = append(testInfo, line)
+ }
+ }
+ return ExpectedActual{
+ TestInfo: testInfo,
+ Messages: messages,
+ FailOutput: failOutput,
+ }
+}
+
+func isExtraElementsContentLine(trimmed string) bool {
+ return !strings.HasPrefix(trimmed, prefixTypeInterface) && !strings.HasPrefix(trimmed, prefixTypeVulnerableFile)
+}
+
+func extractExpectedActualLines(failLog []string) ExpectedActual {
+ var extraElements ActualExpectedWithStatus
+ var testInfo []string
+ var messages ActualExpectedWithStatus
+ var failOutput []string
+
+ const (
+ stateNone = iota
+ stateExtraA
+ stateExtraB
+ stateTestInfo
+ stateMessagesExpected
+ stateMessagesActual
+ stateFailLog
+ )
+ state := stateNone
+
+ for _, line := range failLog {
+ trimmed := strings.TrimSpace(line)
+
+ switch trimmed {
+ case extraElementsListA:
+ state = stateExtraA
+ continue
+ case extraElementsListB:
+ state = stateExtraB
+ continue
+ }
+
+ if strings.HasPrefix(trimmed, prefixTest) {
+ state = stateTestInfo
+ } else if strings.HasSuffix(trimmed, suffixExpectedQueries) {
+ state = stateMessagesExpected
+ } else if strings.HasSuffix(trimmed, suffixActualQueries) {
+ state = stateMessagesActual
+ } else if strings.HasPrefix(trimmed, prefixFail) {
+ state = stateFailLog
+ }
+
+ if trimmed == "" && (state == stateExtraA || state == stateExtraB) {
+ state = stateNone
+ continue
+ }
+
+ switch state {
+ case stateExtraA:
+ if isExtraElementsContentLine(trimmed) {
+ cleanedLine := cleanOutput(line)
+ extraElements.ExpectedContent = append(extraElements.ExpectedContent, CodeLineStatus{
+ Line: cleanedLine,
+ Status: false,
+ })
+ }
+ case stateExtraB:
+ if isExtraElementsContentLine(trimmed) {
+ cleanedLine := cleanOutput(line)
+ extraElements.ActualContent = append(extraElements.ActualContent, CodeLineStatus{
+ Line: cleanedLine,
+ Status: false,
+ })
+ }
+ case stateTestInfo:
+ testInfo = append(testInfo, line)
+ case stateMessagesActual:
+ if !strings.HasSuffix(trimmed, suffixActualQueries) {
+ messages.ActualContent = append(messages.ActualContent, CodeLineStatus{
+ Line: line,
+ Status: false,
+ })
+ }
+ case stateMessagesExpected:
+ if !strings.HasSuffix(trimmed, suffixExpectedQueries) {
+ messages.ExpectedContent = append(messages.ExpectedContent, CodeLineStatus{
+ Line: line,
+ Status: false,
+ })
+ }
+ case stateFailLog:
+ failOutput = append(failOutput, line)
+ state = stateNone
+ }
+ }
+
+ return ExpectedActual{
+ ExtraElements: extraElements,
+ TestInfo: testInfo,
+ Messages: messages,
+ FailOutput: failOutput,
+ }
+}
+
+func isDifferentNumberOfLines(failLog []string) bool {
+ var hasExpectedFileNumberLines, hasActualFileNumberLines bool
+ for _, failLogEntry := range failLog {
+ trimmedEntry := strings.TrimSpace(failLogEntry)
+ if trimmedEntry == "" {
+ continue
+ }
+ if strings.Contains(trimmedEntry, expectedNumberOflines) {
+ hasExpectedFileNumberLines = true
+ }
+ if strings.Contains(failLogEntry, actualNumberOfLines) {
+ hasActualFileNumberLines = true
+ }
+ if hasExpectedFileNumberLines && hasActualFileNumberLines {
+ return true
+ }
+ }
+ return false
+}
+
+func isExpectedVsActual(failLog []string) bool {
+ var hasExtraA, hasExtraB bool
+ for _, failLogEntry := range failLog {
+ trimmedEntry := strings.TrimSpace(failLogEntry)
+ if trimmedEntry == extraElementsListA {
+ hasExtraA = true
+ }
+ if trimmedEntry == extraElementsListB {
+ hasExtraB = true
+ }
+ if hasExtraA && hasExtraB {
+ return true
+ }
+ }
+ return false
+}
+
+func compareMessageContent(expectedActual *ExpectedActual) {
+ expectedLen := len(expectedActual.Messages.ExpectedContent)
+ actualLen := len(expectedActual.Messages.ActualContent)
+ actualLenExtraElements := len(expectedActual.ExtraElements.ExpectedContent)
+ expectedLenExtraElements := len(expectedActual.ExtraElements.ActualContent)
+
+ maxLen := expectedLen
+ if actualLen > maxLen {
+ maxLen = actualLen
+ }
+ maxLenExtraElements := expectedLenExtraElements
+ if actualLenExtraElements > maxLenExtraElements {
+ maxLenExtraElements = actualLenExtraElements
+ }
+
+ for i := range maxLen {
+ // if one side has no line at this index, the line is marked as different
+ if i >= expectedLen || i >= actualLen {
+ if i < expectedLen {
+ expectedActual.Messages.ExpectedContent[i].Status = true
+ }
+ if i < actualLen {
+ expectedActual.Messages.ActualContent[i].Status = true
+ }
+ continue
+ }
+ expectedContentLine := strings.TrimSpace(expectedActual.Messages.ExpectedContent[i].Line)
+ actualContentLine := strings.TrimSpace(expectedActual.Messages.ActualContent[i].Line)
+ if expectedContentLine != actualContentLine {
+ expectedActual.Messages.ExpectedContent[i].Status = true
+ expectedActual.Messages.ActualContent[i].Status = true
+ }
+ }
+
+ for j := range maxLenExtraElements {
+ if j >= expectedLenExtraElements || j >= actualLenExtraElements {
+ if j < expectedLenExtraElements {
+ expectedActual.ExtraElements.ExpectedContent[j].Status = true
+ }
+ if j < actualLenExtraElements {
+ expectedActual.ExtraElements.ActualContent[j].Status = true
+ }
+ continue
+ }
+ expectedContentLine := strings.TrimSpace(expectedActual.ExtraElements.ExpectedContent[j].Line)
+ actualContentLine := strings.TrimSpace(expectedActual.ExtraElements.ActualContent[j].Line)
+ if expectedContentLine != actualContentLine {
+ expectedActual.ExtraElements.ExpectedContent[j].Status = true
+ expectedActual.ExtraElements.ActualContent[j].Status = true
+ }
+ }
+}
+
func main() {
var testPath, testName, reportPath, reportName string
@@ -88,7 +373,6 @@ func main() {
fmt.Printf("Error when trying to decode: %v\n", err)
fmt.Printf("Verify if the JSON File has UTF8 encoding")
}
-
if log.Action == "pass" || log.Action == "fail" {
if log.Test == "" {
finalStatus = log
@@ -98,7 +382,6 @@ func main() {
hasFailures = true
}
test, exists := FindTest(testList, log.Test)
-
if exists {
if log.Action == "fail" {
test.TestLog = log
@@ -117,7 +400,6 @@ func main() {
fmt.Printf("Error when trying to open: %v\n", filepath.Join(filepath.ToSlash(testPath), testName))
os.Exit(1)
}
-
decoder2 := json.NewDecoder(jsonTestsOutputClean)
for decoder2.More() {
var log TestLog
@@ -132,13 +414,28 @@ func main() {
}
test, exists := FindTest(testList, log.Test)
-
if !exists || test.TestLog.Action != "fail" {
continue
}
-
test.FailLog = append(test.FailLog, log.Output)
}
+
+ for i := range testList {
+ test := &testList[i]
+ if test.TestLog.Action != "fail" {
+ continue
+ }
+
+ if isExpectedVsActual(test.FailLog) {
+ expectedActual := extractExpectedActualLines(test.FailLog)
+ compareMessageContent(&expectedActual)
+ test.ExpectedActual = expectedActual
+ } else if isDifferentNumberOfLines(test.FailLog) {
+ expectedActual := extractPayloadDiffLines(test.FailLog)
+ compareMessageContent(&expectedActual)
+ test.ExpectedActual = expectedActual
+ }
+ }
}
fmt.Printf("Parsing tests data... Done!\n")
diff --git a/.github/scripts/report/template/html/e2e-report.css b/.github/scripts/report/template/html/e2e-report.css
index d6cd1dd1fe7..d20778584b8 100644
--- a/.github/scripts/report/template/html/e2e-report.css
+++ b/.github/scripts/report/template/html/e2e-report.css
@@ -1,142 +1,199 @@
-* {
- margin: 0;
- padding: 0;
- outline: 0;
- box-sizing: border-box;
-}
-
-body {
- font-family: sans-serif;
-}
-
-.container {
- display: flex;
- align-items: center;
- flex-direction: column;
- margin: 5px;
- border: 1px solid #bebebe;
-}
-
-.report-header-footer {
- display: grid;
- align-items: center;
- grid-template-columns: 1fr 1fr 1fr;
- border-bottom: 1px solid #bebebe;
- width: 100%;
- padding: 15px 21px;
- background-color: #503e9e;
- height: 50px;
- font-weight: bold;
- font-size: 14px;
- color: #fff;
- cursor: default;
- user-select: none;
-}
-
-.report-header-footer > a {
- color: inherit;
- text-decoration: inherit;
- text-align: right;
-}
-
-.report-header-footer > .title {
- font-size: 18px;
-}
-
-.report-header-footer > .title > span {
- color: #000;
-}
-
-.report-header-footer > .timestamp {
- font-weight: normal;
- font-style: italic;
- opacity: 0.5;
- text-align: center;
-}
-
-.separator {
- border-top: 1px solid #979797;
- opacity: 0.5;
- width: 95%;
- margin: 22px 0;
-}
-
-.hide {
- display: none;
-}
-
-summary {
- cursor: pointer;
- user-select: none;
- font-size: 18px;
- font-weight: bold;
-}
-
-.testBlock {
- width: 95vw;
- display: flex;
- flex-direction: column;
- gap: 10px;
-}
-
-.test-status {
- font-weight: bold;
-}
-
-.test-status.fail {
- color: #d60000;
-}
-
-.test-status.pass {
- color: #248e01;
-}
-
-.test-status.all {
- color: blue;
-}
-
-.counters {
- display: flex;
- flex-direction: row;
- margin: 22px 0;
- gap: 15px;
-}
-
-.counter-btn {
- display: flex;
- flex-direction: column;
- align-items: center;
- border: 1px solid rgba(0,0,0,0.1);
- padding: 10px;
- border-radius: 5px;
- cursor: pointer;
- min-width: 100px;
- gap: 5px;
- -webkit-box-shadow: 0 0 10px 0px rgb(0 0 0 / 10%);
- box-shadow: 0 0 10px 0px rgb(0 0 0 / 10%);
-}
-
-.counter-btn.selected {
- border-color: #c000ff;
-}
-
-.counter-count {
- font-style: italic;
- color: gray;
-}
-
-.results {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- gap: 10px;
- margin-top: 22px;
-}
-
-.code-box {
- display: flex;
- flex-direction: column;
- background-color: #503e9e10;
- gap: 5px;
-}
+* {
+ margin: 0;
+ padding: 0;
+ outline: 0;
+ box-sizing: border-box;
+}
+
+body {
+ font-family: sans-serif;
+}
+
+.container {
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ margin: 5px;
+ border: 1px solid #bebebe;
+}
+
+.report-header-footer {
+ display: grid;
+ align-items: center;
+ grid-template-columns: 1fr 1fr 1fr;
+ border-bottom: 1px solid #bebebe;
+ width: 100%;
+ padding: 15px 21px;
+ background-color: #503e9e;
+ height: 50px;
+ font-weight: bold;
+ font-size: 14px;
+ color: #fff;
+ cursor: default;
+ user-select: none;
+}
+
+.report-header-footer > a {
+ color: inherit;
+ text-decoration: inherit;
+ text-align: right;
+}
+
+.report-header-footer > .title {
+ font-size: 18px;
+}
+
+.report-header-footer > .title > span {
+ color: #000;
+}
+
+.report-header-footer > .timestamp {
+ font-weight: normal;
+ font-style: italic;
+ opacity: 0.5;
+ text-align: center;
+}
+
+.separator {
+ border-top: 1px solid #979797;
+ opacity: 0.5;
+ width: 95%;
+ margin: 22px 0;
+}
+
+.hide {
+ display: none;
+}
+
+summary {
+ cursor: pointer;
+ user-select: none;
+ font-size: 18px;
+ font-weight: bold;
+}
+
+summary.sub-summary {
+ font-size: 15px;
+ font-weight: 700;
+ margin: 5px 0;
+}
+
+summary.expected-actual {
+ font-size: 14px;
+ font-weight: 580;
+}
+
+.testBlock {
+ width: 95vw;
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+}
+
+.test-status {
+ font-weight: bold;
+}
+
+.test-status.fail {
+ color: #d60000;
+}
+
+.test-status.pass {
+ color: #248e01;
+}
+
+.test-status.all {
+ color: blue;
+}
+
+.counters {
+ display: flex;
+ flex-direction: row;
+ margin: 22px 0;
+ gap: 15px;
+}
+
+.counter-btn {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ border: 1px solid rgba(0,0,0,0.1);
+ padding: 10px;
+ border-radius: 5px;
+ cursor: pointer;
+ min-width: 100px;
+ gap: 5px;
+ -webkit-box-shadow: 0 0 10px 0px rgb(0 0 0 / 10%);
+ box-shadow: 0 0 10px 0px rgb(0 0 0 / 10%);
+}
+
+.counter-btn.selected {
+ border-color: #c000ff;
+}
+
+.counter-count {
+ font-style: italic;
+ color: gray;
+}
+
+.code.diff {
+ background-color: rgba(255, 0, 0, 0.2);
+ border-radius: 4px;
+}
+
+.results {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ gap: 10px;
+ margin-top: 22px;
+}
+
+.code-box {
+ display: flex;
+ flex-direction: column;
+ background-color: #503e9e10;
+ gap: 5px;
+}
+
+.code-box.side-by-side {
+ display: flex;
+ flex-direction: row;
+ align-items: flex-start;
+ gap: 10px;
+ background-color: transparent;
+ margin-bottom: 10px;
+ margin-top: 10px;
+}
+
+.code-box.first {
+ width: 50%;
+ float: none;
+ height: auto;
+ align-self: auto;
+}
+
+.code-box.second {
+ width: 50%;
+ float: none;
+ height: auto;
+ align-self: auto;
+}
+
+.code-box.test-info {
+ background-color: white;
+ margin-bottom: 5px;
+}
+
+.code.pre {
+ white-space: pre-wrap;
+}
+
+.container_expected_actual {
+ width: auto;
+ background-color: #fff;
+ margin: auto;
+ display: flex;
+ float: none;
+}
diff --git a/.github/scripts/report/template/html/e2e-report.js b/.github/scripts/report/template/html/e2e-report.js
index 2aab56abb84..5cb61538008 100644
--- a/.github/scripts/report/template/html/e2e-report.js
+++ b/.github/scripts/report/template/html/e2e-report.js
@@ -1,11 +1,11 @@
-function filter(filt) {
- const tests = document.querySelectorAll("[data-type='testInfo']");
- tests.forEach((query) => filt !== "all" && filt !== query.getAttribute("data-name") ? query.classList.add("hide") : query.classList.remove("hide"));
-
- const severitiesCaptions = document.querySelectorAll(".counters > .counter-btn");
- const selectedElement = document.getElementsByClassName(`counter test-status ${filt}`)[0]
-
- severitiesCaptions.forEach((counter) => {
- filt && selectedElement === counter.getElementsByClassName('counter test-status')[0] ? counter.classList.add("selected") : counter.classList.remove("selected")
- });
-}
+function filter(filt) {
+ const tests = document.querySelectorAll("[data-type='testInfo']");
+ tests.forEach((query) => filt !== "all" && filt !== query.getAttribute("data-name") ? query.classList.add("hide") : query.classList.remove("hide"));
+
+ const severitiesCaptions = document.querySelectorAll(".counters > .counter-btn");
+ const selectedElement = document.getElementsByClassName(`counter test-status ${filt}`)[0]
+
+ severitiesCaptions.forEach((counter) => {
+ filt && selectedElement === counter.getElementsByClassName('counter test-status')[0] ? counter.classList.add("selected") : counter.classList.remove("selected")
+ });
+}
\ No newline at end of file
diff --git a/.github/scripts/report/template/html/e2e-report.tmpl b/.github/scripts/report/template/html/e2e-report.tmpl
index 9c4407c905e..ff71b33421b 100644
--- a/.github/scripts/report/template/html/e2e-report.tmpl
+++ b/.github/scripts/report/template/html/e2e-report.tmpl
@@ -1,62 +1,163 @@
-
-
-
-
-
- KICS Scan Result
- {{ includeCSS "report.css" }}
- {{ includeJS "report.js" }}
-
-
-
-
-
-
-
E2E Tests Result: {{.Result.Action}}
- Time Elapsed: {{.Result.Elapsed}}s
- Kics Docker Image: {{ getCurrentDockerImage }}
-
-
-
Filters
-
-
-
- PASSED
- {{.Counters.CountPass}}
-
-
-
- FAILED
- {{.Counters.CountFail}}
-
-
-
- ALL
- {{.Counters.CountTotal}}
-
-
-
- {{- range $val := .TestsData}}
-
-
-
-
Test: {{$val.TestLog.Test}}
-
Elapsed: {{$val.TestLog.Elapsed}}s
-
Status: {{$val.TestLog.Action}}
- {{ if eq $val.TestLog.Action "fail" }}
-
- View Details
-
- {{ range $failLine := $val.FailLog }}
- {{ $failLine }}
- {{ end }}
-
-
- {{ end }}
-
-
- {{- end -}}
-
-
+
+
+
+
E2E Tests Result: {{.Result.Action}}
+ Time Elapsed: {{.Result.Elapsed}}s
+ Kics Docker Image: {{ getCurrentDockerImage }}
+
+
+
Filters
+
+
+
+ PASSED
+ {{.Counters.CountPass}}
+
+
+
+ FAILED
+ {{.Counters.CountFail}}
+
+
+
+ ALL
+ {{.Counters.CountTotal}}
+
+
+
+ {{- range $val := .TestsData}}
+
+
+
+
Test: {{$val.TestLog.Test}}
+
Elapsed: {{$val.TestLog.Elapsed}}s
+
Status: {{$val.TestLog.Action}}
+ {{ if eq $val.TestLog.Action "fail" }}
+
+ View Details
+ {{ if and $val.ExpectedActual.Messages.ExpectedContent $val.ExpectedActual.Messages.ActualContent (not (and $val.ExpectedActual.ExtraElements.ExpectedContent $val.ExpectedActual.ExtraElements.ActualContent)) }}
+
+ {{ range $line := $val.ExpectedActual.TestInfo }}
+ {{ $line }}
+ {{ end }}
+
+
+ {{ range $line := $val.ExpectedActual.FailOutput }}
+ {{ $line }}
+ {{ end }}
+
+
+ Show additional information
+
+
+ Expected in fixtures:
+ {{ range $ec := $val.ExpectedActual.Messages.ExpectedContent }}
+ {{ if $ec.Status }}
+ {{ $ec.Line }}
+ {{ else }}
+ {{ $ec.Line }}
+ {{ end }}
+ {{ end }}
+
+
+ Actual output:
+ {{ range $ac := $val.ExpectedActual.Messages.ActualContent }}
+ {{ if $ac.Status }}
+ {{ $ac.Line }}
+ {{ else }}
+ {{ $ac.Line }}
+ {{ end }}
+ {{ end }}
+
+
+ {{ else if and $val.ExpectedActual.Messages.ExpectedContent $val.ExpectedActual.Messages.ActualContent }}
+
+ {{ range $line := $val.ExpectedActual.TestInfo }}
+ {{ $line }}
+ {{ end }}
+
+
+ {{ range $line := $val.ExpectedActual.FailOutput }}
+ {{ $line }}
+ {{ end }}
+
+ {{ if and $val.ExpectedActual.ExtraElements.ExpectedContent $val.ExpectedActual.ExtraElements.ActualContent }}
+
+ View extra elements
+
+
+ Expected in fixtures:
+ {{ range $ec := $val.ExpectedActual.ExtraElements.ExpectedContent }}
+ {{ if $ec.Status }}
+ {{ $ec.Line }}
+ {{ else }}
+ {{ $ec.Line }}
+ {{ end }}
+ {{ end }}
+
+
+ Actual output
+ {{ range $ac := $val.ExpectedActual.ExtraElements.ActualContent }}
+ {{ if $ac.Status }}
+ {{ $ac.Line }}
+ {{ else }}
+ {{ $ac.Line }}
+ {{ end }}
+ {{ end }}
+
+
+ {{ end }}
+
+ Show full Actual and Expected
+
+
+ Expected in fixtures:
+ {{ range $ec := $val.ExpectedActual.Messages.ExpectedContent }}
+ {{ if $ec.Status }}
+ {{ $ec.Line }}
+ {{ else }}
+ {{ $ec.Line }}
+ {{ end }}
+ {{ end }}
+
+
+ Actual output:
+ {{ range $ac := $val.ExpectedActual.Messages.ActualContent }}
+ {{ if $ac.Status }}
+ {{ $ac.Line }}
+ {{ else }}
+ {{ $ac.Line }}
+ {{ end }}
+ {{ end }}
+
+
+ {{ else }}
+
+ {{ range $failLine := $val.FailLog }}
+ {{ $failLine }}
+ {{ end }}
+
+ {{ end }}
+
+ {{ end }}
+
+
+ {{- end -}}
+
+
-
-
-
- KICS {{ getVersion }}
- Scanned paths: {{ getPaths .ScannedPaths }}
- Platforms: {{ getPlatforms .Queries }}
- {{- with .Times -}}
- Start time: {{ .Start.Format "15:04:05, Jan 02 2006" }}
- End time: {{ .End.Format "15:04:05, Jan 02 2006" }}
- {{- end}}
-
-
Vulnerabilities:
-
- {{- with .SeveritySummary -}}
-
-
{{ includeSVG "vulnerability_fill.svg" }}
-
{{ index .SeverityCounters (severity "critical") }}
-
CRITICAL
-
-
-
{{ includeSVG "vulnerability_fill.svg" }}
-
{{ index .SeverityCounters (severity "high") }}
-
HIGH
-
-
-
{{ includeSVG "vulnerability_out.svg" }}
-
{{ index .SeverityCounters (severity "medium") }}
-
MEDIUM
-
-
-
{{ includeSVG "vulnerability_out.svg" }}
-
{{ index .SeverityCounters (severity "low") }}
-
LOW
-
-
-
{{ includeSVG "info.svg" }}
-
{{ index .SeverityCounters (severity "info") }}
-
INFO
-
- {{- end}}
-
-
{{ includeSVG "info.svg" }}
-
{{ .TotalCounter }}
-
TOTAL
-
-
- {{- range .Queries}}
-
-
-
-
-
-
- {{- if eq .Severity "CRITICAL" -}}
-
{{ includeSVG "vulnerability_fill.svg" }}
- {{- end -}}
- {{- if eq .Severity "HIGH" -}}
- {{ includeSVG "vulnerability_fill.svg" }}
- {{- end -}}
- {{- if eq .Severity "MEDIUM" -}}
- {{ includeSVG "vulnerability_out.svg" }}
- {{- end -}}
- {{- if eq .Severity "LOW" -}}
- {{ includeSVG "vulnerability_out.svg" }}
- {{- end -}}
- {{- if eq .Severity "INFO" -}}
- {{ includeSVG "info.svg" }}
- {{- end -}}
- {{- .QueryName -}}
-
-
Platform: {{ .Platform }}
- {{ if .CWE }}
CWE: {{ .CWE }}{{ end }}
- {{ if .RiskScore }}
Risk Score: {{ .RiskScore }}{{ end }}
-
Category: {{ .Category }}
-
-
- {{- if not .CISDescriptionID -}}
-
{{ .Description }}
- {{- end -}}
- {{- if .CISDescriptionID -}}
-
{{ .CISDescriptionIDFormatted }}
-
{{ .CISDescriptionTitle }}
-
{{ .CISDescriptionTextFormatted }}
- {{- end -}}
-
{{ .QueryURI }}
-
-
-
- Results ({{ len .Files }})
- {{- range .Files}}
- {{- $vulLine := .Line -}}
-
-
-
- Expected: {{ .KeyExpectedValue }}
- Found: {{ .KeyActualValue }}
-
-
- {{- range .VulnLines -}}
-
- {{ .Position }}{{ trimSpaces .Line }}
-
- {{- end}}
-
-
-
-
- {{- end -}}
-
-
- KICS is open and will always stay such. Both the scanning engine and the security queries are clear and open for the software development community.
-
-
- Spread the love:
-
-
-
-
+
+
+ KICS {{ getVersion }}
+ Scanned paths: {{ getPaths .ScannedPaths }}
+ Platforms: {{ getPlatforms .Queries }}
+ {{- with .Times -}}
+ Start time: {{ .Start.Format "15:04:05, Jan 02 2006" }}
+ End time: {{ .End.Format "15:04:05, Jan 02 2006" }}
+ {{- end}}
+
+
Vulnerabilities:
+
+ {{- with .SeveritySummary -}}
+
+
{{ includeSVG "vulnerability_fill.svg" }}
+
{{ index .SeverityCounters (severity "critical") }}
+
CRITICAL
+
+
+
{{ includeSVG "vulnerability_fill.svg" }}
+
{{ index .SeverityCounters (severity "high") }}
+
HIGH
+
+
+
{{ includeSVG "vulnerability_out.svg" }}
+
{{ index .SeverityCounters (severity "medium") }}
+
MEDIUM
+
+
+
{{ includeSVG "vulnerability_out.svg" }}
+
{{ index .SeverityCounters (severity "low") }}
+
LOW
+
+
+
{{ includeSVG "info.svg" }}
+
{{ index .SeverityCounters (severity "info") }}
+
INFO
+
+ {{- end}}
+
+
{{ includeSVG "info.svg" }}
+
{{ .TotalCounter }}
+
TOTAL
+
+
+ {{- range .Queries}}
+
+
+
+
+
+
+ {{- if eq .Severity "CRITICAL" -}}
+
{{ includeSVG "vulnerability_fill.svg" }}
+ {{- end -}}
+ {{- if eq .Severity "HIGH" -}}
+ {{ includeSVG "vulnerability_fill.svg" }}
+ {{- end -}}
+ {{- if eq .Severity "MEDIUM" -}}
+ {{ includeSVG "vulnerability_out.svg" }}
+ {{- end -}}
+ {{- if eq .Severity "LOW" -}}
+ {{ includeSVG "vulnerability_out.svg" }}
+ {{- end -}}
+ {{- if eq .Severity "INFO" -}}
+ {{ includeSVG "info.svg" }}
+ {{- end -}}
+ {{- .QueryName -}}
+
+
Platform: {{ .Platform }}
+ {{ if .CWE }}
CWE: {{ .CWE }}{{ end }}
+ {{ if .RiskScore }}
Risk Score: {{ .RiskScore }}{{ end }}
+
Category: {{ .Category }}
+
+
+ {{- if not .CISDescriptionID -}}
+
{{ .Description }}
+ {{- end -}}
+ {{- if .CISDescriptionID -}}
+
{{ .CISDescriptionIDFormatted }}
+
{{ .CISDescriptionTitle }}
+
{{ .CISDescriptionTextFormatted }}
+ {{- end -}}
+
{{ .QueryURI }}
+
+
+
+ Results ({{ len .Files }})
+ {{- range .Files}}
+ {{- $vulLine := .Line -}}
+
+
+
+ Expected: {{ .KeyExpectedValue }}
+ Found: {{ .KeyActualValue }}
+
+
+ {{- range .VulnLines -}}
+
+ {{ .Position }}{{ trimSpaces .Line }}
+
+ {{- end}}
+
+
+
+
+ {{- end -}}
+
+
+ KICS is open and will always stay such. Both the scanning engine and the security queries are clear and open for the software development community.
+
+
+ Spread the love:
+
+
+
+