1.2.5

- Added Ssl support.
FirstGearGames · Apr 29, 2022 · fef8529 · fef8529
1 parent fbcdfc8
commit fef8529
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 35 deletions.
diff --git a/FishNet/Plugins/Bayou/Bayou.cs b/FishNet/Plugins/Bayou/Bayou.cs
@@ -1,6 +1,7 @@
 using FishNet.Managing;
 using FishNet.Managing.Logging;
 using FishNet.Managing.Transporting;
+using JamesFrowen.SimpleWeb;
 using System;
 using System.Runtime.CompilerServices;
 using UnityEngine;
@@ -12,6 +13,22 @@ public class Bayou : Transport
     {
 
         #region Serialized.
+        [Header("Security")]
+        /// <summary>
+        /// True to connect using WSS.
+        /// </summary>
+        [Tooltip("True to connect using WSS.")]
+        [SerializeField]
+        private bool _useWss = false;
+#if UNITY_SERVER || UNITY_EDITOR
+        /// <summary>
+        /// Configuration to use for SSL.
+        /// </summary>
+        [Tooltip("Configuration to use for SSL.")]
+        [SerializeField]
+        private SslConfiguration _sslConfiguration;
+#endif
+
         [Header("Channels")]
         /// <summary>
         /// Maximum transmission unit for this transport.
@@ -38,20 +55,14 @@ public class Bayou : Transport
 
         [Header("Client")]
         /// <summary>
-        /// True to connect using WSS.
-        /// </summary>
-        [Tooltip("True to connect using WSS.")]
-        [SerializeField]
-        private bool _useWss = false;
-        /// <summary>
         /// Address to connect.
         /// </summary>
         [Tooltip("Address to connect.")]
         [SerializeField]
         private string _clientAddress = "localhost";
-        #endregion
+#endregion
 
-        #region Private.
+#region Private.
         /// <summary>
         /// Server socket and handler.
         /// </summary>
@@ -60,9 +71,9 @@ public class Bayou : Transport
         /// Client socket and handler.
         /// </summary>
         private Client.ClientSocket _client = new Client.ClientSocket();
-        #endregion
+#endregion
 
-        #region Const.
+#region Const.
         /// <summary>
         /// Minimum UDP packet size allowed.
         /// </summary>
@@ -71,16 +82,16 @@ public class Bayou : Transport
         /// Maximum UDP packet size allowed.
         /// </summary>
         private const int MAXIMUM_MTU = ushort.MaxValue;
-        #endregion
+#endregion
 
-        #region Initialization and unity.
+#region Initialization and unity.
         protected void OnDestroy()
         {
             Shutdown();
         }
-        #endregion
+#endregion
 
-        #region ConnectionStates.
+#region ConnectionStates.
         /// <summary>
         /// Gets the address of a remote connection Id.
         /// </summary>
@@ -145,9 +156,9 @@ public override void HandleRemoteConnectionState(RemoteConnectionStateArgs conne
         {
             OnRemoteConnectionState?.Invoke(connectionStateArgs);
         }
-        #endregion
+#endregion
 
-        #region Iterating.
+#region Iterating.
         /// <summary>
         /// Processes data received by the socket.
         /// </summary>
@@ -171,9 +182,9 @@ public override void IterateOutgoing(bool server)
             else
                 _client.IterateOutgoing();
         }
-        #endregion
+#endregion
 
-        #region ReceivedData.
+#region ReceivedData.
         /// <summary>
         /// Called when client receives data.
         /// </summary>
@@ -198,9 +209,9 @@ public override void HandleServerReceivedDataArgs(ServerReceivedDataArgs receive
         {
             OnServerReceivedData?.Invoke(receivedDataArgs);
         }
-        #endregion
+#endregion
 
-        #region Sending.
+#region Sending.
         /// <summary>
         /// Sends to the server or all clients.
         /// </summary>
@@ -224,9 +235,9 @@ public override void SendToClient(byte channelId, ArraySegment<byte> segment, in
             SanitizeChannel(ref channelId);
             _server.SendToClient(channelId, segment, connectionId);
         }
-        #endregion
+#endregion
 
-        #region Configuration.
+#region Configuration.
         /// <summary>
         /// Sets UseWSS value.
         /// </summary>
@@ -313,9 +324,9 @@ public override ushort GetPort()
         {
             return _port;
         }
-        #endregion
+#endregion
 
-        #region Start and stop.
+#region Start and stop.
         /// <summary>
         /// Starts the local server or client using configured settings.
         /// </summary>
@@ -360,13 +371,19 @@ public override void Shutdown()
             StopConnection(true);
         }
 
-        #region Privates.
+#region Privates.
         /// <summary>
         /// Starts server.
         /// </summary>
         private bool StartServer()
         {
-            _server.Initialize(this, _mtu);
+            SslConfiguration config;
+#if UNITY_SERVER
+            config = _sslConfiguration;
+#else
+            config = new SslConfiguration();
+#endif
+            _server.Initialize(this, _mtu, config);
             return _server.StartConnection(_port, _maximumClients);
         }
 
@@ -405,10 +422,10 @@ private bool StopClient(int connectionId, bool immediately)
         {
             return _server.StopConnection(connectionId, immediately);
         }
-        #endregion
-        #endregion
+#endregion
+#endregion
 
-        #region Channels.
+#region Channels.
         /// <summary>
         /// If channelId is invalid then channelId becomes forced to reliable.
         /// </summary>
@@ -432,9 +449,9 @@ public override int GetMTU(byte channel)
         {
             return _mtu;
         }
-        #endregion
+#endregion
 
-        #region Editor.
+#region Editor.
 #if UNITY_EDITOR
         private void OnValidate()
         {
@@ -444,6 +461,6 @@ private void OnValidate()
                 _mtu = MAXIMUM_MTU;
         }
 #endif
-        #endregion
+#endregion
     }
 }
