[+] Modelling: Connection check foreign interface and NA

Author: SolidProgramming

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

@@ -276,6 +276,29 @@ public void AddExtraConfig()
             AddExtraConfigMode = true;
         }
 
+        public bool InterfaceAllowedWithNetworkArea(ModellingConnection interf)
+        {
+            if (!ActConn.IsInterface && !ActConn.IsCommonService && interf.AppId != ActConn.AppId &&
+                ( ActConn.DestinationAreas.Count > 0 || DstAreasToAdd.Count > 0 ||
+                ActConn.SourceAreas.Count > 0 || SrcAreasToAdd.Count > 0 ))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public bool InterfaceAllowedWithNetworkArea()
+        {
+            if (!ActConn.IsInterface && !ActConn.IsCommonService && ActConn.UsedInterfaceId != null &&
+                ActConn.UsedInterfaceId > 0 && PreselectedInterfaces.FirstOrDefault(_ => _.Id == ActConn.UsedInterfaceId)?.AppId != ActConn.AppId)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// Checks the opposite direction if it already contains a network area.
         /// </summary>

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

@@ -489,6 +489,13 @@
     {
         if(Container.ConnElement != null)
         {
+            if (!ConnHandler.InterfaceAllowedWithNetworkArea(Container.ConnElement))
+            {
+                DisplayMessageInUi(default, userConfig.GetText("edit_connection"), "", true);
+                Container.Clear();
+                return;
+            }
+
             if(ConnHandler!.ActConn.IsInterface)
             {
                 await ConnHandler!.RequestReplaceInterface(Container.ConnElement);
@@ -506,6 +513,13 @@
             }
             if(Container.AreaElements.Count > 0)
             {
+                if (!ConnHandler.InterfaceAllowedWithNetworkArea())
+                {
+                    DisplayMessageInUi(default, userConfig.GetText("edit_connection"), "", true);
+                    Container.Clear();
+                    return;
+                }
+
                 if (ConnHandler is not null && !ConnHandler.NetworkAreaUseAllowed(Container.AreaElements, Direction.Source, out (string Title, string Text) reason))
                 {
                     DisplayMessageInUi(default, reason.Title, reason.Text, true);
@@ -531,6 +545,13 @@
     {
         if(Container.ConnElement != null)
         {
+            if (!ConnHandler.InterfaceAllowedWithNetworkArea(Container.ConnElement))
+            {
+                DisplayMessageInUi(default, userConfig.GetText("edit_connection"), "", true);
+                Container.Clear();
+                return;
+            }
+
             if(ConnHandler!.ActConn.IsInterface)
             {
                 await ConnHandler!.RequestReplaceInterface(Container.ConnElement);
@@ -547,7 +568,14 @@
                 ConnHandler?.AppRolesToDestination(Container.AppRoleElements);
             }
             if(Container.AreaElements.Count > 0)
-            {    
+            {
+                if (!ConnHandler.InterfaceAllowedWithNetworkArea())
+                {
+                    DisplayMessageInUi(default, userConfig.GetText("edit_connection"), "", true);
+                    Container.Clear();
+                    return;
+                }
+
                 if (ConnHandler is not null && !ConnHandler.NetworkAreaUseAllowed(Container.AreaElements, Direction.Destination, out (string Title, string Text) reason))
                 {
                     DisplayMessageInUi(default, reason.Title, reason.Text, true);