Changeset 463 for TFP-WebServer/WebServer/src/UrlHandlers/ItemIconHandler.cs

Timestamp:

Aug 17, 2023, 4:57:23 PM (15 months ago)

Author:

alloc

Message:

21.1.16.0 release
Completed OpenAPI specs
Add support to path handlers to register OpenAPI specs
Fixed ItemIconHandler throwing error when requested path contains no dot

File:

• TFP-WebServer/WebServer/src/UrlHandlers/ItemIconHandler.cs (modified) (1 diff)

TFP-WebServer/WebServer/src/UrlHandlers/ItemIconHandler.cs

@@ -31 +31 @@
                         }
 
+                        if (!_context.RequestPath.EndsWith (".png", StringComparison.OrdinalIgnoreCase)) {
+                                _context.Response.StatusCode = (int) HttpStatusCode.BadRequest;
+                                return;
+                        }
+
                         string requestFileName = _context.RequestPath.Remove (0, urlBasePath.Length);
-                        requestFileName = requestFileName.Remove (requestFileName.LastIndexOf ('.'));
-
-                        if (icons.ContainsKey (requestFileName) && _context.RequestPath.EndsWith (".png", StringComparison.OrdinalIgnoreCase)) {
-                                _context.Response.ContentType = MimeType.GetMimeType (".png");
-
-                                byte[] itemIconData = icons [requestFileName];
-
-                                _context.Response.ContentLength64 = itemIconData.Length;
-                                _context.Response.OutputStream.Write (itemIconData, 0, itemIconData.Length);
-                        } else {
-                                _context.Response.StatusCode = (int) HttpStatusCode.NotFound;
+                        int indexOfExtSep = requestFileName.LastIndexOf ('.');
+                        if (indexOfExtSep < 0) {
+                                _context.Response.StatusCode = (int) HttpStatusCode.BadRequest;
+                                return;
+                        }
+
+                        requestFileName = requestFileName.Remove (indexOfExtSep);
+
+                        if (!icons.TryGetValue (requestFileName, out byte[] icon)) {
+                                _context.Response.StatusCode = (int)HttpStatusCode.NotFound;
                                 if (logMissingFiles) {
                                         Log.Out ($"[Web] IconHandler: FileNotFound: \"{_context.RequestPath}\" ");
                                 }
-                        }
+                                return;
+                        }
+
+                        _context.Response.ContentType = MimeType.GetMimeType (".png");
+
+                        _context.Response.ContentLength64 = icon.Length;
+                        _context.Response.OutputStream.Write (icon, 0, icon.Length);
                 }