Updated docker tests and README due to merge of PR #281.

2024-11-21 10:01:41 +01:00 · 2024-07-05 10:53:00 -04:00 · 2024-07-05 10:53:00 -04:00 · 92db5f0138
commit 92db5f0138
parent bc2a89eb11
20 changed files with 39 additions and 19 deletions
--- a/README.md
+++ b/README.md
@ -216,6 +216,7 @@ For convenience, a web front-end on top of the command-line tool is available at
 ### v3.3.0-dev (???)
 - Added built-in policies for Ubuntu 24.04 LTS server and client, and OpenSSH 9.8.
 - Added IPv6 support for DHEat and connection rate tests.
+ - Added TCP port information to JSON policy scan results; credit [Fabian Malte Kopp](https://github.com/dreizehnutters).
 - Fixed crash when running with `-P` and `-T` options simultaneously.
 - Fixed host key tests from only reporting a key type at most once despite multiple hosts supporting it; credit [Daniel Lenski](https://github.com/dlenskiSB).

--- a/test/docker/expected_results/openssh_5.6p1_custom_policy_test1.json
+++ b/test/docker/expected_results/openssh_5.6p1_custom_policy_test1.json
@ -2,5 +2,6 @@
    "errors": [],
    "host": "localhost",
    "passed": true,
-    "policy": "Docker policy: test1 (version 1)"
+    "policy": "Docker policy: test1 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_5.6p1_custom_policy_test10.json
+++ b/test/docker/expected_results/openssh_5.6p1_custom_policy_test10.json
@ -27,5 +27,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker poliicy: test10 (version 1)"
+    "policy": "Docker poliicy: test10 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_5.6p1_custom_policy_test2.json
+++ b/test/docker/expected_results/openssh_5.6p1_custom_policy_test2.json
@ -19,5 +19,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker policy: test2 (version 1)"
+    "policy": "Docker policy: test2 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_5.6p1_custom_policy_test3.json
+++ b/test/docker/expected_results/openssh_5.6p1_custom_policy_test3.json
@ -18,5 +18,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker policy: test3 (version 1)"
+    "policy": "Docker policy: test3 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_5.6p1_custom_policy_test4.json
+++ b/test/docker/expected_results/openssh_5.6p1_custom_policy_test4.json
@ -28,5 +28,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker policy: test4 (version 1)"
+    "policy": "Docker policy: test4 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_5.6p1_custom_policy_test5.json
+++ b/test/docker/expected_results/openssh_5.6p1_custom_policy_test5.json
@ -27,5 +27,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker policy: test5 (version 1)"
+    "policy": "Docker policy: test5 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_5.6p1_custom_policy_test7.json
+++ b/test/docker/expected_results/openssh_5.6p1_custom_policy_test7.json
@ -2,5 +2,6 @@
    "errors": [],
    "host": "localhost",
    "passed": true,
-    "policy": "Docker poliicy: test7 (version 1)"
+    "policy": "Docker poliicy: test7 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_5.6p1_custom_policy_test8.json
+++ b/test/docker/expected_results/openssh_5.6p1_custom_policy_test8.json
@ -15,5 +15,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker poliicy: test8 (version 1)"
+    "policy": "Docker poliicy: test8 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_5.6p1_custom_policy_test9.json
+++ b/test/docker/expected_results/openssh_5.6p1_custom_policy_test9.json
@ -15,5 +15,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker poliicy: test9 (version 1)"
+    "policy": "Docker poliicy: test9 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_builtin_policy_test1.json
+++ b/test/docker/expected_results/openssh_8.0p1_builtin_policy_test1.json
@ -39,5 +39,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Hardened OpenSSH Server v8.0 (version 4)"
+    "policy": "Hardened OpenSSH Server v8.0 (version 4)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_builtin_policy_test2.json
+++ b/test/docker/expected_results/openssh_8.0p1_builtin_policy_test2.json
@ -62,5 +62,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Hardened OpenSSH Server v8.0 (version 4)"
+    "policy": "Hardened OpenSSH Server v8.0 (version 4)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_custom_policy_test11.json
+++ b/test/docker/expected_results/openssh_8.0p1_custom_policy_test11.json
@ -2,5 +2,6 @@
    "errors": [],
    "host": "localhost",
    "passed": true,
-    "policy": "Docker policy: test11 (version 1)"
+    "policy": "Docker policy: test11 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_custom_policy_test12.json
+++ b/test/docker/expected_results/openssh_8.0p1_custom_policy_test12.json
@ -39,5 +39,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker policy: test12 (version 1)"
+    "policy": "Docker policy: test12 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_custom_policy_test13.json
+++ b/test/docker/expected_results/openssh_8.0p1_custom_policy_test13.json
@ -2,5 +2,6 @@
    "errors": [],
    "host": "localhost",
    "passed": true,
-    "policy": "Docker policy: test13 (version 1)"
+    "policy": "Docker policy: test13 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_custom_policy_test14.json
+++ b/test/docker/expected_results/openssh_8.0p1_custom_policy_test14.json
@ -15,5 +15,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker policy: test14 (version 1)"
+    "policy": "Docker policy: test14 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_custom_policy_test15.json
+++ b/test/docker/expected_results/openssh_8.0p1_custom_policy_test15.json
@ -2,5 +2,6 @@
    "errors": [],
    "host": "localhost",
    "passed": true,
-    "policy": "Docker policy: test15 (version 1)"
+    "policy": "Docker policy: test15 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_custom_policy_test16.json
+++ b/test/docker/expected_results/openssh_8.0p1_custom_policy_test16.json
@ -82,5 +82,6 @@
    ],
    "host": "localhost",
    "passed": false,
-    "policy": "Docker policy: test16 (version 1)"
+    "policy": "Docker policy: test16 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_custom_policy_test17.json
+++ b/test/docker/expected_results/openssh_8.0p1_custom_policy_test17.json
@ -2,5 +2,6 @@
    "errors": [],
    "host": "localhost",
    "passed": true,
-    "policy": "Docker policy: test17 (version 1)"
+    "policy": "Docker policy: test17 (version 1)",
+    "port": 2222
 }
--- a/test/docker/expected_results/openssh_8.0p1_custom_policy_test6.json
+++ b/test/docker/expected_results/openssh_8.0p1_custom_policy_test6.json
@ -2,5 +2,6 @@
    "errors": [],
    "host": "localhost",
    "passed": true,
-    "policy": "Docker policy: test6 (version 1)"
+    "policy": "Docker policy: test6 (version 1)",
+    "port": 2222
 }