feat: handled ipv6 link local zone index in probe serivce

Author: abishekve

ThingConnect.Pulse.Server/Services/Monitoring/DiscoveryService.cs

@@ -151,7 +151,7 @@ public IEnumerable<string> ExpandWildcard(string wildcard, int startRange = 1, i
     }
 
     /// <summary>
-    /// Expands a single IPv6 host into compressed (::) and full (0000:0000:...) forms.
+    /// Expands a single IPv6 host into compressed (::) and full (xxxx:xxxx:....) forms.
     /// Handles optional zone index.
     /// </summary>
     private IEnumerable<string> ExpandIPv6Host(string host)
@@ -172,11 +172,10 @@ private IEnumerable<string> ExpandIPv6Host(string host)
         // Compressed form
         string compressed = ip.ToString();
 
-        // Full form
-        string full = string.Join(":", ip.GetAddressBytes()
-            .Select((b, i) => i % 2 == 0 ? $"{b:X2}" : $"{b:X2}")
-            .Select((s, i) => i % 2 == 1 ? s : s) // ensure proper grouping
-        );
+        // Full form (always 8 groups of 4 hex digits)
+        string full = string.Join(":", Enumerable.Range(0, 8)
+            .Select(i => ((ushort)((ip.GetAddressBytes()[i * 2] << 8) |
+                                ip.GetAddressBytes()[i * 2 + 1])).ToString("x4")));
 
         if (zoneIndex != null)
         {

ThingConnect.Pulse.Server/Services/Monitoring/ProbeService.cs

@@ -60,18 +60,32 @@ public async Task<CheckResult> PingAsync(Guid endpointId, string host, int timeo
 
             try
             {
-                // Use overload that accepts cancellation token
-                PingReply reply = await ping.SendPingAsync(host, TimeSpan.FromMilliseconds(timeoutMs), cancellationToken: combinedCts.Token);
-                stopwatch.Stop();
+                PingReply reply;
 
-                if (reply.Status == IPStatus.Success)
+                // Handle IPv6 link-local with scope
+                if (IPAddress.TryParse(host, out var ip))
                 {
-                    return CheckResult.Success(endpointId, timestamp, reply.RoundtripTime);
+                    if (ip.AddressFamily == AddressFamily.InterNetworkV6 && host.Contains('%'))
+                    {
+                        var parts = host.Split('%');
+                        ip = IPAddress.Parse(parts[0]);
+                        ip.ScopeId = long.Parse(parts[1]);
+                    }
+
+                    reply = await ping.SendPingAsync(ip, timeoutMs);
                 }
                 else
                 {
-                    return CheckResult.Failure(endpointId, timestamp, $"Ping failed: {reply.Status}");
+                    // Hostname fallback
+                    reply = await ping.SendPingAsync(host, timeoutMs);
                 }
+
+                stopwatch.Stop();
+
+                if (reply.Status == IPStatus.Success)
+                    return CheckResult.Success(endpointId, timestamp, reply.RoundtripTime);
+                else
+                    return CheckResult.Failure(endpointId, timestamp, $"Ping failed: {reply.Status}");
             }
             catch (OperationCanceledException) when (timeoutCts.Token.IsCancellationRequested && !cancellationToken.IsCancellationRequested)
             {
@@ -105,12 +119,25 @@ public async Task<CheckResult> TcpConnectAsync(Guid endpointId, string host, int
             using var timeoutCts = new CancellationTokenSource(timeoutMs);
             using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
 
-            // Use the combined cancellation token for the connection
-            Task connectTask = tcpClient.ConnectAsync(host, port, combinedCts.Token).AsTask();
-
             try
             {
-                await connectTask;
+                // Handle IPv6 link-local with scope
+                if (IPAddress.TryParse(host, out var ip))
+                {
+                    if (ip.AddressFamily == AddressFamily.InterNetworkV6 && host.Contains('%'))
+                    {
+                        var parts = host.Split('%');
+                        ip = IPAddress.Parse(parts[0]);
+                        ip.ScopeId = long.Parse(parts[1]);
+                    }
+
+                    await tcpClient.ConnectAsync(ip, port, combinedCts.Token);
+                }
+                else
+                {
+                    await tcpClient.ConnectAsync(host, port, combinedCts.Token);
+                }
+
                 stopwatch.Stop();
                 return CheckResult.Success(endpointId, timestamp, stopwatch.ElapsedMilliseconds);
             }
@@ -196,10 +223,28 @@ public async Task<CheckResult> HttpCheckAsync(Guid endpointId, string host, int
 
     /// <summary>
     /// Builds HTTP URL with proper protocol detection and validation.
-    /// Handles cases where host already contains protocol or needs port-based detection.
+    /// Handles IPv6 addresses, scope IDs, existing protocols, ports, and optional path.
     /// </summary>
     private static string BuildHttpUrl(string host, int port, string? path)
     {
+        // Wrap IPv6 in brackets and escape scope IDs for URLs
+        if (IPAddress.TryParse(host, out var ip) && ip.AddressFamily == AddressFamily.InterNetworkV6)
+        {
+            // Handle scope index (zone)
+            if (host.Contains('%'))
+            {
+                var parts = host.Split('%');
+                string baseHost = parts[0];
+                string scope = parts[1];
+                // Per RFC 6874: must escape "%" as "%25" in URLs
+                host = $"[{baseHost}%25{scope}]";
+            }
+            else
+            {
+                host = $"[{host}]";
+            }
+        }
+
         string url;
 
         // Check if host already contains a protocol
@@ -229,49 +274,32 @@ private static string BuildHttpUrl(string host, int port, string? path)
         else
         {
             // Host doesn't contain protocol, determine from port and context
-            string scheme;
-
             // Use smart defaults: 443 and common HTTPS ports default to HTTPS, others to HTTP
-            if (port == 443 || IsCommonHttpsPort(port))
-            {
-                scheme = "https";
-            }
-            else
-            {
-                scheme = "http";
-            }
-
-            url = $"{scheme}://{host}";
+            string scheme = (port == 443 || IsCommonHttpsPort(port)) ? "https" : "http";
 
             // Add port if not standard for the chosen protocol
             int standardPort = scheme == "https" ? 443 : 80;
+
+            url = $"{scheme}://{host}";
             if (port != standardPort)
-            {
                 url += $":{port}";
-            }
         }
-
         // Add path if specified
         if (!string.IsNullOrEmpty(path))
         {
             // Ensure URL ends with host/port and path starts with /
             if (!url.EndsWith("/") && !path.StartsWith("/"))
-            {
                 url += "/";
-            }
             else if (url.EndsWith("/") && path.StartsWith("/"))
-            {
-                // Remove duplicate slash
-                path = path.Substring(1);
-            }
+                path = path.Substring(1); // Remove duplicate slash
 
             url += path;
         }
 
         // Validate the final URL
         try
         {
-            var validationUri = new Uri(url);
+            _ = new Uri(url);
             return url;
         }
         catch (UriFormatException ex)

ThingConnect.Pulse.Server/config.schema.json

@@ -85,10 +85,12 @@
     },
     "cidr": {
       "type": "string",
+      "minLength": 1,
       "pattern": "^(?:(?:(?:25[0-5]|2[0-4]\\d|1?\\d?\\d)\\.){3}(?:25[0-5]|2[0-4]\\d|1?\\d?\\d)\\/(?:[0-9]|[12][0-9]|3[0-2]))|(?:(?:[0-9A-Fa-f:]+)\\/(?:[0-9]|[1-9]\\d|1[01]\\d|12[0-8]))$"
     },
     "wildcard": {
       "type": "string",
+      "minLength": 1,
       "description": "IPv4 wildcard like 10.10.1.* (expands 1..254 by default)",
       "pattern": "^(?:(?:25[0-5]|2[0-4]\\d|1?\\d?\\d)\\.){3}\\*$"
     },