Merge branch 'CactuseSecurity:develop' into develop

Author: SolidProgramming

roles/common/files/fwo-api-calls/rule/fragments/ruleDetails.graphql

@@ -29,6 +29,22 @@ fragment ruleDetails on rule {
   rule_name
   rule_installon
   rule_custom_fields
+  rule_time
+  rule_times{
+    rule_time_id
+    rule_id
+    time_obj_id
+    created
+    removed
+    time_object {
+      time_obj_id
+      time_obj_name
+      time_obj_uid
+      start_time
+      end_time
+      created
+    }
+  }
   access_rule
   nat_rule
   xlate_rule

roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsForReport.graphql

@@ -35,6 +35,22 @@
   rule_name
   rule_installon
   rule_custom_fields
+  rule_time
+  rule_times {
+    rule_time_id
+    rule_id
+    time_obj_id
+    created
+    removed
+    time_object {
+      time_obj_id
+      time_obj_name
+      time_obj_uid
+      start_time
+      end_time
+      created
+    }
+  }
   access_rule
   nat_rule
   xlate_rule  

roles/common/files/fwo-api-calls/rule/fragments/ruleOverview.graphql

@@ -32,6 +32,22 @@ fragment ruleOverview on rule {
   rule_name
   rule_custom_fields
   rule_installon
+  rule_time
+  rule_times {
+    rule_time_id
+    rule_id
+    time_obj_id
+    created
+    removed
+    time_object {
+      time_obj_id
+      time_obj_name
+      time_obj_uid
+      start_time
+      end_time
+      created
+    }
+  }
   access_rule
   nat_rule
   xlate_rule

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

@@ -132,6 +132,9 @@ public class Rule
         [JsonProperty("rule_time"), JsonPropertyName("rule_time")]
         public string? Time { get; set; }
 
+        [JsonProperty("rule_times"), JsonPropertyName("rule_times")]
+        public List<RuleTime> RuleTimes { get; set; } = [];
+
         [JsonProperty("violations"), JsonPropertyName("violations")]
         public List<ComplianceViolation> Violations { get; set; } = [];
 
@@ -208,6 +211,7 @@ public Rule(Rule rule)
             EnforcingGateways = rule.EnforcingGateways;
             InstallOn = rule.InstallOn;
             Time = rule.Time;
+            RuleTimes = rule.RuleTimes;
             Violations = rule.Violations;
             Rulebase = rule.Rulebase;
             LastChangeAdmin = rule.LastChangeAdmin;

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

@@ -14,7 +14,13 @@ public class RuleTime
         [JsonProperty("time_obj_id"), JsonPropertyName("time_obj_id")]
         public long TimeObjId { get; set; }
 
+        [JsonProperty("created"), JsonPropertyName("created")]
+        public long Created { get; set; }
+
         [JsonProperty("removed"), JsonPropertyName("removed")]
-        public int Removed { get; set; } = 0;
+        public long? Removed { get; set; }
+
+        [JsonProperty("time_object"), JsonPropertyName("time_object")]
+        public TimeObject? TimeObj { get; set; }
     }
 }

roles/lib/files/FWO.Report/Data/ViewData/RuleViewData.cs

@@ -30,6 +30,7 @@ public class RuleViewData : IRuleViewData
         public string RulebaseId { get; set; } = "";
         public string RulebaseName { get; set; } = "";
         public string Enabled { get; set; } = "";
+        public string RuleTime { get; set; } = "";
 
         public Rule? DataObject { get; set; }
         public bool Show { get; set; } = true;
