Merge pull request CactuseSecurity#3447 from abarz722/develop

Several small fixes

Author: tpurschke

roles/api/files/replace_metadata.json

@@ -10480,6 +10480,17 @@
                 }
               ],
               "select_permissions": [
+                {
+                  "role": "approver",
+                  "permission": {
+                    "columns": [
+                      "ticket_id",
+                      "owner_id"
+                    ],
+                    "filter": {}
+                  },
+                  "comment": ""
+                },
                 {
                   "role": "auditor",
                   "permission": {
@@ -10491,6 +10502,28 @@
                   },
                   "comment": ""
                 },
+                {
+                  "role": "fw-admin",
+                  "permission": {
+                    "columns": [
+                      "ticket_id",
+                      "owner_id"
+                    ],
+                    "filter": {}
+                  },
+                  "comment": ""
+                },
+                {
+                  "role": "implementer",
+                  "permission": {
+                    "columns": [
+                      "ticket_id",
+                      "owner_id"
+                    ],
+                    "filter": {}
+                  },
+                  "comment": ""
+                },
                 {
                   "role": "modeller",
                   "permission": {
@@ -10501,6 +10534,39 @@
                     "filter": {}
                   },
                   "comment": ""
+                },
+                {
+                  "role": "planner",
+                  "permission": {
+                    "columns": [
+                      "ticket_id",
+                      "owner_id"
+                    ],
+                    "filter": {}
+                  },
+                  "comment": ""
+                },
+                {
+                  "role": "requester",
+                  "permission": {
+                    "columns": [
+                      "ticket_id",
+                      "owner_id"
+                    ],
+                    "filter": {}
+                  },
+                  "comment": ""
+                },
+                {
+                  "role": "reviewer",
+                  "permission": {
+                    "columns": [
+                      "ticket_id",
+                      "owner_id"
+                    ],
+                    "filter": {}
+                  },
+                  "comment": ""
                 }
               ]
             },

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

@@ -10,5 +10,10 @@ public class IpProtocol
 
         [JsonProperty("ip_proto_name"), JsonPropertyName("ip_proto_name")]
         public string Name { get; set; } = "";
+
+        public bool HasPorts()
+        {
+            return Id == 6 || Id == 17;
+        }
     }
 }

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

@@ -13,12 +13,17 @@ public class NetworkProtocol
 
 
         public NetworkProtocol()
-        {}
+        { }
 
         public NetworkProtocol(IpProtocol i)
         {
             Id = i.Id;
             Name = i.Name;
         }
+        
+        public bool HasPorts()
+        {
+            return Id == 6 || Id == 17;
+        }
     }
 }

roles/lib/files/FWO.Services/NetworkServiceComparer.cs

@@ -18,21 +18,40 @@ public bool Equals(NetworkService? service1, NetworkService? service2)
                 return false;
             }
 
+            if (CompareProtTypes(service1, service2))
+            {
+                return true;
+            }
+
             int destPortEnd1 = service1.DestinationPortEnd ?? service1.DestinationPort ?? 0;
             int destPortEnd2 = service2.DestinationPortEnd ?? service2.DestinationPort ?? 0;
 
-            return (!option.SvcRegardPortAndProt || service1.ProtoId == service2.ProtoId
-                    && service1.DestinationPort == service2.DestinationPort
-                    && destPortEnd1 == destPortEnd2)
+            return (!option.SvcRegardPortAndProt || (service1.ProtoId == service2.ProtoId &&
+                    service1.DestinationPort == service2.DestinationPort && destPortEnd1 == destPortEnd2))
                 && (!option.SvcRegardName || service1.Name == service2.Name);
         }
 
         public int GetHashCode(NetworkService service)
         {
+            if (IsProtType(service.ProtoId))
+            {
+                return (option.SvcRegardPortAndProt ? HashCode.Combine(service.ProtoId) : 0)
+                    ^ (option.SvcRegardName ? HashCode.Combine(service.Name) : 0);
+            }
             int destPortEnd = service.DestinationPortEnd ?? service.DestinationPort ?? 0;
             return (option.SvcRegardPortAndProt ? HashCode.Combine(service.ProtoId, service.DestinationPort, destPortEnd) : 0)
                 ^ (option.SvcRegardName ? HashCode.Combine(service.Name) : 0);
         }
