added setting to bind the API on any IP instead of just the local IP

ffrank06 · Feb 26, 2020 · 12f5fdb · 12f5fdb
1 parent 0c8e582
commit 12f5fdb
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 4 deletions.
diff --git a/EDEngineer.Server/Server.fs b/EDEngineer.Server/Server.fs
@@ -66,7 +66,8 @@ let start (token,
            shopppingLists:Func<IDictionary<string, List<Tuple<Blueprint, int>>>>,
            changeShoppingList:Action<string, Blueprint, int>,
            jsonSettingsGetter:Func<string, JsonSerializerSettings>,
-           logDirectory:string) =
+           logDirectory:string,
+           accessApiFromOtherComputers:bool) =
 
   let corsConfig = {
     defaultCORSConfig with
@@ -361,8 +362,10 @@ let start (token,
            >=> addHeader "Access-Control-Allow-Origin" "*"
            >=> cors corsConfig
 
+  let bindingIp = if accessApiFromOtherComputers then System.Net.IPAddress.Any else System.Net.IPAddress.Loopback
+
   startWebServer { 
     defaultConfig with 
       cancellationToken = token
-      bindings = [ HttpBinding.createSimple HTTP "127.0.0.1" port ] } app
+      bindings = [ HttpBinding.create HTTP bindingIp port ] } app
   state
diff --git a/EDEngineer/App.config b/EDEngineer/App.config
@@ -110,6 +110,9 @@
             <setting name="ClearAggregation" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="AccessApiFromOtherComputers" serializeAs="String">
+                <value>False</value>
+            </setting>
         </EDEngineer.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/EDEngineer/Properties/Settings.Designer.cs b/EDEngineer/Properties/Settings.Designer.cs
diff --git a/EDEngineer/Properties/Settings.settings b/EDEngineer/Properties/Settings.settings
@@ -104,5 +104,8 @@
     <Setting Name="ClearAggregation" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="AccessApiFromOtherComputers" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/EDEngineer/Resources/Data/localization.json b/EDEngineer/Resources/Data/localization.json
@@ -5550,6 +5550,15 @@
       "ru": "Экспорт/Импорт настроек",
       "pl": "Eksportuj/Importuj Ustawienia",
       "cs": "Exportuj/importuj nastavení"
+    },
+    "Access API from other computers? (tick only if you know what you're doing)": {
+      "es": null,
+      "pt": null,
+      "de": null,
+      "fr": null,
+      "ru": null,
+      "pl": null,
+      "cs": null
     }
   }
 }
diff --git a/EDEngineer/Utils/System/ServerBridge.cs b/EDEngineer/Utils/System/ServerBridge.cs
@@ -64,7 +64,8 @@ private void Start(ushort? autoRunPort = null)
                     () => viewModel.Commanders.ToDictionary(kv => kv.Key, kv => kv.Value.ShoppingList.Composition),
                     (c, b, i) => viewModel.Commanders[c].ShoppingListChange(b, i),
                     c => viewModel.Commanders[c].JsonSettings,
-                    viewModel.LogDirectory);
+                    viewModel.LogDirectory,
+                    SettingsManager.AccessApiFromOtherComputers);
             }, cts.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default)
             .ContinueWith(t =>
             {

diff --git a/EDEngineer/Utils/System/SettingsManager.cs b/EDEngineer/Utils/System/SettingsManager.cs
@@ -140,6 +140,16 @@ public static bool AutoRunServer
             }
         }
 
+        public static bool AccessApiFromOtherComputers
+        {
+            get => Properties.Settings.Default.AccessApiFromOtherComputers;
+            set
+            {
+                Properties.Settings.Default.AccessApiFromOtherComputers = value;
+                Properties.Settings.Default.Save();
+            }
+        }
+
         public static int CargoTabIndex
         {
             get => Properties.Settings.Default.CargoTabIndex;

diff --git a/EDEngineer/Utils/UI/ServerPortPrompt.cs b/EDEngineer/Utils/UI/ServerPortPrompt.cs
@@ -19,6 +19,15 @@ public static bool ShowDialog(ushort current, out ushort port)
                 Dock = DockStyle.Top
             };
 
+            var accessApiFromOtherComputersBox = new CheckBox
+            {
+                Checked = SettingsManager.AccessApiFromOtherComputers,
+                Height = 50,
+                Text = translator.Translate(
+                    "Access API from other computers? (tick only if you know what you're doing)"),
+                Dock = DockStyle.Top
+            };
+
             var textBox = new NumericUpDown
             {
                 TextAlign = HorizontalAlignment.Center,
@@ -69,13 +78,14 @@ public static bool ShowDialog(ushort current, out ushort port)
             {
                 FormBorderStyle = FormBorderStyle.FixedToolWindow,
                 Width = 400,
-                Height = textBox.Height + autoRunBox.Height + buttonsPanel.Height + 30,
+                Height = textBox.Height + autoRunBox.Height + accessApiFromOtherComputersBox.Height + buttonsPanel.Height + 30,
                 Text = translator.Translate("Select the port for the local API server"),
                 TopMost = true,
                 AcceptButton = buttonOk,
                 CancelButton = buttonCancel
             };
 
+            f.Controls.Add(accessApiFromOtherComputersBox);
             f.Controls.Add(autoRunBox);
             f.Controls.Add(textBox);
             f.Controls.Add(buttonsPanel);
@@ -85,6 +95,7 @@ public static bool ShowDialog(ushort current, out ushort port)
                 if (ushort.TryParse(textBox.Text, out port))
                 {
                     SettingsManager.AutoRunServer = autoRunBox.Checked;
+                    SettingsManager.AccessApiFromOtherComputers = accessApiFromOtherComputersBox.Checked;
                     return true;
                 }
             }