mirror of
https://gitlab.com/MrFry/mrfrys-node-server
synced 2025-04-01 20:24:18 +02:00
Removed ip address logging
This commit is contained in:
parent
c1feb28f86
commit
168a36b538
6 changed files with 17 additions and 27 deletions
|
@ -33,7 +33,6 @@ export default function(options: Options): any {
|
|||
}
|
||||
|
||||
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) => {
|
||||
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(),
|
||||
})
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
}
|
||||
|
||||
|
|
|
@ -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(),
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue