Added s7comm to historical flows / added details to historical

Author: MatteoBiscosi

http_src/vue/ntop_vue.js

@@ -94,6 +94,7 @@ import { default as PageExporterInterfaceOverview } from "./page-exporter-interf
 
 /* Flow Details pages */
 import { default as PageFlowDetailsModbus } from "./page-flow-details-modbus.vue"
+import { default as PageFlowDetailsS7Comm } from "./page-flow-details-s7comm.vue"
 
 /* Config pages */
 import { default as PageSNMPConfig } from "./page-snmp-config.vue"
@@ -206,6 +207,7 @@ let ntopVue = {
 
     /* Flow Details pages */
     PageFlowDetailsModbus: PageFlowDetailsModbus,
+    PageFlowDetailsS7Comm: PageFlowDetailsS7Comm,
 
     /* SNMP */
     PageSNMPDevices: PageSNMPDevices,

http_src/vue/page-assets.vue

@@ -188,6 +188,9 @@ const map_table_def_columns = (columns) => {
             if (!dataUtils.isEmptyOrNull(host.is_modbus_server)) {
                 icons = `${icons} <span class="badge bg-success">${i18n("details.label_modbus_server")}</span>`
             }
+            if (!dataUtils.isEmptyOrNull(host.is_s7comm_server)) {
+                icons = `${icons} <span class="badge bg-success">${i18n("details.label_s7comm_server")}</span>`
+            }
 
             const host_url = create_button_host_details(row);
 

http_src/vue/page-flow-details-s7comm.vue

@@ -1,6 +1,18 @@
 <template>
     <div class="m-2 mb-3 row">
         <div class="row">
+            <Transition name="add-effect" mode="out-in">
+                <div class="position-relative col-6">
+                    <div class="card card-shadow">
+                        <div class="card-body">
+                            <NetworkMap ref="s7comm_map" :empty_message="no_transitions_message" :height="'30vh'"
+                                :page_csrf="props.context.csrf" :url="s7comm_map_url" :url_params="getExtraParameters()"
+                                :map_id="'s7comm_transition_map'">
+                            </NetworkMap>
+                        </div>
+                    </div>
+                </div>
+            </Transition>
             <Transition name="add-effect" mode="out-in">
                 <div class="position-relative col-6">
                     <BootstrapTable id="s7comm_bootstrap_table" :columns="stats_columns" :rows="stats_rows"
@@ -9,9 +21,11 @@
                     </BootstrapTable>
                 </div>
             </Transition>
+        </div>
+        <div class="mt-2 row">
             <Transition name="add-effect" mode="out-in">
                 <div class="position-relative col-6">
-                    <TableWithConfig ref="table_s7comm_function_codes" :table_id="'s7comm_functions'"
+                    <TableWithConfig ref="table_s7comm_function_codes" :table_id="'s7comm_function_codes'"
                         :showLoading="true" :f_map_columns="mapTableColumns" :f_sort_rows="columnsSorting"
                         :get_extra_params_obj="getExtraParameters">
                         <template v-slot:custom_header>
@@ -28,6 +42,7 @@
 
 <script setup>
 import { ref, onMounted, onBeforeMount, computed } from "vue";
+import { default as NetworkMap } from "./network-map.vue";
 import { default as BootstrapTable } from "./bootstrap-table.vue";
 import { default as sortingFunctions } from "../utilities/sorting-utils.js";
 import { default as TableWithConfig } from "./table-with-config.vue";
@@ -43,6 +58,8 @@ const table_s7comm_functions = ref(null);
 const stats_rows = ref([]);
 const s7comm_general_stats_url = '/lua/pro/rest/v2/get/flow/s7comm/general_stats.lua'
 const no_transitions_message = i18n('flow_details.s7comm_no_transitions')
+const s7comm_map = ref(null)
+const s7comm_map_url = `${http_prefix}/lua/pro/rest/v2/get/flow/s7comm/map.lua`
 const stats_columns = ref([{
     name: _i18n("map_page.info"),
     id: "info"
@@ -111,7 +128,7 @@ function print_stats_row(col, row) {
 
 function columnsSorting(col, r0, r1) {
     if (col != null) {
-        if (col.id == "s7comm_function") {
+        if (col.id == "s7comm_function_code") {
             return sortingFunctions.sortByName(r0.s7comm_function_code, r1.s7comm_function_code, col.sort);
         } else if (col.id == "num_uses") {
             return sortingFunctions.sortByNumber(r0.num_uses, r1.num_uses, col.sort);
@@ -125,7 +142,7 @@ function columnsSorting(col, r0, r1) {
 
 const mapTableColumns = (columns) => {
     let map_columns = {
-        "s7comm_function": (value) => {
+        "s7comm_function_code": (value) => {
             return value;
         },
         "num_uses": (value) => {

…pdocs/tables_config/s7comm_function.json …tables_config/s7comm_function_codes.jsonhttpdocs/tables_config/s7comm_function.json renamed to httpdocs/tables_config/s7comm_function_codes.json httpdocs/tables_config/s7comm_function.json renamed to httpdocs/tables_config/s7comm_function_codes.json

@@ -1,6 +1,6 @@
 {
-	"id": "s7comm_functions",
-	"data_url": "lua/pro/rest/v2/get/flow/s7comm/functions.lua",
+	"id": "s7comm_function_codes",
+	"data_url": "lua/pro/rest/v2/get/flow/s7comm/function_codes.lua",
 	"use_current_page": false,
 	"enable_search": true,
 	"paging": false,
@@ -12,7 +12,7 @@
 	"columns": [
 		{
 			"title_i18n": "id",
-			"data_field": "s7comm_function",
+			"data_field": "s7comm_function_code",
 			"min-width": "80px",
 			"sortable": true,
 			"class": []

include/Host.h

@@ -248,6 +248,11 @@ class Host : public GenericHashEntry,
     return (host_services_bitmap & (1 << HOST_IS_MODBUS_SERVER));
   }
   virtual void setModbusServer();
+    
+  inline bool isS7CommServer() const {
+    return (host_services_bitmap & (1 << HOST_IS_S7COMM_SERVER));
+  }
+  virtual void setS7CommServer();
 
   inline bool isSmtpServer() const {
     return (host_services_bitmap & (1 << HOST_IS_SMTP_SERVER));

include/IpAddress.h

@@ -30,7 +30,7 @@ struct ipAddress {
 
   u_int8_t dnsServer : 1, dhcpServer : 1, smtpServer : 1, ntpServer : 1,
     imapServer : 1, popServer : 1, gateway: 1,   httpServer : 1;
-  u_int8_t sshServer : 1, rdpServer : 1, modbusServer : 1, unused : 5;
+  u_int8_t sshServer : 1, rdpServer : 1, modbusServer : 1, s7commServer : 1, unused : 4;
 
   union {
     struct ndpi_in6_addr ipv6;
@@ -129,6 +129,8 @@ class IpAddress {
   inline void setDnsServer() { addr.dnsServer = true; }
   inline bool isModbusServer() const { return (addr.modbusServer); }
   inline void setModbusServer() { addr.modbusServer = true; }
+  inline bool isS7CommServer() const { return (addr.s7commServer); }
+  inline void setS7CommServer() { addr.s7commServer = true; }
   inline bool isSmtpServer() const { return (addr.smtpServer); }
   inline void setSmtpServer() { addr.smtpServer = true; }
   inline bool isImapServer() const { return (addr.imapServer); }

include/LocalHost.h

@@ -207,6 +207,7 @@ class LocalHost : public Host {
   void setDnsServer();
   void setSmtpServer();
   void setModbusServer();
+  void setModbusServer();
   void setNtpServer();
   void setImapServer();
   void setPopServer();

include/ntop_defines.h

@@ -398,7 +398,8 @@
 #define HOST_IS_HTTP_SERVER 0x07
 #define HOST_IS_SSH_SERVER 0x08
 #define HOST_IS_RDP_SERVER 0x09
-#define HOST_IS_MODBUS_SERVER 0x10
+#define HOST_IS_MODBUS_SERVER 0x0A
+#define HOST_IS_S7COMM_SERVER 0x0B
 
 #define MAX_DYNAMIC_STATS_VALUES 12
 

scripts/locales/en.lua

@@ -2743,6 +2743,7 @@ local lang = {
     ["label_ssh_server"] = "SSH",
     ["label_rdp_server"] = "RDP",
     ["label_modbus_server"] = "Modbus",
+    ["label_s7comm_server"] = "S7Comm",
     ["label_private_ip"] = "Private",
     ["label_remote"] = "Remote",
     ["label_short_blackhole"] = "H",
@@ -3588,6 +3589,7 @@ local lang = {
     ["modbus_transitions"] = "Function Code Transitions",
     ["modbus_function_codes_transitions"] = "Transitions",
     ["modbus_no_transitions"] = "No Transitions",
+    ["s7comm_no_transitions"] = "No Transitions",
     ["s7comm_errors"] = "Errors",
     ["s7comm_requests"] = "Requests",
     ["s7comm_responses"] = "Responses",

scripts/lua/flow_details.lua

@@ -550,6 +550,7 @@ local flow_key = _GET["flow_key"]
 local flow_hash_id = _GET["flow_hash_id"]
 
 flow = interface.findFlowByKeyAndHashId(tonumber(flow_key), tonumber(flow_hash_id))
+ --tprint(flow)
 
 local ifid = interface.name2id(ifname)
 local label = getFlowLabel(flow, nil, nil, nil, nil, nil, false)
@@ -566,6 +567,11 @@ page_utils.print_navbar(title, url, {{
    active = page == "modbus",
    page_name = "modbus",
    label = i18n("details.label_modbus_server")
+}, {
+   hidden = not (flow.s7comm) or not ntop.isEnterpriseL(),
+   active = page == "s7comm",
+   page_name = "s7comm",
+   label = i18n("details.label_s7comm_server")
 }})
 
 if isEmptyString(page) or page == "overview" then
@@ -2411,5 +2417,15 @@ elseif page == "modbus" then
       vue_page_name = "PageFlowDetailsModbus",
       page_context = json_context
    })
+elseif page == "s7comm" then
+   local json = require "dkjson"
+   local json_context = json.encode({
+      csrf = ntop.getRandomCSRFValue()
+   })
+
+   template.render("pages/vue_page.template", {
+      vue_page_name = "PageFlowDetailsS7Comm",
+      page_context = json_context
+   })
 end
 dofile(dirs.installdir .. "/scripts/lua/inc/footer.lua")