Changeset 422 for binary-improvements2/WebServer

Timestamp:

Mar 28, 2023, 5:40:08 PM (20 months ago)

Author:

alloc

Message:

Added release files to version control

Location:

binary-improvements2/WebServer

Files:

• ModInfo.xml (modified) (1 diff)
• WebServer.csproj (modified) (1 diff)
• src/Commands/CreateWebUser.cs (deleted)
• src/UrlHandlers/SessionHandler.cs (modified) (5 diffs)
• src/WebUtils.cs (modified) (1 diff)

binary-improvements2/WebServer/ModInfo.xml

@@ -5 +5 @@
         <Description value="Integrated Webserver for the Web Dashboard and server APIs" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="21.0" />
+        <Version value="21.0.246.0" />
         <Website value="" />
 </xml>

binary-improvements2/WebServer/WebServer.csproj

@@ -101 +101 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="src\Commands\CreateWebUser.cs" />
     <Compile Include="src\FileCache\AbstractCache.cs" />
     <Compile Include="src\FileCache\DirectAccess.cs" />

binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs

@@ -61 +61 @@
                 private void HandleUserPassLogin (RequestContext _context, string _remoteEndpointString) {
                         if (!_context.Request.HasEntityBody) {
-                                _context.Response.Redirect (pageErrorPath + "NoLoginData");
+                                WebUtils.WriteText (_context.Response, "NoLoginData", HttpStatusCode.BadRequest);
                                 return;
                         }
@@ -76 +76 @@
                                 Log.Error ("Error deserializing JSON from user/password login:");
                                 Log.Exception (e);
-                                _context.Response.Redirect (pageErrorPath + "InvalidLoginJson");
+                                WebUtils.WriteText (_context.Response, "InvalidLoginJson", HttpStatusCode.BadRequest);
                                 return;
                         }
 
                         if (!inputJson.TryGetValue ("username", out object fieldNode) || fieldNode is not string username) {
-                                _context.Response.Redirect (pageErrorPath + "InvalidLoginJson");
+                                WebUtils.WriteText (_context.Response, "InvalidLoginJson", HttpStatusCode.BadRequest);
                                 return;
                         }
 
                         if (!inputJson.TryGetValue ("password", out fieldNode) || fieldNode is not string password) {
-                                _context.Response.Redirect (pageErrorPath + "InvalidLoginJson");
+                                WebUtils.WriteText (_context.Response, "InvalidLoginJson", HttpStatusCode.BadRequest);
                                 return;
                         }
@@ -94 +94 @@
                         if (!webUser.HasValue) {
                                 Log.Out ($"[Web] User/pass login failed from {_remoteEndpointString}");
-                                _context.Response.Redirect (pageErrorPath + "UserPassInvalid");
+                                WebUtils.WriteText (_context.Response, "UserPassInvalid", HttpStatusCode.Unauthorized);
                                 return;
                         }
@@ -144 +144 @@
 
                 public static void HandleUserIdLogin (ConnectionHandler _connectionHandler, RequestContext _context, string _remoteEndpointString,
-                        string _loginName, string _errorPage, string _username, PlatformUserIdentifierAbs _userId, PlatformUserIdentifierAbs _crossUserId = null, bool _redirect = true) {
+                        string _loginName, string _errorPage, string _username, PlatformUserIdentifierAbs _userId, PlatformUserIdentifierAbs _crossUserId = null, bool _sendResponse = true) {
                         try {
                                 WebConnection con = _connectionHandler.LogIn (_context.Request.RemoteEndPoint!.Address, _username, _userId, _crossUserId);
@@ -165 +165 @@
                                 _context.Response.AppendCookie (cookie);
 
-                                if (_redirect) {
-                                        _context.Response.Redirect (pageBasePath);
+                                if (_sendResponse) {
+                                        WebUtils.WriteText (_context.Response, "");
                                 }
                         } catch (Exception e) {
                                 Log.Error ($"[Web] Error during {_loginName} login:");
                                 Log.Exception (e);
-                                if (_redirect) {
-                                        _context.Response.Redirect (pageErrorPath + _errorPage);
+                                if (_sendResponse) {
+                                        WebUtils.WriteText (_context.Response, "LoginError", HttpStatusCode.InternalServerError);
                                 }
                         }

binary-improvements2/WebServer/src/WebUtils.cs

@@ -24 +24 @@
                         _resp.ContentEncoding = Encoding.UTF8;
 
-                        byte[] buf = Encoding.UTF8.GetBytes (_text);
-                        _resp.ContentLength64 = buf.Length;
-                        _resp.OutputStream.Write (buf, 0, buf.Length);
+                        if (string.IsNullOrEmpty (_text)) {
+                                _resp.ContentLength64 = 0;
+                        } else {
+                                byte[] buf = Encoding.UTF8.GetBytes (_text);
+                                _resp.ContentLength64 = buf.Length;
+                                _resp.OutputStream.Write (buf, 0, buf.Length);
+                        }
                 }