YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-18 18:43:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove TLS support for UWP servers because Framework does not support it.

Browse Source
This commit is contained in:
Christian Kratky
2017-06-06 14:31:59 +02:00
parent 4b62236638
commit dae5a06734
16 changed files with 63 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Frameworks/MQTTnet.UniversalWindows/Implementations/MqttServerAdapter.cs
+5 -31
View File
@@ -1,5 +1,4 @@
using System;
using System.Security.Cryptography.X509Certificates;
using MQTTnet.Core.Adapter;
using MQTTnet.Core.Diagnostics;
using MQTTnet.Core.Serializer;
@@ -11,15 +10,15 @@ namespace MQTTnet.Implementations
public class MqttServerAdapter : IMqttServerAdapter, IDisposable
{
private StreamSocketListener _defaultEndpointSocket;
private StreamSocketListener _sslEndpointSocket;
private X509Certificate2 _sslCertificate;
private bool _isRunning;
public event EventHandler<MqttClientConnectedEventArgs> ClientConnected;
public void Start(MqttServerOptions options)
{
if (options == null) throw new ArgumentNullException(nameof(options));
if (_isRunning) throw new InvalidOperationException("Server is already started.");
_isRunning = true;
@@ -30,18 +29,9 @@ namespace MQTTnet.Implementations
_defaultEndpointSocket.ConnectionReceived += AcceptDefaultEndpointConnectionsAsync;
}
if (options.SslEndpointOptions.IsEnabled)
if (options.TlsEndpointOptions.IsEnabled)
{
if (options.SslEndpointOptions.Certificate == null)
{
throw new ArgumentException("SSL certificate is not set.");
}
_sslCertificate = new X509Certificate2(options.SslEndpointOptions.Certificate);
_sslEndpointSocket = new StreamSocketListener();
_sslEndpointSocket.BindServiceNameAsync(options.GetSslEndpointPort().ToString(), SocketProtectionLevel.Tls12).GetAwaiter().GetResult();
_sslEndpointSocket.ConnectionReceived += AcceptSslEndpointConnectionsAsync;
throw new NotSupportedException("TLS servers are not supported for UWP apps.");
}
}
@@ -51,9 +41,6 @@ namespace MQTTnet.Implementations
_defaultEndpointSocket?.Dispose();
_defaultEndpointSocket = null;
_sslEndpointSocket?.Dispose();
_sslEndpointSocket = null;
}
public void Dispose()
@@ -73,18 +60,5 @@ namespace MQTTnet.Implementations
MqttTrace.Error(nameof(MqttServerAdapter), exception, "Error while acceping connection at default endpoint.");
}
}
private void AcceptSslEndpointConnectionsAsync(StreamSocketListener sender, StreamSocketListenerConnectionReceivedEventArgs args)
{
try
{
var clientAdapter = new MqttChannelCommunicationAdapter(new MqttTcpChannel(args.Socket), new DefaultMqttV311PacketSerializer());
ClientConnected?.Invoke(this, new MqttClientConnectedEventArgs(args.Socket.Information.RemoteAddress.ToString(), clientAdapter));
}
catch (Exception exception)
{
MqttTrace.Error(nameof(MqttServerAdapter), exception, "Error while acceping connection at SSL endpoint.");
}
}
}
}
Frameworks/MQTTnet.UniversalWindows/Implementations/MqttTcpChannel.cs
+5 -5
View File
@@ -32,7 +32,7 @@ namespace MQTTnet.Implementations
if (options == null) throw new ArgumentNullException(nameof(options));
try
{
if (!options.SslOptions.UseSsl)
if (!options.TlsOptions.UseTls)
{
await _socket.ConnectAsync(new HostName(options.Server), options.GetPort().ToString());
}
@@ -40,7 +40,7 @@ namespace MQTTnet.Implementations
{
_socket.Control.ClientCertificate = LoadCertificate(options);
if (!options.SslOptions.CheckCertificateRevocation)
if (!options.TlsOptions.CheckCertificateRevocation)
{
_socket.Control.IgnorableServerCertificateErrors.Add(ChainValidationResult.IncompleteChain);
_socket.Control.IgnorableServerCertificateErrors.Add(ChainValidationResult.RevocationInformationMissing);
@@ -104,17 +104,17 @@ namespace MQTTnet.Implementations
private static Certificate LoadCertificate(MqttClientOptions options)
{
if (options.SslOptions.Certificates == null || !options.SslOptions.Certificates.Any())
if (options.TlsOptions.Certificates == null || !options.TlsOptions.Certificates.Any())
{
return null;
}
if (options.SslOptions.Certificates.Count > 1)
if (options.TlsOptions.Certificates.Count > 1)
{
throw new NotSupportedException("Only one client certificate is supported for UWP.");
}
return new Certificate(options.SslOptions.Certificates.First().AsBuffer());
return new Certificate(options.TlsOptions.Certificates.First().AsBuffer());
}
}
}