From a9ff5f60046e7f165d8f41f676804f2f6922bb36 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Thu, 20 Mar 2014 02:27:54 +0100 Subject: [PATCH] Make server config catch errors instead of crashing Remove Security.dll, not required and causes problems (name conflict with system.dll, DO NOT READD) --- ClientServerLib/ClientServerLib/CServer.cs | 15 ++-- Output/Security.dll | Bin 27648 -> 0 bytes WebserverInitalConfig/CConfigHttpApi.cs | 23 +++++- WebserverInitalConfig/Program.cs | 72 ++++++++++-------- .../WebserverInitalConfig.csproj | 5 +- 5 files changed, 73 insertions(+), 42 deletions(-) delete mode 100644 Output/Security.dll diff --git a/ClientServerLib/ClientServerLib/CServer.cs b/ClientServerLib/ClientServerLib/CServer.cs index 51a6d2b7..3403a092 100644 --- a/ClientServerLib/ClientServerLib/CServer.cs +++ b/ClientServerLib/ClientServerLib/CServer.cs @@ -16,9 +16,9 @@ #endregion using System; +using System.Diagnostics; using System.ServiceModel; using System.ServiceModel.Web; -using System.Diagnostics; using System.Net; namespace ServerLib @@ -191,10 +191,15 @@ namespace ServerLib CreateNoWindow = true, WindowStyle = ProcessWindowStyle.Hidden, }; - Process p = Process.Start(info); - p.WaitForExit(); - p.Close(); - + try + { + using (Process p = Process.Start(info)) + { + p.WaitForExit(); + p.Close(); + } + } + catch (Exception) {} #else //Required? diff --git a/Output/Security.dll b/Output/Security.dll deleted file mode 100644 index f0c2c5139f29056216cc34e9e796ab0aa761fd4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27648 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 3 && args[2] == "reserve") || CConfigHttpApi.IsAdministrator()) - config.ReserveUrl(); + Console.WriteLine("Usage: VocaluxeServerConfig port isHttps"); + Environment.Exit(-1); } - catch (AuthenticationException) + else { - ProcessStartInfo proc = new ProcessStartInfo - { - UseShellExecute = true, - WorkingDirectory = Environment.CurrentDirectory, - FileName = Process.GetCurrentProcess().MainModule.FileName, - Arguments = args[0] + " " + args[1], - Verb = "runas", - CreateNoWindow = true, - WindowStyle = ProcessWindowStyle.Hidden, - }; - + CConfigHttpApi config = new CConfigHttpApi("Vocaluxe", Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Vocaluxe.exe"), "0.0.0.0", port, true); try { - Process.Start(proc); + config.AddFirewallRule(); + if (args[1].ToLower() == "true") + config.CreateAndAddCert(Dns.GetHostName()); + + if ((args.Length >= 3 && args[2] == "reserve") || CConfigHttpApi.IsAdministrator()) + config.ReserveUrl(); } - catch + catch (AuthenticationException) { - // The user refused the elevation. - // Do nothing and return directly ... - Environment.Exit(-1); + ProcessStartInfo proc = new ProcessStartInfo + { + UseShellExecute = true, + WorkingDirectory = Environment.CurrentDirectory, + FileName = Process.GetCurrentProcess().MainModule.FileName, + Arguments = args[0] + " " + args[1], + Verb = "runas", + CreateNoWindow = true, + WindowStyle = ProcessWindowStyle.Hidden, + }; + + try + { + Process.Start(proc); + } + catch + { + // The user refused the elevation. + // Do nothing and return directly ... + Environment.Exit(-1); + } } } } + catch (Exception e) + { + MessageBox.Show("Error while installing server: " + e.Message); + } } } } \ No newline at end of file diff --git a/WebserverInitalConfig/WebserverInitalConfig.csproj b/WebserverInitalConfig/WebserverInitalConfig.csproj index 2f48f927..5405cbe2 100644 --- a/WebserverInitalConfig/WebserverInitalConfig.csproj +++ b/WebserverInitalConfig/WebserverInitalConfig.csproj @@ -41,16 +41,13 @@ True ..\Output\Interop.NetFwTypeLib.dll - - False - ..\Output\Security.dll - False ..\Output\Security.Cryptography.dll +