albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prettied some stuff, and moved submodules around again

Browse source
This commit is contained in:
mrfry 2020-10-01 14:42:48 +02:00
parent d8ef7cdcb0
commit 3f081d8dff
6 changed files with 106 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/middlewares/auth.middleware.js
View file

@ -2,7 +2,7 @@ const logger = require('../utils/logger.js')
const utils = require('../utils/utils.js')
const dbtools = require('../utils/dbtools.js')
module.exports = function (options) {
module.exports = function(options) {
const { userDB, jsonResponse, exceptions } = options
const renderLogin = (req, res) => {
@ -10,16 +10,16 @@ module.exports = function (options) {
if (jsonResponse) {
res.json({
result: 'nouser',
msg: 'You are not logged in'
msg: 'You are not logged in',
})
} else {
res.render('login', {
devel: process.env.NS_DEVEL
devel: process.env.NS_DEVEL,
})
}
}
return function (req, res, next) {
return function(req, res, next) {
const ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress
const sessionID = req.cookies.sessionID
const isException = exceptions.some((exc) => {
@ -29,17 +29,20 @@ module.exports = function (options) {
if (process.env.NS_NOUSER) {
req.session = {
user: {
id: 21323
id: 21323,
},
sessionID: sessionID || 111111111111111111,
isException: false
isException: false,
}
next()
return
}
// FIXME Allowing all urls with _next in it, but not in params
if (req.url.split('?')[0].includes('_next') || req.url.split('?')[0].includes('well-known/acme-challenge')) {
if (
req.url.split('?')[0].includes('_next') ||
req.url.split('?')[0].includes('well-known/acme-challenge')
) {
req.session = { isException: true }
next()
return
@ -74,34 +77,44 @@ module.exports = function (options) {
req.session = {
user: user,
sessionID: sessionID,
isException: isException
isException: isException,
}
logger.DebugLog(`ID #${user.id}: ${req.url}`, 'auth', 1)
UpdateAccess(userDB, user, ip, sessionID)
dbtools.Update(userDB, 'sessions', {
lastAccess: utils.GetDateString()
}, {
id: sessionID
})
dbtools.Update(
userDB,
'sessions',
{
lastAccess: utils.GetDateString(),
},
{
id: sessionID,
}
)
dbtools.Update(userDB, 'users', {
lastIP: ip,
lastAccess: utils.GetDateString()
}, {
id: user.id
})
dbtools.Update(
userDB,
'users',
{
lastIP: ip,
lastAccess: utils.GetDateString(),
},
{
id: user.id,
}
)
next()
}
}
function UpdateAccess (db, user, ip, sessionID) {
function UpdateAccess(db, user, ip, sessionID) {
const accesses = dbtools.Select(db, 'accesses', {
userId: user.id,
ip: ip
ip: ip,
})
if (accesses.length === 0) {
@ -109,16 +122,16 @@ function UpdateAccess (db, user, ip, sessionID) {
userID: user.id,
ip: ip,
sessionID: sessionID,
date: utils.GetDateString()
date: utils.GetDateString(),
})
}
}
function GetUserBySessionID (db, sessionID, req) {
function GetUserBySessionID(db, sessionID, req) {
logger.DebugLog(`Getting user from db`, 'auth', 2)
const session = dbtools.Select(db, 'sessions', {
id: sessionID
id: sessionID,
})[0]
if (!session) {
@ -126,7 +139,7 @@ function GetUserBySessionID (db, sessionID, req) {
}
const user = dbtools.Select(db, 'users', {
id: session.userID
id: session.userID,
})[0]
if (user) {

29
src/middlewares/reqlogger.middleware.js
View file

@ -1,11 +1,11 @@
const logger = require('../utils/logger.js')
module.exports = function (options) {
module.exports = function(options) {
const loggableKeywords = options ? options.loggableKeywords : undefined
const loggableModules = options ? options.loggableModules : undefined
return function (req, res, next) {
res.on('finish', function () {
return function(req, res, next) {
res.on('finish', function() {
if (req.url.includes('_next/static')) {
return
}
@ -22,18 +22,25 @@ module.exports = function (options) {
}
// fixme: regexp includes checking
const hasLoggableKeyword = loggableKeywords && loggableKeywords.some((x) => {
return req.url.includes(x)
})
const hasLoggableModule = loggableModules && loggableModules.some((x) => {
return hostname.includes(x)
})
const hasLoggableKeyword =
loggableKeywords &&
loggableKeywords.some((x) => {
return req.url.includes(x)
})
const hasLoggableModule =
loggableModules &&
loggableModules.some((x) => {
return hostname.includes(x)
})
const toLog = hasLoggableModule || hasLoggableKeyword
logger.LogReq(req, true, res.statusCode)
if (toLog) { logger.LogReq(req) }
if (toLog) {
logger.LogReq(req)
}
if (res.statusCode !== 404) {
logger.LogStat(req.url,
logger.LogStat(
req.url,
ip,
hostname,
req.session && req.session.user ? req.session.user.id : 'NOUSER'