Merge pull request #228 from Zephyrrus/begone_trailing_commas

Merge own dev branch into main dev branch

2 files changed, 65 insertions, 30 deletions

diff --git a/src/api/structures/Route.js b/src/api/structures/Route.js
index 8956c24..74589c5 100644
--- a/src/api/structures/Route.js
+++ b/src/api/structures/Route.js
@@ -7,23 +7,19 @@ const db = require('knex')({
 		user: process.env.DB_USER,
 		password: process.env.DB_PASSWORD,
 		database: process.env.DB_DATABASE,
-		filename: nodePath.join(__dirname, '..', '..', '..', 'database.sqlite')
+		filename: nodePath.join(__dirname, '../../../database.sqlite')
 	},
-	postProcessResponse: result => {
+	postProcessResponse: (result) => {
 		/*
 			Fun fact: Depending on the database used by the user and given that I don't want
 			to force a specific database for everyone because of the nature of this project,
 			some things like different data types for booleans need to be considered like in
 			the implementation below where sqlite returns 1 and 0 instead of true and false.
 		*/
-		const booleanFields = [
-			'enabled',
-			'enableDownload',
-			'isAdmin'
-		];
+		const booleanFields = ['enabled', 'enableDownload', 'isAdmin'];
 
-		const processResponse = row => {
-			Object.keys(row).forEach(key => {
+		const processResponse = (row) => {
+			Object.keys(row).forEach((key) => {
 				if (booleanFields.includes(key)) {
 					if (row[key] === 0) row[key] = false;
 					else if (row[key] === 1) row[key] = true;
@@ -32,11 +28,11 @@ const db = require('knex')({
 			return row;
 		};
 
-		if (Array.isArray(result)) return result.map(row => processResponse(row));
+		if (Array.isArray(result)) return result.map((row) => processResponse(row));
 		if (typeof result === 'object') return processResponse(result);
 		return result;
 	},
-	useNullAsDefault: process.env.DB_CLIENT === 'sqlite3' ? true : false
+	useNullAsDefault: process.env.DB_CLIENT === 'sqlite3'
 });
 const moment = require('moment');
 const log = require('../utils/Log');
@@ -52,11 +48,15 @@ class Route {
 	}
 
 	async authorize(req, res) {
-		const banned = await db.table('bans').where({ ip: req.ip }).first();
+		const banned = await db
+			.table('bans')
+			.where({ ip: req.ip })
+			.first();
 		if (banned) return res.status(401).json({ message: 'This IP has been banned from using the service.' });
 
 		if (this.options.bypassAuth) return this.run(req, res, db);
-		// The only reason I call it token here and not Api Key is to be backwards compatible with the uploader and sharex
+		// The only reason I call it token here and not Api Key is to be backwards compatible
+		// with the uploader and sharex
 		// Small price to pay.
 		if (req.headers.token) return this.authorizeApiKey(req, res, req.headers.token);
 		if (!req.headers.authorization) return res.status(401).json({ message: 'No authorization header provided' });
@@ -72,11 +72,16 @@ class Route {
 			const id = decoded ? decoded.sub : '';
 			const iat = decoded ? decoded.iat : '';
 
-			const user = await db.table('users').where({ id }).first();
+			const user = await db
+				.table('users')
+				.where({ id })
+				.first();
 			if (!user) return res.status(401).json({ message: 'Invalid authorization' });
-			if (iat && iat < moment(user.passwordEditedAt).format('x')) return res.status(401).json({ message: 'Token expired' });
+			if (iat && iat < moment(user.passwordEditedAt).format('x')) {
+				return res.status(401).json({ message: 'Token expired' });
+			}
 			if (!user.enabled) return res.status(401).json({ message: 'This account has been disabled' });
-			if (this.options.adminOnly && !user.isAdmin) return res.status(401).json({ message: 'Invalid authorization' });
+			if (this.options.adminOnly && !user.isAdmin) { return res.status(401).json({ message: 'Invalid authorization' }); }
 
 			return this.run(req, res, db, user);
 		});
@@ -84,16 +89,17 @@ class Route {
 
 	async authorizeApiKey(req, res, apiKey) {
 		if (!this.options.canApiKey) return res.status(401).json({ message: 'Api Key not allowed for this resource' });
-		const user = await db.table('users').where({ apiKey }).first();
+		const user = await db
+			.table('users')
+			.where({ apiKey })
+			.first();
 		if (!user) return res.status(401).json({ message: 'Invalid authorization' });
 		if (!user.enabled) return res.status(401).json({ message: 'This account has been disabled' });
 
 		return this.run(req, res, db, user);
 	}
 
-	run(req, res, db) { // eslint-disable-line no-unused-vars
-		return;
-	}
+	run() {}
 
 	error(res, error) {
 		log.error(error);
diff --git a/src/api/structures/Server.js b/src/api/structures/Server.js
index 2039ed5..83b2880 100644
--- a/src/api/structures/Server.js
+++ b/src/api/structures/Server.js
@@ -1,6 +1,5 @@
 require('dotenv').config();
 
-const log = require('../utils/Log');
 const express = require('express');
 const helmet = require('helmet');
 const cors = require('cors');
@@ -8,7 +7,11 @@ const RateLimit = require('express-rate-limit');
 const bodyParser = require('body-parser');
 const jetpack = require('fs-jetpack');
 const path = require('path');
+const morgan = require('morgan');
+const log = require('../utils/Log');
+const ThumbUtil = require('../utils/ThumbUtil');
 
+// eslint-disable-next-line no-unused-vars
 const rateLimiter = new RateLimit({
 	windowMs: parseInt(process.env.RATE_LIMIT_WINDOW, 10),
 	max: parseInt(process.env.RATE_LIMIT_MAX, 10),
@@ -32,22 +35,48 @@ class Server {
 		});
 		this.server.use(bodyParser.urlencoded({ extended: true }));
 		this.server.use(bodyParser.json());
+		if (process.env.NODE_ENV !== 'production') {
+			this.server.use(morgan('combined', {
+				skip(req) {
+					let ext = req.path.split('.').pop();
+					if (ext) { ext = `.${ext.toLowerCase()}`; }
+
+					if (
+						ThumbUtil.imageExtensions.indexOf(ext) > -1
+						|| ThumbUtil.videoExtensions.indexOf(ext) > -1
+						|| req.path.indexOf('_nuxt') > -1
+						|| req.path.indexOf('favicon.ico') > -1
+					) {
+						return true;
+					}
+					return false;
+				},
+				'stream': {
+					write(str) { log.debug(str); }
+				}
+			}));
+		}
 		// this.server.use(rateLimiter);
 
 		// Serve the uploads
-		this.server.use(express.static(path.join(__dirname, '..', '..', '..', 'uploads')));
-		this.routesFolder = path.join(__dirname, '..', 'routes');
+		this.server.use(express.static(path.join(__dirname, '../../../uploads')));
+		this.routesFolder = path.join(__dirname, '../routes');
 	}
 
 	registerAllTheRoutes() {
-		jetpack.find(this.routesFolder, { matching: '*.js' }).forEach(routeFile => {
-			const RouteClass = require(path.join('..', '..', '..', routeFile));
+		jetpack.find(this.routesFolder, { matching: '*.js' }).forEach((routeFile) => {
+			// eslint-disable-next-line import/no-dynamic-require, global-require
+			const RouteClass = require(path.join('../../../', routeFile));
 			let routes = [RouteClass];
 			if (Array.isArray(RouteClass)) routes = RouteClass;
 			for (const File of routes) {
-				const route = new File();
-				this.server[route.method](process.env.ROUTE_PREFIX + route.path, route.authorize.bind(route));
-				log.info(`Found route ${route.method.toUpperCase()} ${process.env.ROUTE_PREFIX}${route.path}`);
+				try {
+					const route = new File();
+					this.server[route.method](process.env.ROUTE_PREFIX + route.path, route.authorize.bind(route));
+					log.info(`Found route ${route.method.toUpperCase()} ${process.env.ROUTE_PREFIX}${route.path}`);
+				} catch (e) {
+					log.error(`Failed loading route from file ${routeFile} with error: ${e.message}`);
+				}
 			}
 		});
 	}
@@ -55,7 +84,7 @@ class Server {
 	serveNuxt() {
 		// Serve the frontend if we are in production mode
 		if (process.env.NODE_ENV === 'production') {
-			this.server.use(express.static(path.join(__dirname, '..', '..', '..', 'dist')));
+			this.server.use(express.static(path.join(__dirname, '../../../dist')));
 		}
 
 		/*
@@ -66,7 +95,7 @@ class Server {
 		*/
 		this.server.all('*', (_req, res) => {
 			try {
-				res.sendFile(path.join(__dirname, '..', '..', '..', 'dist', 'index.html'));
+				res.sendFile(path.join(__dirname, '../../../dist/index.html'));
 			} catch (error) {
 				res.json({ success: false, message: 'Something went wrong' });
 			}