+
+        private static bool IsProtType(int? protoId)
+        {
+            return protoId != null && protoId != 1 && protoId != 6 && protoId != 17;
+        }
+
+        private static bool CompareProtTypes(NetworkService service1, NetworkService service2)
+        {
+            return IsProtType(service1.ProtoId) && IsProtType(service2.ProtoId) && service1.ProtoId == service2.ProtoId;
+        }
     }
 
     public class NetworkServiceGroupComparer(RuleRecognitionOption option) : IEqualityComparer<NetworkService?>
@@ -57,18 +76,18 @@ public bool Equals(NetworkService? service1, NetworkService? service2)
                 return false;
             }
 
-            return service1.ServiceGroupFlats.ToList().ConvertAll(g => g.Object).ToList()
+            return service1.ServiceGroupFlats.ToList().ConvertAll(g => g.Object)
                     .Except([.. service2.ServiceGroupFlats.ToList().ConvertAll(g => g.Object)], networkServiceComparer).ToList().Count == 0 
-                && service2.ServiceGroupFlats.ToList().ConvertAll(g => g.Object).ToList()
+                && service2.ServiceGroupFlats.ToList().ConvertAll(g => g.Object)
                     .Except([.. service1.ServiceGroupFlats.ToList().ConvertAll(g => g.Object)], networkServiceComparer).ToList().Count == 0;
         }
 
         public int GetHashCode(NetworkService serviceGrp)
         {
             int hashCode = 0;
-            foreach(var svc in serviceGrp.ServiceGroupFlats.Where(s => s.Object?.Type.Name != ServiceType.Group).ToList())
+            foreach(var svc in serviceGrp.ServiceGroupFlats.Select(sg => sg.Object).Where(s => s?.Type.Name != ServiceType.Group).ToList())
             {
-                hashCode ^= (svc.Object != null ? networkServiceComparer.GetHashCode(svc.Object) : 0);
+                hashCode ^= svc != null ? networkServiceComparer.GetHashCode(svc) : 0;
             }
             return hashCode ^ (option.SvcRegardGroupName ? HashCode.Combine(serviceGrp.Name) : 0);
         }

roles/lib/files/FWO.Services/WfHandler.cs

@@ -156,7 +156,7 @@ public async Task<bool> Init(bool fetchData = false, List<int>? ownerIds = null,
                     }
                     ActionHandler = new (apiConnection, this, UserGroups, usedInMwServer);
                     await ActionHandler.Init();
-                    dbAcc = new WfDbAccess(DisplayMessageInUi, userConfig, apiConnection, ActionHandler, AuthUser == null || AuthUser.IsInRole(Roles.Admin)){};
+                    dbAcc = new WfDbAccess(DisplayMessageInUi, userConfig, apiConnection, ActionHandler, AuthUser == null || AuthUser.IsInRole(Roles.Admin) || AuthUser.IsInRole(Roles.Auditor)){};
                     Devices = await apiConnection.SendQueryAsync<List<Device>>(DeviceQueries.getDeviceDetails);
                     AllOwners = await apiConnection.SendQueryAsync<List<FwoOwner>>(OwnerQueries.getOwners);
                     await stateMatrixDict.Init(Phase, apiConnection);
@@ -266,12 +266,12 @@ public void SetContinueEnv(ObjAction action)
 
         // Tickets
 
-        public async Task<WfTicket?> ResolveTicket(long ticketId, bool checkOwner = false)
+        public async Task<WfTicket?> ResolveTicket(long ticketId)
         {
             WfTicket? ticket = null;
             if(dbAcc != null)
             {
-                ticket = await dbAcc.FetchTicket(ticketId, checkOwner ? AllOwners.ConvertAll(x => x.Id) : null);
+                ticket = await dbAcc.FetchTicket(ticketId, userConfig.ReqOwnerBased ? AllOwners.ConvertAll(x => x.Id) : null);
                 if(ticket != null)
                 {
                     SetTicketEnv(ticket);