fix(DebugWebsocketSink): enhance certificate generation with CS LAN IP support

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.42.1-local</Version>
+    <Version>2.36.6-local</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technology</Authors>
     <Company>PepperDash Technology</Company>

src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -151,8 +151,6 @@ namespace PepperDash.Core
         // Thread-safety lock for state changes
         private readonly object _stateLock = new object();
 
-        private volatile bool _isProgramStopping;
-
         private bool disconnectLogged = false;
 
         /// <summary>
@@ -209,9 +207,11 @@ namespace PepperDash.Core
         {
             if (programEventType == eProgramStatusEventType.Stopping)
             {
-                _isProgramStopping = true;
+                if (client != null)
-                this.LogDebug("Program stopping. Closing connection");
+                {
-                Disconnect();
+                    this.LogDebug("Program stopping. Closing connection");
+                    Disconnect();
+                }
             }
         }
 
@@ -228,12 +228,6 @@ namespace PepperDash.Core
                 return;
             }
 
-            if (_isProgramStopping)
-            {
-                this.LogDebug("Skipping connect because program is stopping");
-                return;
-            }
-
             ConnectEnabled = true;
 
             try
@@ -293,7 +287,13 @@ namespace PepperDash.Core
                     }
                     catch (SshConnectionException e)
                     {
-                        var ie = e.InnerException; // The details are inside, when present - remote can close the connection with no inner exception at all
+                        var ie = e.InnerException; // The details are inside!!
+
+                        if (ie is SocketException)
+                        {
+                            this.LogError("CONNECTION failure: Cannot reach host");
+                            this.LogVerbose(ie, "Exception details: ");
+                        }
 
                         if (ie is System.Net.Sockets.SocketException socketException)
                         {
@@ -301,20 +301,20 @@ namespace PepperDash.Core
                                 Hostname, Port);
                             this.LogVerbose(socketException, "SocketException details: ");
                         }
-                        else if (ie is SshAuthenticationException)
+                        if (ie is SshAuthenticationException)
                         {
                             this.LogError("Authentication failure for username {userName}", Username);
                             this.LogVerbose(ie, "AuthenticationException details: ");
                         }
                         else
                         {
-                            this.LogError("Error on connect: {error}", ie?.Message ?? e.Message);
+                            this.LogError("Error on connect: {error}", ie.Message);
-                            this.LogVerbose(ie ?? e, "Exception details: ");
+                            this.LogVerbose(ie, "Exception details: ");
                         }
 
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {autoReconnect}, {autoReconnectInterval}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -326,7 +326,7 @@ namespace PepperDash.Core
 
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -338,7 +338,7 @@ namespace PepperDash.Core
                         this.LogVerbose(e, "Exception details: ");
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -473,7 +473,7 @@ namespace PepperDash.Core
                 {
                     connectLock.Release();
                 }
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                if (AutoReconnect && ConnectEnabled)
                 {
                     this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                     StartReconnectTimer();
@@ -516,10 +516,7 @@ namespace PepperDash.Core
                 this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                StartReconnectTimer();
-                {
-                    StartReconnectTimer();
-                }
             }
             catch (Exception ex)
             {
@@ -552,10 +549,7 @@ namespace PepperDash.Core
                 this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                StartReconnectTimer();
-                {
-                    StartReconnectTimer();
-                }
             }
             catch (Exception ex)
             {

src/PepperDash.Core/Logging/DebugWebsocketSink.cs

@@ -155,21 +155,39 @@ namespace PepperDash.Core
                 certGenerator.AddExtension(X509Extensions.ExtendedKeyUsage, false,
                     new ExtendedKeyUsage(new[] { KeyPurposeID.id_kp_serverAuth, KeyPurposeID.id_kp_clientAuth }));
 
-                // Subject Alternative Names: DNS + IP
+
+
+
+                // Subject Alternative Names: DNS + IP(s), including the CS LAN IP if the processor has one
+                var generalNames = new System.Collections.Generic.List<GeneralName> { new GeneralName(GeneralName.DnsName, fqdn) };
+
                 System.Net.IPAddress parsedIp;
                 if (System.Net.IPAddress.TryParse(ipAddress, out parsedIp))
                 {
-                    certGenerator.AddExtension(X509Extensions.SubjectAlternativeName, false,
+                    generalNames.Add(new GeneralName(GeneralName.IPAddress, ipAddress));
-                        new GeneralNames(new GeneralName[] {
-                            new GeneralName(GeneralName.DnsName, fqdn),
-                            new GeneralName(GeneralName.IPAddress, ipAddress)
-                        }));
                 }
-                else
+
+                try
                 {
-                    certGenerator.AddExtension(X509Extensions.SubjectAlternativeName, false,
+                    var csAdapterId = CrestronEthernetHelper.GetAdapterdIdForSpecifiedAdapterType(EthernetAdapterType.EthernetCSAdapter);
-                        new GeneralNames(new GeneralName(GeneralName.DnsName, fqdn)));
+                    if (!csAdapterId.Equals(EthernetAdapterType.EthernetUnknownAdapter))
+                    {
+                        var csIpAddress = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, csAdapterId);
+
+                        System.Net.IPAddress parsedCsIp;
+                        if (csIpAddress != ipAddress && System.Net.IPAddress.TryParse(csIpAddress, out parsedCsIp))
+                        {
+                            generalNames.Add(new GeneralName(GeneralName.IPAddress, csIpAddress));
+                        }
+                    }
                 }