@@ -63,6 +64,7 @@ public RuleViewData(Rule rule, NatRuleDisplayHtml natRuleDisplayHtml, OutputLoca
             AdoITID = SafeCall(rule, "AdoITID", () => GetFromCustomField(rule, ["field-3", "AdoIT"]));
             Comment = SafeCall(rule, "Comment", () => rule.Comment ?? "");
             LastModified = SafeCall(rule, "LastModified", () => RuleDisplayBase.DisplayLastModified(rule));
+            RuleTime = SafeCall(rule, "RuleTime", () => natRuleDisplayHtml.DisplayRuleTime(rule));
             RulebaseId = SafeCall(rule, "RulebaseId", () => rule.RulebaseId.ToString());
             RulebaseName = SafeCall(rule, "RulebaseName", () => rule.Rulebase?.Name ?? "");
             Enabled = SafeCall(rule, "Enabled", () => RuleDisplayBase.DisplayEnabled(rule, outputLocation));

roles/lib/files/FWO.Report/Display/RuleDisplayHtml.cs

@@ -8,6 +8,13 @@ namespace FWO.Ui.Display
 {
     public class RuleDisplayHtml(UserConfig userConfig) : RuleDisplayBase(userConfig)
     {
+        public string DisplayRuleTime(Rule rule)
+        {
+            // Quick implementation to satisfy current requirements: use only the first time object with an EndTime.
+            DateTime? firstEndTime = rule.RuleTimes.FirstOrDefault(ruleTime => ruleTime.TimeObj?.EndTime != null)?.TimeObj?.EndTime;
+            return firstEndTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? "";
+        }
+
         public string DisplaySource(Rule rule, OutputLocation location, ReportType reportType, int chapterNumber = 0, string style = "", bool overwriteIsResolvedReport = false)
         {
             return DisplaySourceOrDestination(rule, chapterNumber, location, reportType, style, true, overwriteIsResolvedReport);

roles/tests-unit/files/FWO.Test/ExportTest.cs

@@ -482,7 +482,7 @@ public void RulesGenerateJson()
                                         "\"rule_action\": \"accept\",\"rule_track\": \"none\",\"section_header\": \"\"," +
                                         "\"rule_metadatum\": {\"rule_metadata_id\": 0,\"rule_created\": null,\"created_import\": null,\"removed\": null,\"removed_import\": null,\"rule_first_hit\": null,\"rule_last_hit\": \"2022-04-19T00:00:00\",\"recertification\": [],\"recert_history\": [],\"rule_uid\": \"\",\"rules\": [],\"Recert\": false}," +
                                         "\"translate\": {\"rule_svc_neg\": false,\"rule_svc\": \"\",\"rule_services\": [],\"rule_src_neg\": false,\"rule_src\": \"\",\"rule_froms\": [],\"rule_dst_neg\": false,\"rule_dst\": \"\",\"rule_tos\": []}," +
-                                        "\"owner_name\": \"\",\"owner_id\": null,\"matches\": \"\",\"rule_custom_fields\": \"\",\"rule_implied\": false,\"nat_rule\": false,\"rulebase_id\": 0,\"rule_num\": 0,\"rule_enforced_on_gateways\": [],\"rule_installon\": null,\"rule_time\": null,\"violations\": [],\"rulebase\": {\"id\": 0,\"name\": \"\",\"uid\": \"\",\"mgm_id\": 0,\"is_global\": false,\"created\": 0,\"removed\": 0,\"rules\": []},\"uiuser\": null,\"rule\": null,\"ChangeID\": \"\",\"AdoITID\": \"\",\"Compliance\": 0,\"ViolationDetails\": \"\",\"DisplayOrderNumberString\": \"1\",\"DisplayOrderNumber\": 1,\"Certified\": false,\"DeviceName\": \"\",\"RulebaseName\": \"\",\"DisregardedFroms\": [],\"DisregardedTos\": [],\"DisregardedServices\": [],\"ShowDisregarded\": false}," +
+                                        "\"owner_name\": \"\",\"owner_id\": null,\"matches\": \"\",\"rule_custom_fields\": \"\",\"rule_implied\": false,\"nat_rule\": false,\"rulebase_id\": 0,\"rule_num\": 0,\"rule_enforced_on_gateways\": [],\"rule_installon\": null,\"rule_time\": null,\"rule_times\": [],\"violations\": [],\"rulebase\": {\"id\": 0,\"name\": \"\",\"uid\": \"\",\"mgm_id\": 0,\"is_global\": false,\"created\": 0,\"removed\": 0,\"rules\": []},\"uiuser\": null,\"rule\": null,\"ChangeID\": \"\",\"AdoITID\": \"\",\"Compliance\": 0,\"ViolationDetails\": \"\",\"DisplayOrderNumberString\": \"1\",\"DisplayOrderNumber\": 1,\"Certified\": false,\"DeviceName\": \"\",\"RulebaseName\": \"\",\"DisregardedFroms\": [],\"DisregardedTos\": [],\"DisregardedServices\": [],\"ShowDisregarded\": false}," +
                                         "{\"rule_id\": 0,\"rule_uid\": \"uid2:123\",\"mgm_id\": 0,\"rule_num_numeric\": 0,\"rule_name\": \"TestRule2\",\"rule_comment\": \"comment2\",\"rule_disabled\": false," +
                                         "\"rule_services\": [{\"service\": {\"svc_id\": 2,\"svc_name\": \"TestService2\",\"svc_uid\": \"\",\"svc_port\": 6666,\"svc_port_end\": 7777,\"svc_source_port\": null,\"svc_source_port_end\": null,\"svc_code\": \"\",\"svc_timeout\": null,\"svc_typ_id\": null,\"active\": false,\"svc_create\": 0,\"svc_create_time\": {\"time\": \"0001-01-01T00:00:00\"},\"svc_last_seen\": 0,\"service_type\": {\"name\": \"\"},\"svc_comment\": \"\",\"svc_color_id\": null,\"stm_color\": null,\"ip_proto_id\": null,\"protocol_name\": {\"id\": 17,\"name\": \"UDP\"},\"svc_member_names\": \"\",\"svc_member_refs\": \"\",\"svcgrps\": [],\"svcgrp_flats\": [],\"svc_rpcnr\": null}}]," +
                                         "\"rule_svc_neg\": true,\"rule_svc\": \"\",\"rule_svc_refs\": \"\",\"rule_src_neg\": true,\"rule_src\": \"\",\"rule_src_refs\": \"\",\"rule_from_zones\": []," +
@@ -495,7 +495,7 @@ public void RulesGenerateJson()
                                         "\"rule_action\": \"deny\",\"rule_track\": \"none\",\"section_header\": \"\"," +
                                         "\"rule_metadatum\": {\"rule_metadata_id\": 0,\"rule_created\": null,\"created_import\": null,\"removed\": null,\"removed_import\": null,\"rule_first_hit\": null,\"rule_last_hit\": null,\"recertification\": [],\"recert_history\": [],\"rule_uid\": \"\",\"rules\": [],\"Recert\": false}," +
                                         "\"translate\": {\"rule_svc_neg\": false,\"rule_svc\": \"\",\"rule_services\": [],\"rule_src_neg\": false,\"rule_src\": \"\",\"rule_froms\": [],\"rule_dst_neg\": false,\"rule_dst\": \"\",\"rule_tos\": []}," +
-                                        "\"owner_name\": \"\",\"owner_id\": null,\"matches\": \"\",\"rule_custom_fields\": \"\",\"rule_implied\": false,\"nat_rule\": false,\"rulebase_id\": 0,\"rule_num\": 0,\"rule_enforced_on_gateways\": [],\"rule_installon\": null,\"rule_time\": null,\"violations\": [],\"rulebase\": {\"id\": 0,\"name\": \"\",\"uid\": \"\",\"mgm_id\": 0,\"is_global\": false,\"created\": 0,\"removed\": 0,\"rules\": []},\"uiuser\": null,\"rule\": null,\"ChangeID\": \"\",\"AdoITID\": \"\",\"Compliance\": 0,\"ViolationDetails\": \"\",\"DisplayOrderNumberString\": \"\",\"DisplayOrderNumber\": 2,\"Certified\": false,\"DeviceName\": \"\",\"RulebaseName\": \"\",\"DisregardedFroms\": [],\"DisregardedTos\": [],\"DisregardedServices\": [],\"ShowDisregarded\": false}]}]," +
+                                        "\"owner_name\": \"\",\"owner_id\": null,\"matches\": \"\",\"rule_custom_fields\": \"\",\"rule_implied\": false,\"nat_rule\": false,\"rulebase_id\": 0,\"rule_num\": 0,\"rule_enforced_on_gateways\": [],\"rule_installon\": null,\"rule_time\": null,\"rule_times\": [],\"violations\": [],\"rulebase\": {\"id\": 0,\"name\": \"\",\"uid\": \"\",\"mgm_id\": 0,\"is_global\": false,\"created\": 0,\"removed\": 0,\"rules\": []},\"uiuser\": null,\"rule\": null,\"ChangeID\": \"\",\"AdoITID\": \"\",\"Compliance\": 0,\"ViolationDetails\": \"\",\"DisplayOrderNumberString\": \"\",\"DisplayOrderNumber\": 2,\"Certified\": false,\"DeviceName\": \"\",\"RulebaseName\": \"\",\"DisregardedFroms\": [],\"DisregardedTos\": [],\"DisregardedServices\": [],\"ShowDisregarded\": false}]}]," +
                                         "\"changelog_rules\": null,\"changelog_objects\": null,\"changelog_services\": null,\"changelog_users\": null,\"import\": {\"aggregate\": {\"max\": {\"id\": null}}},\"import_controls\": [],\"RelevantImportId\": null,\"is_super_manager\": false,\"multi_device_manager_id\": null,\"management\": null,\"managementByMultiDeviceManagerId\": [],\"networkObjects\": [],\"serviceObjects\": [],\"userObjects\": [],\"zoneObjects\": []," +
                                         "\"reportNetworkObjects\": [{\"obj_id\": 1,\"obj_name\": \"TestIp1\",\"obj_ip\": \"1.2.3.4/32\",\"obj_ip_end\": \"1.2.3.4/32\",\"obj_uid\": \"\",\"zone\": null,\"active\": false,\"obj_create\": 0," +
                                         "\"obj_create_time\": {\"time\": \"0001-01-01T00:00:00\"},\"obj_last_seen\": 0,\"type\": {\"id\": 0,\"name\": \"network\"},\"obj_color\": null,\"obj_comment\": \"\",\"obj_member_names\": \"\",\"obj_member_refs\": \"\"," +

roles/tests-unit/files/FWO.Test/RuleDataTest.cs

@@ -0,0 +1,51 @@
+using FWO.Data;
+using Newtonsoft.Json;
+using NUnit.Framework;
+
+namespace FWO.Test
+{
+    [TestFixture]
+    public class RuleDataTest
+    {
+        [Test]
+        public void RuleTimes_AreDeserialized_WhenRemovedIsNull()
+        {
+            const string serializedRule = """
+                {
+                    "rule_id": 1001,
+                    "rule_times": [
+                        {
+                            "rule_time_id": 10,
+                            "rule_id": 1001,
+                            "time_obj_id": 55,
+                            "created": 200,
+                            "removed": null,
+                            "time_object": {
+                                "time_obj_id": 55,
+                                "time_obj_name": "Office Hours",
+                                "time_obj_uid": "uid-55",
+                                "start_time": "2025-01-01T08:00:00Z",
+                                "end_time": "2025-01-01T17:00:00Z",
+                                "created": 200
+                            }
+                        }
+                    ]
+                }
+                """;
+
+            Rule? deserializedRule = JsonConvert.DeserializeObject<Rule>(serializedRule);
+
+            Assert.That(deserializedRule, Is.Not.Null);
+            Assert.That(deserializedRule!.RuleTimes.Count, Is.EqualTo(1));
+            Assert.That(deserializedRule.RuleTimes[0].Id, Is.EqualTo(10));
+            Assert.That(deserializedRule.RuleTimes[0].RuleId, Is.EqualTo(1001));
+            Assert.That(deserializedRule.RuleTimes[0].TimeObjId, Is.EqualTo(55));
+            Assert.That(deserializedRule.RuleTimes[0].Created, Is.EqualTo(200));
+            Assert.That(deserializedRule.RuleTimes[0].Removed, Is.Null);
+            Assert.That(deserializedRule.RuleTimes[0].TimeObj, Is.Not.Null);
+            TimeObject timeObject = deserializedRule.RuleTimes[0].TimeObj!;
+            Assert.That(timeObject.Id, Is.EqualTo(55));
+            Assert.That(timeObject.Name, Is.EqualTo("Office Hours"));
+        }
+    }
+}

roles/tests-unit/files/FWO.Test/RuleViewDataTest.cs

@@ -92,5 +92,60 @@ public void RuleViewData_LastModified_UsesCreatedWhenNoLastSeen()
             Assert.That(viewData.LastModified, Is.EqualTo("2023-01-10"));
         }
 
+        [Test]
+        public void DisplayRuleTime_UsesFirstTimeObjectWithEndTime()
+        {
+            Rule rule = new Rule
+            {
+                RuleTimes =
+                [
+                    new RuleTime { TimeObj = new TimeObject { EndTime = null } },
+                    new RuleTime { TimeObj = new TimeObject { EndTime = new DateTime(2026, 01, 02, 03, 04, 05) } },
+                    new RuleTime { TimeObj = new TimeObject { EndTime = new DateTime(2030, 06, 07, 08, 09, 10) } }
+                ]
+            };
+
+            UserConfig userConfig = new UserConfig();
+            RuleDisplayHtml ruleDisplay = new RuleDisplayHtml(userConfig);
+
+            Assert.That(ruleDisplay.DisplayRuleTime(rule), Is.EqualTo("2026-01-02 03:04:05"));
+        }
+
+        [Test]
+        public void DisplayRuleTime_ReturnsEmpty_WhenNoTimeObjectHasEndTime()
+        {
+            Rule rule = new Rule
+            {
+                RuleTimes =
+                [
+                    new RuleTime { TimeObj = null },
+                    new RuleTime { TimeObj = new TimeObject { EndTime = null } }
+                ]
+            };
+
+            UserConfig userConfig = new UserConfig();
+            RuleDisplayHtml ruleDisplay = new RuleDisplayHtml(userConfig);
+
+            Assert.That(ruleDisplay.DisplayRuleTime(rule), Is.EqualTo(""));
+        }
+
+        [Test]
+        public void RuleViewData_SetsRuleTime_FromDisplayRuleTime()
+        {
+            Rule rule = new Rule
+            {
+                RuleTimes =
+                [
+                    new RuleTime { TimeObj = new TimeObject { EndTime = new DateTime(2026, 12, 24, 11, 22, 33) } }
+                ]
+            };
+
+            UserConfig userConfig = new UserConfig();
+            NatRuleDisplayHtml ruleDisplay = new NatRuleDisplayHtml(userConfig);
+            RuleViewData viewData = new RuleViewData(rule, ruleDisplay, OutputLocation.report, true);
+
+            Assert.That(viewData.RuleTime, Is.EqualTo("2026-12-24 11:22:33"));
+        }
+
     }
 }