Fixed #51

Author: Maciejowski2006

SAPI/API/Utilities/Auth.cs

@@ -1,4 +1,5 @@
-using System.Text;
+using System.Net;
+using System.Text;
 
 namespace SAPI.API.Utilities
 {
@@ -16,11 +17,11 @@ public static class Auth
 /// </summary>
 /// <param name="keys">List of all API keys authorized</param>
 /// <param name="packet">Packet ref you got from server</param>
-public static bool CheckForApiKey(List<string> keys, ref Packet packet)
+public static bool CheckForApiKey(List<string> keys, HttpListenerContext context)
 {
 try
 {
-if (GetApiKey(out string? _key, ref packet))
+if (GetApiKey(out string? _key, context))
 foreach (var key in keys)
 {
 if (_key == key)
@@ -41,11 +42,11 @@ public static bool CheckForApiKey(List<string> keys, ref Packet packet)
 /// <param name="credentialsList">List of all usernames and passwords authorized</param>
 /// <param name="hashingFunction">Password hashing algorithm. Takes un-hashed password as parameter, returns hashed password</param>
 /// <param name="packet">Packet ref you got from server</param>
-public static bool CheckForBasicCredentials(List<BasicCredentials> credentialsList, Func<string, string> hashingFunction, ref Packet packet)
+public static bool CheckForBasicCredentials(List<BasicCredentials> credentialsList, Func<string, string> hashingFunction, HttpListenerContext context)
 {
 try
 {
-if (GetBasicCredentials(out BasicCredentials? credentials, ref packet))
+if (GetBasicCredentials(out BasicCredentials? credentials, context))
 {
 credentials.HashedPassword = hashingFunction(credentials.Password);
 foreach (BasicCredentials _credentials in credentialsList)
@@ -63,9 +64,9 @@ public static bool CheckForBasicCredentials(List<BasicCredentials> credentialsLi
 return false;
 }
 
-public static bool GetApiKey(out string? key, ref Packet packet)
+public static bool GetApiKey(out string? key, HttpListenerContext context)
 {
-key = packet.Request.Headers.Get("x-api-key");
+key = context.Request.Headers.Get("x-api-key");
 
 if (key is null)
 return false;
@@ -78,14 +79,14 @@ public static bool GetApiKey(out string? key, ref Packet packet)
 /// </summary>
 /// <param name="credentials">Variable contains passed user credentials</param>
 /// <param name="packet">Packet ref you got from server</param>
-public static bool GetBasicCredentials(out BasicCredentials? credentials, ref Packet packet)
+public static bool GetBasicCredentials(out BasicCredentials? credentials, HttpListenerContext context)
 {
 credentials = null;
 try
 {
-if (packet.Request.Headers.Get("Authorization").Contains("Basic "))
+if (context.Request.Headers.Get("Authorization").Contains("Basic "))
 {
-string authData = packet.Request.Headers.GetValues("Authorization").GetValue(0).ToString().Substring(6);
+string authData = context.Request.Headers.GetValues("Authorization").GetValue(0).ToString().Substring(6);
 
 byte[] decodedBase64 = Convert.FromBase64String(authData);
 

SAPI/API/Utilities/Cookies.cs

@@ -11,9 +11,9 @@ public static class Cookies
 /// <param name="cookie">Return Cookie</param>
 /// <param name="request">Pass from Task()</param>
 /// <returns>Does cookie exist?</returns>
-public static bool CheckForCookie(string cookieName, out Cookie? cookie, ref Packet packet)
+public static bool CheckForCookie(string cookieName, out Cookie? cookie, HttpListenerContext context)
 {
-cookie = packet.Request.Cookies[cookieName];
+cookie = context.Request.Cookies[cookieName];
 
 return cookie != null;
 }
@@ -24,9 +24,9 @@ public static bool CheckForCookie(string cookieName, out Cookie? cookie, ref Pac
 /// <param name="cookieName">Name of cookie to be saved</param>
 /// <param name="cookieValue">Value of cookie to be saved</param>
 /// <param name="response">Pass from Task()</param>
-public static void GiveCookie(Cookie cookie, ref Packet packet)
+public static void GiveCookie(Cookie cookie, HttpListenerContext context)
 {
-packet.Response.AppendCookie(cookie);
+context.Response.AppendCookie(cookie);
 }
 }
 }

SAPI/API/Utilities/Error.cs

@@ -51,7 +51,7 @@ public static class Error
 /// </summary>
 /// <param name="httpStatus">It's the status code send to client</param>
 /// <param name="packet">Response ref you got from server - argument in Task()</param>
-public static void Page(HttpStatus httpStatus, ref Packet packet)
+public static void Page(HttpStatus httpStatus, HttpListenerContext context)
 {
 string statusName = httpStatusNames[httpStatus];
 int statusCode = httpStatusCodes[httpStatus];
@@ -76,7 +76,7 @@ public static void Page(HttpStatus httpStatus, ref Packet packet)
 "	</body>" +
 "</html>";
 
-Html.HtmlResponse(page, ref packet, statusCode);
+Html.HtmlResponse(page, context, statusCode);
 }
 }
 }

SAPI/API/Utilities/FileIO.cs

@@ -26,9 +26,9 @@ public enum FileNamingScheme
 /// <param name="namingScheme">A naming scheme that the file will follow</param>
 /// <param name="packet">Packet from HTTP method</param>
 /// <returns>Path to the file</returns>
-public static string SaveFile(string path, FileNamingScheme namingScheme, ref Packet packet)
+public static string SaveFile(string path, FileNamingScheme namingScheme, HttpListenerContext context)
 {
-string tempFile = LowLevelAPI.SaveFile(packet.Request.ContentEncoding, LowLevelAPI.GetBoundary(packet.Request.ContentType), packet.Request.InputStream);
+string tempFile = LowLevelAPI.SaveFile(context.Request.ContentEncoding, LowLevelAPI.GetBoundary(context.Request.ContentType), context.Request.InputStream);
 
 switch (namingScheme)
 {
@@ -71,9 +71,9 @@ public static string SaveFile(string path, FileNamingScheme namingScheme, ref Pa
 /// <param name="customFileNameHandler">Custom method for naming files: param -> temp file location; return -> new file name(with extension)</param>
 /// <param name="packet">Packet from HTTP method</param>
 /// <returns>Path to file</returns>
-public static string SaveFile(string path, Func<string, string> customFileNameHandler, ref Packet packet)
+public static string SaveFile(string path, Func<string, string> customFileNameHandler, HttpListenerContext context)
 {
-string tempFile = LowLevelAPI.SaveFile(packet.Request.ContentEncoding, LowLevelAPI.GetBoundary(packet.Request.ContentType), packet.Request.InputStream);
+string tempFile = LowLevelAPI.SaveFile(context.Request.ContentEncoding, LowLevelAPI.GetBoundary(context.Request.ContentType), context.Request.InputStream);
 
 fileName = customFileNameHandler(tempFile);
 
@@ -154,7 +154,7 @@ public static string DetermineFileExtension(string file)
 /// </summary>
 /// <param name="path">Path to file</param>
 /// <param name="packet">Packet from HTTP method</param>
-public static void ServeFile(string path, ref Packet packet)
+public static void ServeFile(string path, HttpListenerContext context)
 {
 if (File.Exists(path))
 try
@@ -163,46 +163,46 @@ public static void ServeFile(string path, ref Packet packet)
 {
 string file = Path.GetFileName(path);
 
-//Adding permanent http response headers
-packet.Response.ContentType = mimeTypeMappings.TryGetValue(Path.GetExtension(path), out string mime) ? mime : "application/octet-stream";
+//Adding permanent httpcontextresponse headers
+context.Response.ContentType = mimeTypeMappings.TryGetValue(Path.GetExtension(path), out string mime) ? mime : "application/octet-stream";
 
-packet.Response.ContentLength64 = input.Length;
-packet.Response.AddHeader("Date", DateTime.Now.ToString("r"));
-packet.Response.AddHeader("Last-Modified", File.GetLastWriteTime(path).ToString("r"));
-packet.Response.AddHeader("Content-Disposition", $"filename={file}");
+context.Response.ContentLength64 = input.Length;
+context.Response.AddHeader("Date", DateTime.Now.ToString("r"));
+context.Response.AddHeader("Last-Modified", File.GetLastWriteTime(path).ToString("r"));
+context.Response.AddHeader("Content-Disposition", $"filename={file}");
 
 var buffer = new byte[1024 * 32];
 int nbytes;
 while ((nbytes = input.Read(buffer, 0, buffer.Length)) > 0)
 {
-if (packet.Request.HttpMethod != "HEAD")
+if (context.Request.HttpMethod != "HEAD")
 {
-packet.Response.OutputStream.Write(buffer, 0, nbytes);
+context.Response.OutputStream.Write(buffer, 0, nbytes);
 }
 }
 
 input.Close();
-packet.Response.OutputStream.Flush();
+context.Response.OutputStream.Flush();
 }
 
-packet.Response.StatusCode = (int)HttpStatusCode.OK;
+context.Response.StatusCode = (int)HttpStatusCode.OK;
 }
 catch
 {
-packet.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
 }
 else
-packet.Response.StatusCode = (int)HttpStatusCode.NotFound;
+context.Response.StatusCode = (int)HttpStatusCode.NotFound;
 
-packet.Response.OutputStream.Close();
+context.Response.OutputStream.Close();
 }
 
 /// <summary>
 /// Exposes directory contents to be accessed by clients
 /// </summary>
 /// <param name="path">Path to directory</param>
 /// <param name="packet">Packet from HTTP method</param>
-public static void ServeDirectory(string path, ref Packet packet)
+public static void ServeDirectory(string path, HttpListenerContext context, Dictionary<string, string> parameters)
 {
 try
 {
@@ -212,17 +212,17 @@ public static void ServeDirectory(string path, ref Packet packet)
 {
 string fileName = Path.GetFileName(fileInDir);
 
-if (fileName == packet.Parameters["file"])
+if (fileName == parameters["file"])
 {
-ServeFile(fileInDir, ref packet);
+ServeFile(fileInDir, context);
 break;
 }
 }
 }
 catch (Exception e)
 {
 Debug.Log($"Error: {e}");
-Error.Page(HttpStatus.NotFound, ref packet);
+Error.Page(HttpStatus.NotFound, context);
 }
 }
 
@@ -231,12 +231,12 @@ public static void ServeDirectory(string path, ref Packet packet)
 /// </summary>
 /// <param name="path">Path to directory</param>
 /// <param name="packet">Packet from HTTP method</param>
-public static void ServeDirectoryRecursively(string path, string url, ref Packet packet)
+public static void ServeDirectoryRecursively(string path, string url, HttpListenerContext context)
 {
 try
 {
 path = path.Replace('\\', '/');
-string recursivePath = packet.Request.Url.AbsolutePath.Substring(url.LastIndexOf('{') + 1);
+string recursivePath = context.Request.Url.AbsolutePath.Substring(url.LastIndexOf('{') + 1);
 List<string> filesInDir = Directory.GetFiles(path, "*.*", SearchOption.AllDirectories).ToList();
 List<string> absoluteFiles = new();
 
@@ -248,7 +248,7 @@ public static void ServeDirectoryRecursively(string path, string url, ref Packet
 foreach ((string rel, string abs) file in zip)
 if (recursivePath == file.abs)
 {
-ServeFile(file.rel, ref packet);
+ServeFile(file.rel, context);
 break;
 }
 }
@@ -259,7 +259,7 @@ public static void ServeDirectoryRecursively(string path, string url, ref Packet
 catch (Exception e)
 {
 SentryWrapper.CaptureException(e);
-Error.Page(HttpStatus.InternalServerError, ref packet);
+Error.Page(HttpStatus.InternalServerError, context);
 }
 }
 

SAPI/API/Utilities/Json.cs

@@ -1,4 +1,5 @@
-using System.Text;
+using System.Net;
+using System.Text;
 using Newtonsoft.Json;
 
 namespace SAPI.API.Utilities
@@ -10,18 +11,18 @@ public static class Json
 /// </summary>
 /// <param name="json">Add here your object to send with json</param>
 /// <param name="response">Response ref you got from server</param>
-public static void Response<T>(T json, ref Packet packet)
+public static void Response<T>(T json, HttpListenerContext context)
 {
 var serializedJson = JsonConvert.SerializeObject(json);
 var data = Encoding.UTF8.GetBytes(serializedJson);
-packet.Response.ContentEncoding = Encoding.UTF8;
-packet.Response.ContentType = "application/json";
-packet.Response.ContentLength64 = data.LongLength;
-packet.Response.StatusCode = 200;
+context.Response.ContentEncoding = Encoding.UTF8;
+context.Response.ContentType = "application/json";
+context.Response.ContentLength64 = data.LongLength;
+context.Response.StatusCode = 200;
 
-if (packet.Request.HttpMethod != "HEAD")
+if (context.Request.HttpMethod != "HEAD")
 {
-packet.Response.OutputStream.Write(data, 0, data.Length);
+context.Response.OutputStream.Write(data, 0, data.Length);
 }
 }
 
@@ -30,9 +31,9 @@ public static void Response<T>(T json, ref Packet packet)
 /// </summary>
 /// <param name="json">Add here your instance of an object to be serialized</param>
 /// <param name="request">Request ref you got from server - argument in Task()</param>
-public static void Fetch<T>(out T json, ref Packet packet)
+public static void Fetch<T>(out T json, HttpListenerContext context)
 {
-StreamReader reader = new(packet.Request.InputStream, packet.Request.ContentEncoding);
+StreamReader reader = new(context.Request.InputStream, context.Request.ContentEncoding);
 
 var data = reader.ReadToEnd();
 json = JsonConvert.DeserializeObject<T>(data);