Merge pull request CactuseSecurity#3073 from Y4nnikH/feat/rsb-enhancements

feat(ui): rsb enhancements

Author: tpurschke

roles/lib/files/FWO.Api.Client/APIcalls/allObjects/getAllObjectDetails.graphql

@@ -2,7 +2,8 @@ query getAllObjectDetails (
   $management_id: [Int!]
   $type: [String!]
   $uid: [String!]
-  $import_id: bigint
+  $import_id_start: bigint
+  $import_id_end: bigint
   $obj_name: [String!]
   $limit: Int
   $offset: Int
@@ -25,8 +26,8 @@ query getAllObjectDetails (
       offset: $offset
       where: {
         stm_obj_typ: { obj_typ_name: { _in: $type } }
-        obj_last_seen: { _gte: $import_id }
-        obj_create: { _lte: $import_id }
+        obj_last_seen: { _gte: $import_id_start }
+        obj_create: { _lte: $import_id_end }
         obj_name: { _in: $obj_name }
         obj_uid: { _in: $uid }
       }
@@ -39,8 +40,8 @@ query getAllObjectDetails (
       offset: $offset
       where: {
         stm_svc_typ: { svc_typ_name: { _in: $type } }
-        svc_last_seen: { _gte: $import_id }
-        svc_create: { _lte: $import_id }
+        svc_last_seen: { _gte: $import_id_start }
+        svc_create: { _lte: $import_id_end }
         svc_name: { _in: $obj_name }
         svc_uid: { _in: $uid }
       }
@@ -53,8 +54,8 @@ query getAllObjectDetails (
       offset: $offset
       where: {
         stm_usr_typ: { usr_typ_name: { _in: $type } }
-        user_last_seen: { _gte: $import_id }
-        user_create: { _lte: $import_id }
+        user_last_seen: { _gte: $import_id_start }
+        user_create: { _lte: $import_id_end }
         user_name: { _in: $obj_name }
         user_uid: { _in: $uid }
       }

roles/lib/files/FWO.Api.Client/APIcalls/networkObject/getNetworkObjectDetails.graphql

@@ -2,7 +2,8 @@ query getNetworkObjectDetails(
   $management_id: [Int!]
   $nwObjTyp: [String!]
   $nwObjUid: [String!]
-  $import_id: bigint
+  $import_id_start: bigint
+  $import_id_end: bigint
   $obj_name: [String!]
   $obj_ip: [cidr!]
   $limit: Int
@@ -16,8 +17,8 @@ query getNetworkObjectDetails(
       offset: $offset
       where: {
         stm_obj_typ: { obj_typ_name: { _in: $nwObjTyp } }
-        obj_last_seen: { _gte: $import_id }
-        obj_create: { _lte: $import_id }
+        obj_last_seen: { _gte: $import_id_start }
+        obj_create: { _lte: $import_id_end }
         obj_name: { _in: $obj_name }
         obj_ip: { _in: $obj_ip }
         obj_uid: { _in: $nwObjUid }

roles/lib/files/FWO.Api.Client/APIcalls/networkService/getNetworkServiceDetails.graphql

@@ -1,6 +1,7 @@
 query getNetworkServiceDetails(
   $management_id: [Int!]
-  $import_id: bigint
+  $import_id_start: bigint
+  $import_id_end: bigint
   $svc_name: [String!]
   $svc_port: [Int!]
   $limit: Int
@@ -13,8 +14,8 @@ query getNetworkServiceDetails(
       limit: $limit
       offset: $offset
       where: {
-        svc_last_seen: { _gte: $import_id }
-        svc_create: { _lte: $import_id }
+        svc_last_seen: { _gte: $import_id_start }
+        svc_create: { _lte: $import_id_end }
         svc_name: { _in: $svc_name }
         svc_port: { _in: $svc_port }
       }

roles/lib/files/FWO.Api.Client/APIcalls/rule/getRuleDetails.graphql

@@ -5,6 +5,7 @@ query getRuleDetails(
   $rule_uid: [String!]
   $ruleSrcName: [String!]
   $ruleSrcIp: [cidr!]
+  $import_id: bigint
   $limit: Int
   $offset: Int
 ) {
@@ -26,7 +27,8 @@ query getRuleDetails(
         where: {
           rule_id: { _in: $rule_id }
           rule_uid: { _in: $rule_uid }
-          active: { _eq: true }
+          rule_last_seen: { _gte: $import_id }
+          rule_create: { _lte: $import_id }
           rule_src: { _in: $ruleSrcName }
           rule_froms: { object: { obj_ip: { _in: $ruleSrcIp } } }
           access_rule: { _eq: true }

roles/lib/files/FWO.Api.Client/APIcalls/user/getUserDetails.graphql

@@ -1,6 +1,7 @@
 query getUserDetails(
   $management_id: [Int!]
-  $import_id: bigint
+  $import_id_start: bigint
+  $import_id_end: bigint
   $user_name: [String!]
   $limit: Int
   $offset: Int
@@ -12,8 +13,8 @@ query getUserDetails(
       limit: $limit
       offset: $offset
       where: {
-        user_last_seen: { _gte: $import_id }
-        user_create: { _lte: $import_id }
+        user_last_seen: { _gte: $import_id_start }
+        user_create: { _lte: $import_id_end }
         user_name: { _in: $user_name }
       }
       order_by: [{ user_name: asc }, { user_id: asc }]

roles/lib/files/FWO.Data/Rule.cs

@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization; 
+using System.Text.Json.Serialization; 
 using Newtonsoft.Json;
 
 namespace FWO.Data
@@ -96,6 +96,7 @@ public class Rule
         public NetworkLocation[] DisregardedFroms { get; set; } = [];
         public NetworkLocation[] DisregardedTos { get; set; } = [];
         public bool ShowDisregarded { get; set; } = false;
+        public bool Detailed = false;
 
         public bool IsDropRule()
         {

roles/lib/files/FWO.Report.Filter/DynGraphqlQuery.cs

@@ -416,7 +416,7 @@ private static void SetTimeFilter(ref DynGraphqlQuery query, TimeFilter? timeFil
             }
         }
 
-        private static (string, string) ResolveTimeRange(TimeFilter timeFilter)
+        public static (string, string) ResolveTimeRange(TimeFilter timeFilter)
         {
             string start;
             string stop;

roles/lib/files/FWO.Report/Data/ManagementReport.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System.Text.Json.Serialization;
 using FWO.Data;
 
@@ -59,6 +59,7 @@ public class ManagementReport
         public List<long> RelevantObjectIds = [];
         public List<long> HighlightedObjectIds = [];
 
+        public bool[] Detailed = [false, false, false]; // nobj, nsrv, user
 
         public ManagementReport()
         {}

roles/ui/files/FWO.UI/Pages/Reporting/Report.razor

@@ -47,7 +47,7 @@
             <div class="p-3">
                 <h5 class="text-left">@(userConfig.GetText("report_time"))</h5>
                 <div class="input-group">
-                    <input type="text" class="form-control form-control-sm" value="@actReportFilters.DisplayedTimeSelection" />
+                    <input type="text" class="form-control form-control-sm" value="@actReportFilters.DisplayedTimeSelection" disabled />
                     <button type="button" class="btn btn-sm btn-secondary" @onclick="SelectTime">@(userConfig.GetText("change"))</button>
                 </div>
             </div>
@@ -155,7 +155,8 @@
     <RightSidebar @bind-Width="sidebarRightWidth" CurrentReport="currentReport"
         @bind-SelectedRules="selectedItemsRuleReportTable" 
         AllTabVisible="(tenantFilteringAllowed && actReportFilters.SelectedTenant == null)"
-        SelectedReportType = "actReportFilters.ReportType"/>
+        SelectedReportType="actReportFilters.ReportType"
+        LSBTime="actReportFilters.TimeFilter"/>
 }
 
 @* ==== POPUPS ==== *@

roles/ui/files/FWO.UI/Pages/Reporting/ReportSelectTime.razor

@@ -1,10 +1,10 @@
-@using FWO.Report
+@using FWO.Report
 @using FWO.Report.Filter
 
 @inject UserConfig userConfig
 
 
-<PopUp Size=PopupSize.Small Title="@(userConfig.GetText("report_time"))" Show="@Display">
+<PopUp Size=PopupSize.Small Title="@(userConfig.GetText("report_time"))" Show="@Display" OnClose="Close">
     <Body>
         <div>
             @if (SelectedReportType.IsChangeReport())