+                catch (Exception ex)
+                {
+                    CrestronConsole.PrintLine(string.Format("CreateCert: No CS LAN adapter available: {0}", ex.Message));
+                }
+
+                certGenerator.AddExtension(X509Extensions.SubjectAlternativeName, false,
+                    new GeneralNames(generalNames.ToArray()));
 
                 // Sign with SHA256withRSA
                 var signatureFactory = new Asn1SignatureFactory("SHA256WITHRSA", keyPair.Private, random);

src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs

@@ -498,11 +498,11 @@ namespace PepperDash.Essentials.Touchpanel
         {
             var appUrl = GetUrlWithCorrectIp(_appUrl);
 
-            this.LogInformation("Sending {appUrl} on join 1", AppUrlFeedback.StringValue);
+            this.LogInformation("Sending {appUrl} on join 1", appUrl);
 
             if (Panel.StringInput[1].StringValue == appUrl)
             {
-                this.LogInformation("App URL already set to {appUrl}, no update needed", AppUrlFeedback.StringValue);
+                this.LogInformation("App URL already set to {appUrl}, no update needed", appUrl);
                 return;
             }
 
@@ -611,7 +611,7 @@ namespace PepperDash.Essentials.Touchpanel
         /// </summary>
         public void SetAppUrl(string url)
         {
-            _appUrl = GetUrlWithCorrectIp(url);
+            _appUrl = url;
 
             AppUrlFeedback.FireUpdate();
         }

src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs

@@ -1162,11 +1162,6 @@ namespace PepperDash.Essentials.WebSocketServer
             var qp = req.QueryString;
             var token = qp["token"];
 
-            // Each join mints a single-use clientId; the panel webview must never replay a cached
-            // response, or it reconnects forever with an already-consumed id (1008 loop).
-            res.Headers.Add("Cache-Control", "no-store");
-            res.Headers.Add("Pragma", "no-cache");
-
             this.LogVerbose("Join Room Request with token: {token}", token);
 
             byte[] body;
@@ -1268,8 +1263,6 @@ namespace PepperDash.Essentials.WebSocketServer
         {
             res.StatusCode = 200;
             res.ContentType = "application/json";
-            res.Headers.Add("Cache-Control", "no-store");
-            res.Headers.Add("Pragma", "no-cache");
             var version = new Version() { ServerVersion = _parent.GetConfigWithPluginVersion().RuntimeInfo.PluginVersion };
             var message = JsonConvert.SerializeObject(version);
             this.LogVerbose("{message}", message);