Changeset 471 for TFP-WebServer/WebServer

Timestamp:

Aug 21, 2023, 1:32:40 PM (15 months ago)

Author:

alloc

Message:

Fixed: Possibly multiple parsing of query string

Location:

TFP-WebServer/WebServer/src

Files:

• RequestContext.cs (modified) (2 diffs)
• WebAPI/APIs/Log.openapi.yaml (modified) (1 diff)
• WebAPI/APIs/LogApi.cs (modified) (2 diffs)

TFP-WebServer/WebServer/src/RequestContext.cs

@@ +1 @@
+using System.Collections.Specialized;
 using SpaceWizards.HttpListener;
 
@@ -6 +7 @@
                 public readonly ERequestMethod Method;
                 public readonly HttpListenerRequest Request;
+                private NameValueCollection queryParameters;
                 public readonly HttpListenerResponse Response;
                 public readonly WebConnection Connection;
                 public readonly int PermissionLevel;
+
+                public NameValueCollection QueryParameters => queryParameters ??= Request.QueryString;
 
                 public RequestContext (string _requestPath, HttpListenerRequest _request, HttpListenerResponse _response, WebConnection _connection, int _permissionLevel) {

TFP-WebServer/WebServer/src/WebAPI/APIs/Log.openapi.yaml

@@ -87 +87 @@
 
 paths:
-  /api/Log:
+  /api/log:
     get:
       tags:

TFP-WebServer/WebServer/src/WebAPI/APIs/LogApi.cs

@@ -23 +23 @@
 
                 protected override void HandleRestGet (RequestContext _context) {
-                        if (_context.Request.QueryString ["count"] == null || !int.TryParse (_context.Request.QueryString ["count"], out int count)) {
+                        if (_context.QueryParameters ["count"] == null || !int.TryParse (_context.QueryParameters ["count"], out int count)) {
                                 count = 50;
                         }
@@ -39 +39 @@
                         }
 
-                        if (_context.Request.QueryString ["firstLine"] == null || !int.TryParse (_context.Request.QueryString ["firstLine"], out int firstLine)) {
+                        if (_context.QueryParameters ["firstLine"] == null || !int.TryParse (_context.QueryParameters ["firstLine"], out int firstLine)) {
                                 firstLine = count > 0 ? LogBuffer.Instance.OldestLine : LogBuffer.Instance.LatestLine;
                         }