EonaCat/EonaCat.Network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated

Browse Source
This commit is contained in:
jsaey
2023-11-17 09:47:50 +01:00
parent bab70bca3d
commit e6517ad662
10 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EonaCat.Network.Tester/Program.cs
View File

@@ -123,7 +123,7 @@ internal class Program
private static void StartServer(string serverUri, string certificatePath, string certificatePassword, string requiredPassword)
{
_server = new WSServer(serverUri);
_server.SslConfiguration.Certificate = new X509Certificate2(certificatePath, certificatePassword);
_server.SSL.Certificate = new X509Certificate2(certificatePath, certificatePassword);
_server.AddEndpoint<WelcomeEndpoint>("/Welcome");
_server.Start();
}

3
EonaCat.Network/System/Sockets/Web/Core/Context/TcpListenerWSContext.cs
View File

@@ -36,8 +36,7 @@ namespace EonaCat.Network
/// <param name="tcpClient">The <see cref="TcpClient"/> associated with the WebSocket connection.</param>
/// <param name="protocol">The WebSocket protocol negotiated during the connection.</param>
/// <param name="secure">A boolean indicating whether the connection is secure.</param>
/// <param name="sslConfig">The SSL configuration for secure connections.</param>
/// <param name="logger">The logger for logging.</param>
/// <param name="sslConfig">The SSL config for secure connections.</param>
internal TcpListenerWSContext(
TcpClient tcpClient,
string protocol,

2
EonaCat.Network/System/Sockets/Web/Core/Endpoints/EndPointListener.cs
View File

@@ -89,7 +89,7 @@ namespace EonaCat.Network
public int Port => _endpoint.Port;
/// <summary>
/// Gets the SSL configuration for the secure endpoint.
/// Gets the SSL config for the secure endpoint.
/// </summary>
public SSLConfigServer SSL { get; }

2
EonaCat.Network/System/Sockets/Web/Core/Endpoints/EndPointManager.cs
View File

@@ -77,7 +77,7 @@ namespace EonaCat.Network
endpoint,
pref.IsSecure,
listener.CertificateFolderPath,
listener.SslConfiguration,
listener.SSL,
listener.ReuseAddress
);

2
EonaCat.Network/System/Sockets/Web/Core/Http/HttpListener.cs
View File

@@ -154,7 +154,7 @@ namespace EonaCat.Network
}
}
public SSLConfigServer SslConfiguration
public SSLConfigServer SSL
{
get
{

18
EonaCat.Network/System/Sockets/Web/Core/SSLConfig/SSLConfigClient.cs
View File

@@ -25,19 +25,19 @@ namespace EonaCat.Network
SslProtocols = SslProtocols.Tls12;
}
public SSLConfigClient(SSLConfigClient configuration)
public SSLConfigClient(SSLConfigClient sslConfig)
{
if (configuration == null)
if (sslConfig == null)
{
throw new ArgumentNullException(nameof(configuration));
throw new ArgumentNullException(nameof(sslConfig));
}
CheckForCertificateRevocation = configuration.CheckForCertificateRevocation;
_clientCertSelectionCallback = configuration._clientCertSelectionCallback;
_clientCertificates = configuration._clientCertificates;
SslProtocols = configuration.SslProtocols;
_serverCertValidationCallback = configuration._serverCertValidationCallback;
TargetHost = configuration.TargetHost;
CheckForCertificateRevocation = sslConfig.CheckForCertificateRevocation;
_clientCertSelectionCallback = sslConfig._clientCertSelectionCallback;
_clientCertificates = sslConfig._clientCertificates;
SslProtocols = sslConfig.SslProtocols;
_serverCertValidationCallback = sslConfig._serverCertValidationCallback;
TargetHost = sslConfig.TargetHost;
}
public bool CheckForCertificateRevocation { get; set; }

16
EonaCat.Network/System/Sockets/Web/Core/SSLConfig/SSLConfigServer.cs
View File

@@ -23,18 +23,18 @@ namespace EonaCat.Network
SslProtocols = SslProtocols.Tls12;
}
public SSLConfigServer(SSLConfigServer configuration)
public SSLConfigServer(SSLConfigServer sslConfig)
{
if (configuration == null)
if (sslConfig == null)
{
throw new ArgumentNullException(nameof(configuration));
throw new ArgumentNullException(nameof(sslConfig));
}
CheckForCertificateRevocation = configuration.CheckForCertificateRevocation;
IsClientCertificateRequired = configuration.IsClientCertificateRequired;
_clientCertificationValidationCallback = configuration._clientCertificationValidationCallback;
SslProtocols = configuration.SslProtocols;
Certificate = configuration.Certificate;
CheckForCertificateRevocation = sslConfig.CheckForCertificateRevocation;
IsClientCertificateRequired = sslConfig.IsClientCertificateRequired;
_clientCertificationValidationCallback = sslConfig._clientCertificationValidationCallback;
SslProtocols = sslConfig.SslProtocols;
Certificate = sslConfig.Certificate;
}
public bool CheckForCertificateRevocation { get; set; }

