From 81577ad6212e8c3d335fbee6e3bb7bdfd5a411ee Mon Sep 17 00:00:00 2001 From: mrfry Date: Mon, 21 Dec 2020 12:25:09 +0100 Subject: [PATCH] Removed veteranpw api and page --- src/modules/api/api.ts | 98 ---------------- src/modules/qmining/qmining.ts | 10 -- src/modules/qmining/views/veteranPw.ejs | 150 ------------------------ submodules/qmining-page | 2 +- 4 files changed, 1 insertion(+), 259 deletions(-) delete mode 100644 src/modules/qmining/views/veteranPw.ejs diff --git a/src/modules/api/api.ts b/src/modules/api/api.ts index 8b51c88..04bf815 100644 --- a/src/modules/api/api.ts +++ b/src/modules/api/api.ts @@ -68,7 +68,6 @@ const recievedQuestionFile = 'stats/recievedQuestions' // other constants const line = '====================================================' // lol -const maxVeteranPwGetCount = 10 const addPWPerDay = 3 // every x day a user can give a pw const maxPWCount = 6 // maximum pw give opportunities a user can have at once const addPWCount = 1 // how many pw gen opportunities to add each time @@ -143,7 +142,6 @@ function GetApp(): ModuleType { exceptions: [ '/favicon.ico', '/login', - '/getveteranpw', '/postfeedbackfile', '/postfeedback', '/fosuploader', @@ -585,102 +583,6 @@ function GetApp(): ModuleType { }) }) - app.post('/getveteranpw', function(req: Request, res: any) { - logger.LogReq(req) - const ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress - const tries = dbtools.Select(userDB, 'veteranPWRequests', { - ip: ip, - })[0] - - if (tries) { - if (tries.count > maxVeteranPwGetCount) { - res.json({ - result: 'error', - msg: 'Too many tries from this IP', - }) - logger.Log( - `Too many veteran PW requests from ${ip}!`, - logger.GetColor('cyan') - ) - return - } else { - dbtools.Update( - userDB, - 'veteranPWRequests', - { - count: tries.count + 1, - lastDate: utils.GetDateString(), - }, - { - id: tries.id, - } - ) - } - } else { - dbtools.Insert(userDB, 'veteranPWRequests', { - ip: ip, - lastDate: utils.GetDateString(), - }) - } - - const oldUserID = req.body.cid - - if (!oldUserID) { - res.json({ - result: 'error', - msg: 'No Client ID recieved', - }) - logger.Log(`No client ID recieved`, logger.GetColor('cyan')) - return - } - - const user: User = dbtools.Select(userDB, 'users', { - oldCID: oldUserID, - })[0] - - if (user) { - if (user.pwGotFromCID === 0) { - logger.Log( - `Sent password to veteran user #${user.id}`, - logger.GetColor('cyan') - ) - dbtools.Update( - userDB, - 'users', - { - pwGotFromCID: 1, - }, - { - id: user.id, - } - ) - - res.json({ - result: 'success', - pw: user.pw, - }) - } else { - logger.Log( - `Veteran user #${user.id} already requested password`, - logger.GetColor('cyan') - ) - res.json({ - result: 'error', - msg: 'Password already requested', - }) - } - } else { - logger.Log( - `Invalid password request with CID: ${oldUserID}`, - logger.GetColor('cyan') - ) - res.json({ - result: 'error', - msg: 'No such Client ID', - }) - } - }) - app.post('/login', (req: Request, res: any) => { logger.LogReq(req) const pw = req.body.pw diff --git a/src/modules/qmining/qmining.ts b/src/modules/qmining/qmining.ts index 0ea3055..ce1ab35 100644 --- a/src/modules/qmining/qmining.ts +++ b/src/modules/qmining/qmining.ts @@ -58,9 +58,7 @@ function GetApp(): ModuleType { '/thanks', '/thanks.html', '/img/thanks.gif', - '/install', '/favicon.ico', - '/getVeteranPw', '/moodle-test-userscript/stable.user.js', '/irc', '/donate', @@ -221,14 +219,6 @@ function GetApp(): ModuleType { logger.LogReq(req) }) - app.get('/getVeteranPw', function(req: Request, res) { - res.render('veteranPw', { - cid: req.query.cid || '', - devel: process.env.NS_DEVEL, - }) - logger.LogReq(req) - }) - app.get('*', function(req: Request, res) { res.status(404).render('404') }) diff --git a/src/modules/qmining/views/veteranPw.ejs b/src/modules/qmining/views/veteranPw.ejs deleted file mode 100644 index 4746bee..0000000 --- a/src/modules/qmining/views/veteranPw.ejs +++ /dev/null @@ -1,150 +0,0 @@ - - - - - Frylabs - - - - -
-
- Frylabs -
-
- Másold be ide régi kliens ID-d, és az alapján jelszót kapsz. Ezt csak egyszer teheted meg, - ezért a kapott jelszót tuti helyre írd le! -
- -
-
- -
- - -
-
- - - diff --git a/submodules/qmining-page b/submodules/qmining-page index e935de7..bc776b3 160000 --- a/submodules/qmining-page +++ b/submodules/qmining-page @@ -1 +1 @@ -Subproject commit e935de7e7896ca5207de84672ecdaa89a003827a +Subproject commit bc776b3307c975f826afb1338874330924d601ba