From 0d3562de76db5cc003fc55a8f92705ba5bd54540 Mon Sep 17 00:00:00 2001
From: The Arcane Brony <myrainbowdash949@gmail.com>
Date: Sat, 18 Sep 2021 16:13:15 +0000
Subject: Add request logging (with env var: log-requests)

Request logging is enabled when the log-request environment variable is set.
---
 api/src/Server.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'api/src/Server.ts')

diff --git a/api/src/Server.ts b/api/src/Server.ts
index b9ca3fba..318d7094 100644
--- a/api/src/Server.ts
+++ b/api/src/Server.ts
@@ -11,6 +11,7 @@ import path from "path";
 import { initRateLimits } from "./middlewares/RateLimit";
 import TestClient from "./middlewares/TestClient";
 import { initTranslation } from "./middlewares/Translation";
+import morgan from "morgan";
 
 export interface FosscordServerOptions extends ServerOptions {}
 
@@ -36,6 +37,11 @@ export class FosscordServer extends Server {
 		await Config.init();
 		await initEvent();
 
+		let logRequests = process.env["log-requests"] != undefined;
+		if(logRequests) {
+			this.app.use(morgan("combined"));
+		}
+
 		this.app.use(CORS);
 		this.app.use(BodyParser({ inflate: true, limit: "10mb" }));
 
@@ -65,6 +71,9 @@ export class FosscordServer extends Server {
 		this.app.use(ErrorHandler);
 		TestClient(this.app);
 
+		if(logRequests){
+			console.log("Warning: Request logging is enabled! This will spam your console!\nTo disable this, unset the 'log-requests' environment variable!");
+		}
 		return super.start();
 	}
 }
-- 
cgit 1.5.1


From 0d41e18065131958de98c6dc86a564893115ebff Mon Sep 17 00:00:00 2001
From: The Arcane Brony <myrainbowdash949@gmail.com>
Date: Sat, 18 Sep 2021 18:43:00 +0000
Subject: Add response code white/blacklisting

---
 api/src/Server.ts | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'api/src/Server.ts')

diff --git a/api/src/Server.ts b/api/src/Server.ts
index 318d7094..bda19db5 100644
--- a/api/src/Server.ts
+++ b/api/src/Server.ts
@@ -1,3 +1,4 @@
+import { OptionsJson } from 'body-parser';
 import "missing-native-js-functions";
 import { Connection } from "mongoose";
 import { Server, ServerOptions } from "lambert-server";
@@ -37,9 +38,27 @@ export class FosscordServer extends Server {
 		await Config.init();
 		await initEvent();
 
+
+		/* 
+		DOCUMENTATION: uses log-requests environment variable
+		
+		# only log 200 and 204
+		log-requests=200 204
+		# log everything except 200 and 204
+		log-requests=-200 204
+		# log all requests
+		log-requests=-
+		*/
+		
 		let logRequests = process.env["log-requests"] != undefined;
 		if(logRequests) {
-			this.app.use(morgan("combined"));
+			this.app.use(morgan("combined", {
+				skip: (req, res) => {
+					var skip = !(process.env["log-requests"]?.includes(res.statusCode.toString()) ?? false);
+					if(process.env["log-requests"]?.charAt(0) == '-') skip = !skip;
+					return skip;
+				}
+			}));
 		}
 
 		this.app.use(CORS);
-- 
cgit 1.5.1


From 157f29536ac43c2d423e218eea78ee58bf7e80f6 Mon Sep 17 00:00:00 2001
From: The Arcane Brony <myrainbowdash949@gmail.com>
Date: Sat, 18 Sep 2021 21:01:06 +0200
Subject: Fix environment variable name to work on non-Windows platforms

---
 api/src/Server.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'api/src/Server.ts')

diff --git a/api/src/Server.ts b/api/src/Server.ts
index bda19db5..4a226d12 100644
--- a/api/src/Server.ts
+++ b/api/src/Server.ts
@@ -40,22 +40,22 @@ export class FosscordServer extends Server {
 
 
 		/* 
-		DOCUMENTATION: uses log-requests environment variable
+		DOCUMENTATION: uses LOG_REQUESTS environment variable
 		
 		# only log 200 and 204
-		log-requests=200 204
+		LOG_REQUESTS=200 204
 		# log everything except 200 and 204
-		log-requests=-200 204
+		LOG_REQUESTS=-200 204
 		# log all requests
-		log-requests=-
+		LOG_REQUESTS=-
 		*/
-		
-		let logRequests = process.env["log-requests"] != undefined;
+
+		let logRequests = process.env["LOG_REQUESTS"] != undefined;
 		if(logRequests) {
 			this.app.use(morgan("combined", {
 				skip: (req, res) => {
-					var skip = !(process.env["log-requests"]?.includes(res.statusCode.toString()) ?? false);
-					if(process.env["log-requests"]?.charAt(0) == '-') skip = !skip;
+					var skip = !(process.env["LOG_REQUESTS"]?.includes(res.statusCode.toString()) ?? false);
+					if(process.env["LOG_REQUESTS"]?.charAt(0) == '-') skip = !skip;
 					return skip;
 				}
 			}));
@@ -91,7 +91,7 @@ export class FosscordServer extends Server {
 		TestClient(this.app);
 
 		if(logRequests){
-			console.log("Warning: Request logging is enabled! This will spam your console!\nTo disable this, unset the 'log-requests' environment variable!");
+			console.log("Warning: Request logging is enabled! This will spam your console!\nTo disable this, unset the 'LOG_REQUESTS' environment variable!");
 		}
 		return super.start();
 	}
-- 
cgit 1.5.1