Fix HTML template and display the gosec version

securego · May 21, 2021 · e72f54e · e72f54e
1 parent c3f25b8
commit e72f54e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/report/formatter_test.go b/report/formatter_test.go
@@ -304,10 +304,10 @@ var _ = Describe("Formatter", func() {
 				error := map[string][]gosec.Error{}
 
 				buf := new(bytes.Buffer)
-				reportInfo := gosec.NewReportInfo([]*gosec.Issue{&issue}, &gosec.Metrics{NumFiles: 0, NumLines: 0, NumNosec: 0, NumFound: 0}, error)
+				reportInfo := gosec.NewReportInfo([]*gosec.Issue{&issue}, &gosec.Metrics{NumFiles: 0, NumLines: 0, NumNosec: 0, NumFound: 0}, error).WithVersion("v2.7.0")
 				err := CreateReport(buf, "xml", false, []string{}, reportInfo)
 				Expect(err).ShouldNot(HaveOccurred())
-				pattern := "Results:\n\n\n[/home/src/project/test.go:1] - %s (CWE-%s): test (Confidence: HIGH, Severity: HIGH)\n  > 1: testcode\n\n\n\nSummary:\n   Files: 0\n   Lines: 0\n   Nosec: 0\n  Issues: 0\n\n"
+				pattern := "Results:\n\n\n[/home/src/project/test.go:1] - %s (CWE-%s): test (Confidence: HIGH, Severity: HIGH)\n  > 1: testcode\n\n\n\nSummary:\n  Gosec  : v2.7.0\n  Files  : 0\n  Lines  : 0\n  Nosec  : 0\n  Issues : 0\n\n"
 				expect := fmt.Sprintf(pattern, rule, cwe.ID)
 				Expect(buf.String()).To(Equal(expect))
 			}

diff --git a/report/html/template.go b/report/html/template.go
@@ -19,7 +19,7 @@ const templateContent = `
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>Go AST Scanner</title>
+  <title>Golang Security Checker</title>
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.2.1/css/bulma.min.css" integrity="sha256-DRcOKg8NK1KkSkcymcGmxOtS/lAn0lHWJXRa15gMHHk=" crossorigin="anonymous"/>
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react.min.js" integrity="sha256-cLWs9L+cjZg8CjGHMpJqUgKKouPlmoMP/0wIdPtaPGs=" crossorigin="anonymous"></script>
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react-dom.min.js" integrity="sha256-JIW8lNqN2EtqC6ggNZYnAdKMJXRQfkPMvdRt+b0/Jxc=" crossorigin="anonymous"></script>
@@ -89,9 +89,7 @@ const templateContent = `
             </p>
             <figure className="highlight">
               <pre>
-                <code className="golang hljs">
-                  { this.props.data.code }
-                </code>
+                <code className="go">{ this.props.data.code }</code>
               </pre>
             </figure>
           </div>
@@ -103,7 +101,7 @@ const templateContent = `
       render: function() {
         return (
           <p className="help">
-            Scanned { this.props.data.Stats.files.toLocaleString() } files
+            Gosec {this.props.data.GosecVersion} scanned { this.props.data.Stats.files.toLocaleString() } files
             with { this.props.data.Stats.lines.toLocaleString() } lines of code.
             { this.props.data.Stats.nosec ? '\n' + this.props.data.Stats.nosec.toLocaleString() + ' false positives (nosec) have been waived.' : ''}
           </p>
@@ -170,7 +168,6 @@ const templateContent = `
         );
       }
     });
-    
     var LevelSelector = React.createClass({
       handleChange: function(level) {
         return function(e) {
@@ -183,30 +180,34 @@ const templateContent = `
         }.bind(this);
       },
       render: function() {
-        var highDisabled = !this.props.available.includes("HIGH");
-        var mediumDisabled = !this.props.available.includes("MEDIUM");
-        var lowDisabled = !this.props.available.includes("LOW");
-        var on = "", off = "disabled";
         var HIGH = "HIGH", MEDIUM = "MEDIUM", LOW = "LOW";
+        var highDisabled = !this.props.available.includes(HIGH);
+        var mediumDisabled = !this.props.available.includes(MEDIUM);
+        var lowDisabled = !this.props.available.includes(LOW);
+        var on = "", off = "disabled";
+        var baseClassName = "label checkbox ";
+        var highClassName = baseClassName + (highDisabled ? off : on); 
+        var mediumClassName = baseClassName + (mediumDisabled ? off : on); 
+        var lowClassName = baseClassName + (lowDisabled ? off : on); 
         return (
           <span>
-            <label className="label checkbox { (highDisabled ? off : on )}">
+            <label className={ highClassName }>
               <input
                 type="checkbox"
                 checked={ this.props.selected.includes(HIGH) }
                 disabled={ highDisabled }
                 onChange={ this.handleChange(HIGH) }/>
               High
             </label>
-            <label className="label checkbox {( mediumDisabled ? off : on )}">
+            <label className={mediumClassName}>
               <input
                 type="checkbox"
                 checked={ this.props.selected.includes(MEDIUM) }
                 disabled={ mediumDisabled }
                 onChange={ this.handleChange(MEDIUM) }/>
               Medium
             </label>
-            <label className="label checkbox {( lowDisabled ? off : on )}">
+            <label className={lowClassName}>
               <input
                 type="checkbox"
                 checked={ this.props.selected.includes(LOW) }
@@ -218,7 +219,6 @@ const templateContent = `
         );
       }
     });
-    
     var Navigation = React.createClass({
       updateSeverity: function(vals) {
         this.props.onSeverity(vals);
@@ -276,12 +276,14 @@ const templateContent = `
               </strong>
             </div>
             <div className="panel-block">
-              <select onChange={ this.updateIssueType }>
-                <option value="all" selected={ !this.props.issueType }>
-                  (all)
-                </option>
-                { issueTypes }
-              </select>
+              <div className="select">
+                <select onChange={ this.updateIssueType }>
+                  <option value="all" selected={ !this.props.issueType }>
+                    (all)
+                  </option>
+                  { issueTypes }
+                </select>
+              </div>
             </div>
           </nav>
         );
@@ -353,11 +355,9 @@ const templateContent = `
           .filter(function(item, pos, ary) {
             return !pos || item != ary[pos - 1];
           });
-    
         if (this.state.issueType && !allTypes.includes(this.state.issueType)) {
           this.setState({issueType: null});
         }
-        
         this.setState({allIssueTypes: allTypes});
       },
       render: function() {

diff --git a/report/text/template.go b/report/text/template.go
@@ -13,10 +13,11 @@ Golang errors in file: [{{ $filePath }}]:
 
 {{ end }}
 {{ notice "Summary:" }}
-   Files: {{.Stats.NumFiles}}
-   Lines: {{.Stats.NumLines}}
-   Nosec: {{.Stats.NumNosec}}
-  Issues: {{ if eq .Stats.NumFound 0 }}
+  Gosec  : {{.GosecVersion}}
+  Files  : {{.Stats.NumFiles}}
+  Lines  : {{.Stats.NumLines}}
+  Nosec  : {{.Stats.NumNosec}}
+  Issues : {{ if eq .Stats.NumFound 0 }}
 	{{- success .Stats.NumFound }}
 	{{- else }}
 	{{- danger .Stats.NumFound }}