Fixed spelling of Tenable.io (#640)

* Fixed spelling of Tenable.io

* Fixing testssl.sh unit test

* Fixing testssl.sh unit test

* New year, new copyright banners

README.md

@@ -159,7 +159,7 @@ Defferences with 2.46
 
 Enhancements
 ------------
-* Seccubus now support tenable.io as a scanning platform
+* Seccubus now support Tenable.io as a scanning platform
 * Added parsing of the ROBOT (bleichenbacher) attack to the SSLlabs scanner
 * Added a dev environment example config
 

jmvc/seccubus/scan/create/create.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Frank Breedijk, Artien Bel
+ * Copyright 2018 Frank Breedijk, Artien Bel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -148,13 +148,13 @@ $.Controller("Seccubus.Scan.Create",
             $("#newScanOtherScannerRow").hide();
         }
         //if scanner is Nessus, nessuslegacy or openvas, show password field
-        if ( $("#newScanScanner").val() === "Nessus6" || $("#newScanScanner").val() === "OpenVAS" || $("#newScanScanner").val() === "tenable.io" ) {
+        if ( $("#newScanScanner").val() === "Nessus6" || $("#newScanScanner").val() === "OpenVAS" || $("#newScanScanner").val() === "Tenable.io" ) {
             $("#newScanPasswordRow").show();
         } else {
             $("#newScanPasswordRow").hide();
             $("#newScanPassword").val("N/A");
         }
-        if (  $("#newScanScanner").val() === "tenable.io" ) {
+        if (  $("#newScanScanner").val() === "Tenable.io" ) {
             $("#newScanPasswordLabel").html("Secret Key");
         } else {
             $("#newScanPasswordLabel").html("Password");

jmvc/seccubus/scan/edit/edit.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 Frank Breedijk, Artien Bel (Ar0xA), Petr
+ * Copyright 2012-2018 Frank Breedijk, Artien Bel (Ar0xA), Petr
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -174,13 +174,13 @@ $.Controller("Seccubus.Scan.Edit",
             $("#editScanOtherScannerRow").hide();
         }
         //if scanner is Nessus, nessuslegacy or openvas, show password field
-        if ( $("#editScanScanner").val() === "Nessus6" || $("#editScanScanner").val() === "OpenVAS" || $("#editScanScanner").val() === "tenable.io" ) {
+        if ( $("#editScanScanner").val() === "Nessus6" || $("#editScanScanner").val() === "OpenVAS" || $("#editScanScanner").val() === "Tenable.io" ) {
             $("#editScanPasswordRow").show();
         } else {
             $("#editScanPasswordRow").hide();
             $("#editScanPassword").val("N/A");
         }
-        if (  $("#editScanScanner").val() === "tenable.io" ) {
+        if (  $("#editScanScanner").val() === "Tenable.io" ) {
             $("#editScanPasswordLabel").html("Secret Key");
         } else {
             $("#editScanPasswordLabel").html("Password");

scanners/Tenable.io/description.txt

@@ -0,0 +1 @@
+Tenable.io cloud vulnerability scanning platform.

scanners/tenable.io/help.html → scanners/Tenable.io/help.html

@@ -1,5 +1,5 @@
 <!--
-Copyright 2017-2017 Frank Breedijk
+Copyright 2017-2018 Frank Breedijk
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,15 +17,15 @@
 This scanner takes the following parameters:
 <ul>
     <li>--policy          <br>- Name of policy or template to use for this scan
-    <li>--hosts           <br>- Specification of hosts to scan. Follows the tenable.io rules for specifying hosts, or path to a file containing such specification
-    <li>--accesskey       <br>- API access key to log into tennable.io. You can generate this key via Settings->My Account->API-Leys (https://cloud.tenable.com/app.html#/settings/my-account/api-keys)
-    <li>--secretkey       <br>- API secret key to log into tennable.io. (See accesskey)
+    <li>--hosts           <br>- Specification of hosts to scan. Follows the Tenable.io rules for specifying hosts, or path to a file containing such specification
+    <li>--accesskey       <br>- API access key to log into Tenable.io. You can generate this key via Settings->My Account->API-Leys (https://cloud.tenable.com/app.html#/settings/my-account/api-keys)
+    <li>--secretkey       <br>- API secret key to log into Tenable.io. (See accesskey)
     <li>--scanner         <br>- Name of the scanner to use for this scan.
-    <li>--api             <br>- Can be used to overwrite the url of the tennable.io API
+    <li>--api             <br>- Can be used to overwrite the url of the Tenable.io API
     <li>--export          <br>- Export the scan in these formats (specify more then once for more formats), currently supported formats are: nessus, html, pdf, csv, db.
-    <li>--nosslcheck      <br>- Don't validate tenable.io' TLS certificate Common Name (default: true when port is 8834 false when port is 443)
+    <li>--nosslcheck      <br>- Don't validate Tenable.io' TLS certificate Common Name (default: true when port is 8834 false when port is 443)
     <li>--retries         <br>- How many times should rest calls be retried before aborting the scan (default=3)
-    <li>--sleep           <br>- Seconds to sleep between polls of the tennable.io engine (default=30)
+    <li>--sleep           <br>- Seconds to sleep between polls of the Tenable.io engine (default=30)
 </ul>
 You must use --hosts @HOSTS
 <p>

scanners/tenable.io/scan → scanners/Tenable.io/scan

@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2017 Frank Breedijk, Alex Smirnoff, Glenn ten Cate, Artien Bel, Theodoor Scholte
+# Copyright 2018 Frank Breedijk, Alex Smirnoff, Glenn ten Cate, Artien Bel, Theodoor Scholte
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -350,7 +350,7 @@ my $result = `$cmd 2>&1`;
 print "$result\n" if $verbose > 1;
 
 print "Importing ivil\n" unless $quiet;
-$cmd = "$load_ivil --workspace '$workspace' --scan '$scan' --scanner tenable.io --timestamp $timestamp";
+$cmd = "$load_ivil --workspace '$workspace' --scan '$scan' --scanner Tenable.io --timestamp $timestamp";
 $cmd .= " -v" if $verbose > 1;
 $cmd .= " '$tempfile.ivil.xml'";
 print "Executing $cmd\n" if $verbose > 1;
@@ -387,33 +387,33 @@ sub help {
     print "
 Usage: scan       --policy=<policy name> --hosts=<hosts file|hosts spec>    \\
                   --workspace=<seccubus workspace> --scan=<seccubus scan>   \\
-                  --accesskey=<tennable.io access API key>                  \\
-                  --secretkey =<tenable.io secret API key>                  \\
+                  --accesskey=<Tenable.io access API key>                  \\
+                  --secretkey =<Tenable.io secret API key>                  \\
                   [--scanner=<scanner name>] [--api=<url>]                  \\
                   [--export=(nessus|html|pdf|csv|db)] [--nodelete]          \\
                   [--sleep=<seconds>] [--nosslcheck] [--retries=<attempts>] \\
                   [--verbose] [--quiet] [--help]
 --policy          - Name of policy or template to use for this scan
---hosts           - Specification of hosts to scan. Follows the tenable.io
+--hosts           - Specification of hosts to scan. Follows the Tenable.io
                     rules for specifying hosts, or path to a file containing
                     such specification
---accesskey       - API access key to log into tennable.io. You can generate
+--accesskey       - API access key to log into Tenable.io. You can generate
                     this key via Settings->My Account->API-Leys
-                    (https://cloud.tenable.com/app.html#/settings/my-account/api-keys)
---secretkey       - API secret key to log into tennable.io. (See accesskey)
+                    (https://cloud.Tenable.com/app.html#/settings/my-account/api-keys)
+--secretkey       - API secret key to log into Tenable.io. (See accesskey)
 --scanner         - Name of the scanner to use for this scan.
 --workspace (-ws) - Seccubus workspace the scan in in
 --scan (-sc)      - Seccubus scan the data should be saved in
---api             - Can be used to overwrite the url of the tennable.io API
+--api             - Can be used to overwrite the url of the Tenable.io API
 --export          - Export the scan in these formats (specify more then once
                     for more formats), currently supported formats are:
                     nessus, html, pdf, csv, db.
 --nodelete        - Don't erase temporary files
---nosslcheck      - Don't validate tenable.io' TLS certificate Common Name
+--nosslcheck      - Don't validate Tenable.io' TLS certificate Common Name
                     (default: true when port is 8834 false when port is 443)
 --retries         - How many times should rest calls be retried before aborting
                     the scan (default=3)
---sleep           - Seconds to sleep between polls of the tennable.io engine
+--sleep           - Seconds to sleep between polls of the Tenable.io engine
                     (default=30)
 --verbose (-v)    - Be verbose during execution
 --quiet (-q)      - Don't print output
@@ -559,23 +559,23 @@ sub rest_call {
     }
     print "Server response : " . $r->decoded_content() . "\n" if $verbose > 2;
 
-    # Export calls can actually return a 404 if an export has failed for some internal tenable.io reason, we should not
+    # Export calls can actually return a 404 if an export has failed for some internal Tenable.io reason, we should not
     # retry in this case
     unless ( $r->is_success || ( $uri =~ qr#/scans/\d+/export/\d+\/status# && $r->code() == 404 ) ) {
         unless ( $quiet ) {
             #Internal server errors (500) should be fail gracefully so it does not loop
             if ($uri =~ qr#/scans/\d+/export/\d+\/status# && $r->code() == 500) {
                 return;
             }
-            print "tenable.io returned error code: " . $r->code() . "\nMessage: " . $r->decoded_content();
+            print "Tenable.io returned error code: " . $r->code() . "\nMessage: " . $r->decoded_content();
             print "\n$retries retries left\n";
         }
         if ( $retries > 0 ) {
             print "Sleeping for 30 seconds before retring\n" unless $quiet;
             sleep 30;
             return(rest_call($method,$uri,$param,$response,$nojson,$retries-1))
         } else {
-            die "No more retries!\ntenable.io returned error code: " . $r->code() . "\nMessage: " . $r->decoded_content() . " ";
+            die "No more retries!\nTenable.io returned error code: " . $r->code() . "\nMessage: " . $r->decoded_content() . " ";
         }
     }
 

t/91_testssl.sh.t

@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2017-2017 Frank Breedijk
+# Copyright 2017-2018 Frank Breedijk
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -130,7 +130,7 @@ foreach my $f ( @{$t->{tx}->res()->json()} ) {
     unless( $f->{plugin} eq "scanTime" ) {
         like($f->{host},qr/^www\.seccubus\.com\/ipv[46]$/, "Finding $f->{id} has the right hostname");
     }
-    if ( $f->{plugin} =~ /^(X\-Served\-By|http_clock_skew|rp_header|order(_cipher)?|cbc_tls\d|CAA_record)$/ ) {
+    if ( $f->{plugin} =~ /^(X\-Served\-By|http_clock_skew|rp_header|order(_cipher)?|cbc_tls\d|CAA_record|X-Cache-Hits: \d+)$/ ) {
         # May or may not differ
     } elsif( undef ) {
         like($f->{find},qr/^Findings vary per endpoint/,"Findings vary across endpoints for plugin '$f->{plugin}'");