diff --git a/src/middlewares/auth.middleware.ts b/src/middlewares/auth.middleware.ts index 3b4309a..99f80cb 100644 --- a/src/middlewares/auth.middleware.ts +++ b/src/middlewares/auth.middleware.ts @@ -15,7 +15,7 @@ const testUser = { created: new Date(), } -export default function(options: Options): any { +export default function (options: Options): any { const { userDB, jsonResponse, exceptions } = options const renderLogin = (req, res) => { @@ -32,8 +32,7 @@ export default function(options: Options): any { } } - return function(req, res, next) { - const ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress + return function (req, res, next) { const sessionID = req.cookies.sessionID const isException = exceptions.some((exc) => { return req.url.split('?')[0] === exc @@ -93,7 +92,7 @@ export default function(options: Options): any { logger.DebugLog(`ID #${user.id}: ${req.url}`, 'auth', 1) - UpdateAccess(userDB, user, ip, sessionID) + UpdateAccess(userDB, user, sessionID) dbtools.Update( userDB, @@ -110,7 +109,7 @@ export default function(options: Options): any { userDB, 'users', { - lastIP: ip, + lastIP: '0.0.0.0', lastAccess: utils.GetDateString(), }, { @@ -122,16 +121,16 @@ export default function(options: Options): any { } } -function UpdateAccess(db, user, ip, sessionID) { +function UpdateAccess(db, user, sessionID) { const accesses = dbtools.Select(db, 'accesses', { userId: user.id, - ip: ip, + ip: '0.0.0.0', }) if (accesses.length === 0) { dbtools.Insert(db, 'accesses', { userID: user.id, - ip: ip, + ip: '0.0.0.0', sessionID: sessionID, date: utils.GetDateString(), }) diff --git a/src/modules/api/submodules/feedback.ts b/src/modules/api/submodules/feedback.ts index be55e85..557562a 100644 --- a/src/modules/api/submodules/feedback.ts +++ b/src/modules/api/submodules/feedback.ts @@ -37,7 +37,6 @@ function setup(data: SubmoduleData): void { ) } - const ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress const user: User = req.session.user utils.AppendToFile( @@ -47,7 +46,6 @@ function setup(data: SubmoduleData): void { { ...req.body, userID: user ? user.id : 'no user', - ip: ip, }, null, 2 diff --git a/src/modules/api/submodules/qminingapi.ts b/src/modules/api/submodules/qminingapi.ts index c6af46f..450ec44 100644 --- a/src/modules/api/submodules/qminingapi.ts +++ b/src/modules/api/submodules/qminingapi.ts @@ -727,8 +727,6 @@ function setup(data: SubmoduleData): any { utils.WriteFile('[]', registeredScriptsFile) } - const ip: any = - req.headers['cf-connecting-ip'] || req.connection.remoteAddress const ua: any = req.headers['user-agent'] const registeredScripts = utils.ReadJSON(registeredScriptsFile) const { cid, uid, version, installSource, date } = req.body @@ -743,7 +741,6 @@ function setup(data: SubmoduleData): any { version: version, installSource: installSource, date: date, - ip: ip, userAgent: ua, } diff --git a/src/modules/api/submodules/userManagement.ts b/src/modules/api/submodules/userManagement.ts index 10595ab..8cab001 100644 --- a/src/modules/api/submodules/userManagement.ts +++ b/src/modules/api/submodules/userManagement.ts @@ -53,7 +53,7 @@ function setup(data: SubmoduleData): any { }) }) - app.post('/getpw', function(req: Request, res: any) { + app.post('/getpw', function (req: Request, res: any) { logger.LogReq(req) const requestingUser = req.session.user @@ -111,13 +111,9 @@ function setup(data: SubmoduleData): any { app.post('/login', (req: Request, res: any) => { logger.LogReq(req) const pw = req.body.pw - ? req.body.pw - .replace(/'/g, '') - .replace(/"/g, '') - .replace(/;/g, '') + ? req.body.pw.replace(/'/g, '').replace(/"/g, '').replace(/;/g, '') : false const isScript = req.body.script - const ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress const user: User = dbtools.Select(userDB, 'users', { pw: pw, })[0] @@ -156,7 +152,7 @@ function setup(data: SubmoduleData): any { 'users', { loginCount: user.loginCount + 1, - lastIP: ip, + lastIP: '0.0.0.0', lastLogin: utils.GetDateString(), }, { @@ -166,7 +162,7 @@ function setup(data: SubmoduleData): any { dbtools.Insert(userDB, 'sessions', { id: sessionID, - ip: ip, + ip: '0.0.0.0', userID: user.id, isScript: isScript ? 1 : 0, createDate: utils.GetDateString(), diff --git a/src/standaloneUtils/rmDuplicates.js b/src/standaloneUtils/rmDuplicates.js index 5d6b547..e09cdec 100644 --- a/src/standaloneUtils/rmDuplicates.js +++ b/src/standaloneUtils/rmDuplicates.js @@ -135,7 +135,7 @@ function removePossibleAnswersDuplicates(path) { const dataA = utils.ReadJSON(currPath) currIndex++ - printProgressBar(currIndex, count) + printProgressBar(currIndex, count - 1) contents.forEach((currFile2) => { const currPath2 = path + '/' + currDir + '/' + currFile2 diff --git a/src/utils/logger.ts b/src/utils/logger.ts index ab65976..ffb55be 100755 --- a/src/utils/logger.ts +++ b/src/utils/logger.ts @@ -102,11 +102,11 @@ function expandWithSpaces(text, count) { function LogReq(req: Request, toFile?: boolean, statusCode?: string): void { try { - let ip: any = + const ip: any = req.headers['cf-connecting-ip'] || req.connection.remoteAddress - if (!toFile) { - ip = expandWithSpaces(ip, 39) - } + // if (!toFile) { + // ip = expandWithSpaces(ip, 39) + // } const nolog = noLogips.some((noLogip) => { return ip.includes(noLogip) }) @@ -114,7 +114,7 @@ function LogReq(req: Request, toFile?: boolean, statusCode?: string): void { return } - let logEntry = logHashed(ip) + let logEntry = '' // logHashed(ip) let dl = DELIM if (req.url.includes('lred')) { dl += C('red')