fix: some small fixes while testing webgl (#2291)

* better error handling.
Adding IsNullOrEmpty checks
Removing catching of the exception. With previous version, NGO still starts and IsClient is still set. With exception, StartHost fails now correctly when certificates are not set.

* adding const strings for relay connection types (instead of having to guess)

* adding test for null check

* Address review comments

Co-authored-by: Simon Lemay <[email protected]>

Author: SamuelBellomo

com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs

@@ -1471,36 +1471,30 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
                 }
                 else
                 {
-                    try
+                    if (NetworkManager.IsServer)
                     {
-                        if (NetworkManager.IsServer)
+                        if (String.IsNullOrEmpty(m_ServerCertificate) || String.IsNullOrEmpty(m_ServerPrivateKey))
                         {
-                            if (m_ServerCertificate.Length == 0 || m_ServerPrivateKey.Length == 0)
-                            {
-                                throw new Exception("In order to use encrypted communications, when hosting, you must set the server certificate and key.");
-                            }
-                            m_NetworkSettings.WithSecureServerParameters(m_ServerCertificate, m_ServerPrivateKey);
+                            throw new Exception("In order to use encrypted communications, when hosting, you must set the server certificate and key.");
+                        }
+
+                        m_NetworkSettings.WithSecureServerParameters(m_ServerCertificate, m_ServerPrivateKey);
+                    }
+                    else
+                    {
+                        if (String.IsNullOrEmpty(m_ServerCommonName))
+                        {
+                            throw new Exception("In order to use encrypted communications, clients must set the server common name.");
+                        }
+                        else if (String.IsNullOrEmpty(m_ClientCaCertificate))
+                        {
+                            m_NetworkSettings.WithSecureClientParameters(m_ServerCommonName);
                         }
                         else
                         {
-                            if (m_ServerCommonName.Length == 0)
-                            {
-                                throw new Exception("In order to use encrypted communications, clients must set the server common name.");
-                            }
-                            else if (m_ClientCaCertificate == null)
-                            {
-                                m_NetworkSettings.WithSecureClientParameters(m_ServerCommonName);
-                            }
-                            else
-                            {
-                                m_NetworkSettings.WithSecureClientParameters(m_ClientCaCertificate, m_ServerCommonName);
-                            }
+                            m_NetworkSettings.WithSecureClientParameters(m_ClientCaCertificate, m_ServerCommonName);
                         }
                     }
-                    catch(Exception e)
-                    {
-                        Debug.LogException(e, this);
-                    }
                 }
             }
 #endif

com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs

@@ -126,5 +126,40 @@ public void UnityTransport_RestartSucceedsAfterFailure()
 
             transport.Shutdown();
         }
+
+#if UTP_TRANSPORT_2_0_ABOVE
+        [Test]
+        public void UnityTransport_EmptySecurityStringsShouldThrow([Values("", null)] string cert, [Values("", null)] string secret)
+        {
+            var supportingGO = new GameObject();
+            try
+            {
+                var networkManager = supportingGO.AddComponent<NetworkManager>(); // NM is required for UTP to work with certificates.
+                networkManager.NetworkConfig = new NetworkConfig();
+                UnityTransport transport = supportingGO.AddComponent<UnityTransport>();
+                networkManager.NetworkConfig.NetworkTransport = transport;
+                transport.Initialize();
+                transport.SetServerSecrets(serverCertificate: cert, serverPrivateKey: secret);
+
+                // Use encryption, but don't set certificate and check for exception
+                transport.UseEncryption = true;
+                Assert.Throws<System.Exception>(() =>
+                {
+                    networkManager.StartServer();
+                });
+                // Make sure StartServer failed
+                Assert.False(transport.NetworkDriver.IsCreated);
+                Assert.False(networkManager.IsServer);
+                Assert.False(networkManager.IsListening);
+            }
+            finally
+            {
+                if (supportingGO != null)
+                {
+                    Object.DestroyImmediate(supportingGO);
+                }
+            }
+        }
+#endif
     }
 }

com.unity.netcode.gameobjects/Tests/Editor/com.unity.netcode.editortests.asmdef

@@ -32,6 +32,11 @@
             "name": "Unity",
             "expression": "(0,2022.2.0a5)",
             "define": "UNITY_UNET_PRESENT"
+        },
+        {
+            "name": "com.unity.transport",
+            "expression": "2.0.0-exp",
+            "define": "UTP_TRANSPORT_2_0_ABOVE"
         }
     ]
-}
+}