Make server config catch errors instead of crashing
Remove Security.dll, not required and causes problems (name conflict with system.dll, DO NOT READD)
This commit is contained in:
1 parent
8c7a22103b
commit
a9ff5f6004
5 files changed
+39
-8
No files matched your search
@@ -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);
|
||||
try
|
||||
{
|
||||
using (Process p = Process.Start(info))
|
||||
{
|
||||
p.WaitForExit();
|
||||
p.Close();
|
||||
|
||||
}
|
||||
}
|
||||
catch (Exception) {}
|
||||
#else
|
||||
|
||||
//Required?
|
||||
|
||||
Binary file not shown.
@@ -17,6 +17,7 @@
|
||||
|
||||
using System.Security.Authentication;
|
||||
using System.Security.Principal;
|
||||
using System.Windows.Forms;
|
||||
using Security.Cryptography;
|
||||
using Security.Cryptography.X509Certificates;
|
||||
using System;
|
||||
@@ -124,7 +125,22 @@ namespace WebserverInitalConfig
|
||||
|
||||
keyParam.Parameters.Add(new CngProperty("Length", BitConverter.GetBytes(2048), CngPropertyOptions.None));
|
||||
|
||||
CngKey key = CngKey.Create(CngAlgorithm2.Rsa, Guid.NewGuid().ToString(), keyParam);
|
||||
CngKey key;
|
||||
try
|
||||
{
|
||||
key= CngKey.Create(CngAlgorithm2.Rsa, Guid.NewGuid().ToString(), keyParam);
|
||||
}
|
||||
catch (PlatformNotSupportedException)
|
||||
{
|
||||
try
|
||||
{
|
||||
key = CngKey.Create(CngAlgorithm2.Aes, Guid.NewGuid().ToString(), keyParam);
|
||||
}
|
||||
catch (PlatformNotSupportedException)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
X509CertificateCreationParameters param = new X509CertificateCreationParameters(new X500DistinguishedName(subjectName))
|
||||
{
|
||||
@@ -156,6 +172,11 @@ namespace WebserverInitalConfig
|
||||
if (!IsAdministrator())
|
||||
throw new AuthenticationException();
|
||||
cert = _GetSelfSignedCert(certName);
|
||||
if (cert == null)
|
||||
{
|
||||
MessageBox.Show("Could not create certificate. Secure server connection may not work. Disable it if required.");
|
||||
return;
|
||||
}
|
||||
_AddCertToStore(cert);
|
||||
}
|
||||
_BindCert(cert);
|
||||
|
||||
@@ -20,6 +20,7 @@ using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Security.Authentication;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace WebserverInitalConfig
|
||||
{
|
||||
@@ -28,6 +29,8 @@ namespace WebserverInitalConfig
|
||||
// ReSharper disable InconsistentNaming
|
||||
private static void Main(string[] args)
|
||||
// ReSharper restore InconsistentNaming
|
||||
{
|
||||
try
|
||||
{
|
||||
int port;
|
||||
if (args.Length < 2 || !int.TryParse(args[0], out port))
|
||||
@@ -73,5 +76,10 @@ namespace WebserverInitalConfig
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
MessageBox.Show("Error while installing server: " + e.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -41,16 +41,13 @@
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
<HintPath>..\Output\Interop.NetFwTypeLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Security, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Output\Security.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Security.Cryptography, Version=1.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Output\Security.Cryptography.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
||||
Reference in new issue
Block a user