diff --git a/FishNet/Plugins/Bayou/CHANGELOG.txt b/FishNet/Plugins/Bayou/CHANGELOG.txt
@@ -1,3 +1,6 @@
+1.2.5
+	- Added SSL support.
+
 1.2.4
 	- Fixed maximum clients allowing 1 additional client to connect.
 	- UseWSS is now false by default.

diff --git a/FishNet/Plugins/Bayou/Core/ServerSocket.cs b/FishNet/Plugins/Bayou/Core/ServerSocket.cs
@@ -62,6 +62,10 @@ internal RemoteConnectionStates GetConnectionState(int connectionId)
         /// Server socket manager.
         /// </summary>
         private SimpleWebServer _server;
+        /// <summary>
+        /// SslConfiguration to use.
+        /// </summary>
+        private SslConfiguration _sslConfiguration;
         #endregion
 
         ~ServerSocket()
@@ -73,8 +77,9 @@ internal RemoteConnectionStates GetConnectionState(int connectionId)
         /// Initializes this for use.
         /// </summary>
         /// <param name="t"></param>
-        internal void Initialize(Transport t, int unreliableMTU)
+        internal void Initialize(Transport t, int unreliableMTU, SslConfiguration config)
         {
+            _sslConfiguration = config;
             base.Transport = t;
             _mtu = unreliableMTU;
         }
@@ -86,7 +91,13 @@ internal void Initialize(Transport t, int unreliableMTU)
         private void Socket()
         {
             TcpConfig tcpConfig = new TcpConfig(false, 5000, 20000);
-            _server = new SimpleWebServer(5000, tcpConfig, _mtu, 5000, new SslConfig());
+            SslConfig config;
+            if (!_sslConfiguration.Enabled)
+                config = new SslConfig();
+            else
+                config = new SslConfig(_sslConfiguration.Enabled, _sslConfiguration.CertificatePath, _sslConfiguration.CertificatePassword,
+                    _sslConfiguration.SslProtocol);
+            _server = new SimpleWebServer(5000, tcpConfig, _mtu, 5000, config);
 
             _server.onConnect += _server_onConnect;
             _server.onDisconnect += _server_onDisconnect;

diff --git a/FishNet/Plugins/Bayou/VERSION.txt b/FishNet/Plugins/Bayou/VERSION.txt
@@ -1 +1 @@
-1.2.4
+1.2.5