(ids) add missing fileid in alert info

src/opnsense/mvc/app/controllers/OPNsense/IDS/Api/ServiceController.php

@@ -251,15 +251,16 @@ class ServiceController extends ApiControllerBase
 
     /**
      * fetch alert detailed info
-     * @param $alertId alert id, position in log file
+     * @param string $alertId alert id, position in log file
+     * @param string $fileid log file id number (empty for standard)
      * @return array alert info
      */
-    public function getAlertInfoAction($alertId)
+    public function getAlertInfoAction($alertId, $fileid = "")
     {
         $backend = new Backend();
         $filter = new Filter();
         $id = $filter->sanitize($alertId, "int");
-        $response = $backend->configdpRun("ids query alerts", array(1, 0, "filepos/".$id));
+        $response = $backend->configdpRun("ids query alerts", array(1, 0, "filepos/".$id, $fileid));
         $result = json_decode($response, true);
         if ($result != null && count($result['rows']) > 0) {
             return $result['rows'][0];

src/opnsense/mvc/app/views/OPNsense/IDS/index.volt

@@ -246,7 +246,7 @@ POSSIBILITY OF SUCH DAMAGE.
                                 requestHandler:addAlertQryFilters,
                                 formatters:{
                                     info: function (column, row) {
-                                        return "<button type=\"button\" class=\"btn btn-xs btn-default command-edit\" data-row-id=\"" + row.filepos + "\"><span class=\"fa fa-info-circle\"></span></button> ";
+                                        return "<button type=\"button\" class=\"btn btn-xs btn-default command-edit\" data-row-id=\"" + row.filepos + "/" + row.fileid + "\"><span class=\"fa fa-info-circle\"></span></button> ";
                                     }
                                 },
                             }

src/opnsense/scripts/suricata/queryAlertLog.py

@@ -96,6 +96,7 @@ if os.path.exists(suricata_log):
         if 'alert' in record:
             # add position in file
             record['filepos'] = line['pos']
+            record['fileid'] = parameters['fileid']
             # flatten structure
             record['alert_sid'] = record['alert']['signature_id']
             record['alert'] = record['alert']['signature']