6
EonaCat.Network/System/Sockets/Web/Server/HttpServer.cs
View File

@@ -283,7 +283,7 @@ namespace EonaCat.Network
}
}
public SSLConfigServer SslConfiguration
public SSLConfigServer SSL
{
get
{
@@ -293,7 +293,7 @@ namespace EonaCat.Network
throw new InvalidOperationException(message);
}
return _listener.SslConfiguration;
return _listener.SSL;
}
}
@@ -411,7 +411,7 @@ namespace EonaCat.Network
{
message = null;
var byUser = _listener.SslConfiguration.Certificate != null;
var byUser = _listener.SSL.Certificate != null;
var path = _listener.CertificateFolderPath;
var withPort = EndPointListener.CertificateExists(Port, path);

15
EonaCat.Network/System/Sockets/Web/Server/WSServer.cs
View File

@@ -253,7 +253,7 @@ namespace EonaCat.Network
}
}
public SSLConfigServer SslConfiguration
public SSLConfigServer SSL
{
get
{
@@ -263,7 +263,7 @@ namespace EonaCat.Network
throw new InvalidOperationException(message);
}
return GetSslConfiguration();
return GetSSLConfig();
}
}
@@ -366,13 +366,12 @@ namespace EonaCat.Network
|| name == _hostname;
}
private static bool CheckSslConfiguration(
SSLConfigServer configuration, out string message
private static bool CheckSslConfig(SSLConfigServer sslConfig, out string message
)
{
message = null;
if (configuration.Certificate == null)
if (sslConfig.Certificate == null)
{
message = "There is no server certificate for secure connections.";
return false;
@@ -387,7 +386,7 @@ namespace EonaCat.Network
return realm != null && realm.Length > 0 ? realm : _defaultRealm;
}
private SSLConfigServer GetSslConfiguration()
private SSLConfigServer GetSSLConfig()
{
_sslConfig ??= new SSLConfigServer();
@@ -705,9 +704,9 @@ namespace EonaCat.Network
if (IsSecure)
{
sslConfig = new SSLConfigServer(GetSslConfiguration());
sslConfig = new SSLConfigServer(GetSSLConfig());
if (!CheckSslConfiguration(sslConfig, out string message))
if (!CheckSslConfig(sslConfig, out string message))
{
throw new InvalidOperationException(message);
}

2
EonaCat.Network/System/Tools/FileReader.cs
View File

@@ -10,7 +10,7 @@ namespace EonaCat.Network
public class FileReader
{
/// <summary>
/// Read a configuration file (varName=varValue format #beginning with comments)
/// Reads a configuration file (varName=varValue format #beginning with comments)
/// </summary>
/// <returns>Parameter list.</returns>
/// <param name="filePath">File path.</param>