Updated HTTP Server

- Fix issue with HTTP Probe 'Device Not Found' error when device does not exist in Agent
- Allow 'root' static file location

Author: PatrickRitchie

libraries/MTConnect.NET-HTTP/Servers/MTConnectHttpServer.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2024 TrakHound Inc., All Rights Reserved.
+// Copyright (c) 2026 TrakHound Inc., All Rights Reserved.
 // TrakHound Inc. licenses this file to you under the MIT license.
 
 using Ceen;
@@ -321,10 +321,6 @@ private ServerConfig CreateServerConfig(IHttpServerConfiguration serverConfigura
 
             // Setup Routes (Processed in Order)
             serverConfig.AddRoute(async (context) =>
-            {
-                return await DeviceRootHandler(probeHandler, context);
-            });
-            serverConfig.AddRoute(async (context) =>
             {
                 return await PutHandler(putHandler, context);
             });
@@ -342,27 +338,49 @@ private ServerConfig CreateServerConfig(IHttpServerConfiguration serverConfigura
             serverConfig.AddRoute("/assets", assetsHandler);
             serverConfig.AddRoute("/*/assets", assetsHandler);
             serverConfig.AddRoute("/asset/*", assetHandler);
-            serverConfig.AddRoute(staticHandler);
+            serverConfig.AddRoute(async (context) =>
+            {
+                return await StaticHandler(staticHandler, context);
+            });
+            serverConfig.AddRoute(async (context) =>
+            {
+                return await DeviceRootHandler(probeHandler, context);
+            });
 
             return serverConfig;
         }
 
-        private async Task<bool> DeviceRootHandler(MTConnectProbeResponseHandler handler, IHttpContext context)
+        private static async Task<bool> StaticHandler(MTConnectStaticResponseHandler handler, IHttpContext context)
+        {
+            if (context != null && context.Request != null && context.Request.Path != null)
+            {
+                if (context.Request.Method == HttpMethod.Get.Method)
+                {
+                    var valid = handler.IsValidFile(context.Request.Path);
+                    if (valid)
+                    {
+                        await handler.HandleAsync(context, CancellationToken.None);
+
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        private static async Task<bool> DeviceRootHandler(MTConnectProbeResponseHandler handler, IHttpContext context)
         {
             if (context != null && context.Request != null && context.Request.Path != null)
             {
                 if (context.Request.Method == HttpMethod.Get.Method)
                 {
                     var deviceKey = context.Request.Path.Trim('/');
-                    if (!string.IsNullOrEmpty(deviceKey))
+                    if (!string.IsNullOrEmpty(deviceKey) && !deviceKey.Contains('/'))
                     {
-                        var device = _mtconnectAgent.GetDevice(deviceKey);
-                        if (device != null)
-                        {
-                            await handler.HandleAsync(context, CancellationToken.None);
+                        await handler.HandleAsync(context, CancellationToken.None);
 
-                            return true;
-                        }
+                        return true;
                     }
                 }
             }

libraries/MTConnect.NET-HTTP/Servers/MTConnectStaticResponseHandler.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2024 TrakHound Inc., All Rights Reserved.
+// Copyright (c) 2026 TrakHound Inc., All Rights Reserved.
 // TrakHound Inc. licenses this file to you under the MIT license.
 
 using Ceen;
@@ -66,7 +66,7 @@ protected async override Task<MTConnectHttpResponse> OnRequestReceived(IHttpCont
 
                             var relativePath = Path.GetDirectoryName(requestedPath);
                             if (!string.IsNullOrEmpty(relativePath)) relativePath = relativePath.Replace('\\', '/');
-                            else relativePath = resource;
+                            else relativePath = "/"; // Assume Root
 
                             if (!string.IsNullOrEmpty(relativePath))
                             {
@@ -138,5 +138,68 @@ protected async override Task<MTConnectHttpResponse> OnRequestReceived(IHttpCont
 
             return response;
         }
+
+        internal bool IsValidFile(string path)
+        {
+            try
+            {
+                var requestedPath = path.Trim('/');
+                var localPath = path.TrimEnd('/');
+
+                // Get File extension to prevent certain files (.exe, .dll, etc) from being accessed
+                // that could cause security concerns
+                var pathExtension = Path.GetExtension(requestedPath);
+                var valid = pathExtension != ".exe" && pathExtension != ".dll";
+
+                if (valid)
+                {
+                    valid = false;
+
+                    // Check to see if the path matches one that is configured
+                    if (!_serverConfiguration.Files.IsNullOrEmpty())
+                    {
+                        var resource = Path.GetFileName(requestedPath);
+
+                        var relativePath = Path.GetDirectoryName(requestedPath);
+                        if (!string.IsNullOrEmpty(relativePath)) relativePath = relativePath.Replace('\\', '/');
+                        else relativePath = "/"; // Assume Root
+
+                        if (!string.IsNullOrEmpty(relativePath))
+                        {
+                            // Find a FileConfiguration whose Location matches the requested Resource
+                            var fileConfiguration = _serverConfiguration.Files.FirstOrDefault(o => o.Location == resource);
+                            if (fileConfiguration != null)
+                            {
+                                // Rewrite the localPath to the one that is configured that matches the 'Location' property
+                                localPath = fileConfiguration.Path;
+                                valid = true;
+                            }
+                            else
+                            {
+                                // Find a FileConfiguration whose Location matches the requested Resource
+                                fileConfiguration = _serverConfiguration.Files.FirstOrDefault(o => o.Location == relativePath);
+                                if (fileConfiguration != null)
+                                {
+                                    // Rewrite the localPath to the one that is configured that matches the 'Location' property
+                                    localPath = Path.Combine(fileConfiguration.Path, resource);
+                                    localPath = localPath.Replace('/', '\\');
+                                    valid = true;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (valid)
+                {
+                    var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, localPath);
+
+                    return File.Exists(filePath);
+                }
+            }
+            catch { }
+
+            return false;
+        }
     }
 }