Added banner recognition for basic discovery of services

1 files changed, 14 insertions, 2 deletions

diff --git a/src/main/java/com/it_jaros/jscanner/App.java b/src/main/java/com/it_jaros/jscanner/App.java
index c94b2df..c7d0dbf 100644
--- a/src/main/java/com/it_jaros/jscanner/App.java
+++ b/src/main/java/com/it_jaros/jscanner/App.java
@@ -31,10 +31,10 @@ public class App {
 
         System.out.println(result.host());
         if (!result.openPorts().isEmpty()) {
-            System.out.printf("\t (%d) open:\t%s%n", result.openPorts().cardinality(), map(result.openPorts()));
+            System.out.printf("\t (%d) open:\t%s%n", result.openPorts().cardinality(), map(result.openPorts(), result.bannerRecognition()));
         }
         if (showFilteredPorts && !result.filteredPorts().isEmpty()) {
-            System.out.printf("\t (%d) filtered:\t%s%n", result.filteredPorts().cardinality(), map(result.filteredPorts()));
+            System.out.printf("\t (%d) filtered:\t%s%n", result.filteredPorts().cardinality(), map(result.filteredPorts(), null));
         }
         System.out.println();
     }
@@ -42,4 +42,16 @@ public class App {
     private static String map(BitSet ports) {
         return ports.stream().mapToObj(String::valueOf).collect(Collectors.joining(","));
     }
+
+    private static String map(BitSet ports, java.util.HashMap<Integer, ServiceType> bannerRecognition) {
+        return ports.stream().mapToObj(port -> {
+            ServiceType serviceType = bannerRecognition.getOrDefault(port, ServiceType.UNKNOWN);
+
+            if (serviceType == ServiceType.UNKNOWN) {
+                return String.valueOf(port);
+            }
+
+            return port + "/" + serviceType.name().toLowerCase();
+        }).collect(Collectors.joining(","));
+    }
 }