[+] Check opposite direction for existing NA CactuseSecurity#2949

Author: SolidProgramming

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

@@ -1020,12 +1020,12 @@ public bool CalcVisibility()
             return true;
         }
 
-        public bool IsAreaForbiddenInDirection(List<ModellingNetworkArea> oppositeNetworkAreas, Direction direction)
+        public bool IsAreaForbiddenInDirection(Direction direction)
         {
             return direction switch
             {
-                Direction.Source => oppositeNetworkAreas.Count > 0,
-                Direction.Destination => oppositeNetworkAreas.Count > 0,
+                Direction.Source => ActConn.DestinationAreas.Count > 0 || DstAreasToAdd.Count > 0,
+                Direction.Destination => ActConn.SourceAreas.Count > 0 || SrcAreasToAdd.Count > 0,
                 _ => false,
             };
         }
@@ -1053,11 +1053,11 @@ public bool NetworkAreaUseAllowed(List<ModellingNetworkArea> networkAreas, Direc
                 reason.Title = userConfig.GetText("edit_connection");
             }
 
-            //if (IsAreaForbiddenInDirection(direction))
-            //{
-            //    reason.Text = userConfig.GetText("direction_contain_nwarea");
-            //    return false;
-            //}
+            if (IsAreaForbiddenInDirection(direction))
+            {
+                reason.Text = userConfig.GetText("direction_contain_nwarea");
+                return false;
+            }
 
             if (ActConn.IsInterface)
             {

roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor

@@ -506,16 +506,14 @@
             }
             if(Container.AreaElements.Count > 0)
             {
-
+                ConnHandler?.AreasToSource(Container.AreaElements);
 
                 if (ConnHandler is not null && !ConnHandler.NetworkAreaUseAllowed(Container.AreaElements, Direction.Source, out (string Title, string Text) reason))
                 {
                     DisplayMessageInUi(default, reason.Title, reason.Text, true);
                     Container.Clear();
                     return;
                 }
-
-                ConnHandler?.AreasToSource(Container.AreaElements);                
             }
             if(Container.NwGroupElements.Count > 0)
             {
@@ -549,17 +547,15 @@
                 ConnHandler?.AppRolesToDestination(Container.AppRoleElements);
             }
             if(Container.AreaElements.Count > 0)
-            {
-                //var bla = ConnHandler.IsAreaForbiddenInDirection(, Direction.Destination);
+            {    
+                ConnHandler?.AreasToDestination(Container.AreaElements);                
 
                 if (ConnHandler is not null && !ConnHandler.NetworkAreaUseAllowed(Container.AreaElements, Direction.Destination, out (string Title, string Text) reason))
                 {
                     DisplayMessageInUi(default, reason.Title, reason.Text, true);
                     Container.Clear();
                     return;
                 }
-
-                ConnHandler?.AreasToDestination(Container.AreaElements);
             }
             if(Container.NwGroupElements.Count > 0)
             {