From 7f85d7d1bb2fc59724ebc2b33c0c12bb27ba6ffd Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Thu, 22 Apr 2021 17:30:22 +1000 Subject: [PATCH 1/9] fixie fix --- index.js | 3 +++ public/CCashLogo3.png | Bin 0 -> 21135 bytes views/layout.pug | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 public/CCashLogo3.png diff --git a/index.js b/index.js index fde2ad8..b7150ac 100644 --- a/index.js +++ b/index.js @@ -324,6 +324,9 @@ app.post('/login', async function(req, res){ } catch(err){ console.log(err) } + if(!adminTest.body.value){ + res.redirect('/') + } req.session.admin = adminTest.body.value req.session.adminp = password let verified diff --git a/public/CCashLogo3.png b/public/CCashLogo3.png new file mode 100644 index 0000000000000000000000000000000000000000..2c8f7f562dbd2eed754812e30aab0f954ac8e506 GIT binary patch literal 21135 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 literal 0 HcmV?d00001 diff --git a/views/layout.pug b/views/layout.pug index 443724b..f0aaa65 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -12,7 +12,7 @@ html nav.navbar.navbar-expand-lg.navbar-light.navbarrr.shadow-lg .container a.navbar-brand(href='/') - img(src="../CCashLogo2.png" style="width:75px") + img(src="../CCashLogo3.png" style="width:75px") button.navbar-toggler(type='button', data-toggle='collapse', data-target='#navbars', aria-controls='navbars', aria-expanded='false', aria-label='Toggle navigation') span.navbar-toggler-icon #navbars.collapse.navbar-collapse From 72dc78eb7c594e75e13114d68171721aa08c7285 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Thu, 22 Apr 2021 18:14:48 +1000 Subject: [PATCH 2/9] small bit of optimization --- views/layout.pug | 1 - 1 file changed, 1 deletion(-) diff --git a/views/layout.pug b/views/layout.pug index f0aaa65..a59a25d 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -2,7 +2,6 @@ doctype html html head title CCashBank - link(href="https://fonts.googleapis.com/css2?family=Josefin+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap" rel="stylesheet") link(rel="stylesheet", href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css", integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z", crossorigin="anonymous") link(rel="preconnect" href="https://fonts.gstatic.com") link(href="https://fonts.googleapis.com/css2?family=Lato&family=Montserrat&display=swap" rel="stylesheet") From 9044469aa4574d09b518d85e33e3f7cad763f1c1 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Thu, 22 Apr 2021 18:23:59 +1000 Subject: [PATCH 3/9] un fucked some things --- index.js | 67 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/index.js b/index.js index b7150ac..3902139 100644 --- a/index.js +++ b/index.js @@ -324,44 +324,47 @@ app.post('/login', async function(req, res){ } catch(err){ console.log(err) } - if(!adminTest.body.value){ + if(adminTest.body.value == undefined){ res.redirect('/') - } - req.session.admin = adminTest.body.value - req.session.adminp = password - let verified - try{ - verified = await got.post(process.env.BANKAPIURL+'BankF/vpass', { - json:{ - name: name, - attempt: password - }, - responseType:'json' + }else{ + req.session.admin = adminTest.body.value + req.session.adminp = password + let verified + try{ + verified = await got.post(process.env.BANKAPIURL+'BankF/vpass', { + json:{ + name: name, + attempt: password + }, + responseType:'json' - }) - - - } catch(err){ - console.log(err) - } finally { - console.log(verified.body.value) - if(verified.body.value == 0){ - errors.push({msg: 'Password wrong'}) - res.render('login',{ - errors:errors - }) - }else if(verified.body.value == 1){ - req.session.user = name; - req.session.password = password - res.redirect('/BankF') - } else { - errors.push({msg: 'User not found'}) - res.render('login',{ - errors:errors }) + + + } catch(err){ + console.log(err) + } finally { + console.log(verified.body.value) + if(verified.body.value == 0){ + errors.push({msg: 'Password wrong'}) + res.render('login',{ + errors:errors + }) + }else if(verified.body.value == 1){ + req.session.user = name; + req.session.password = password + res.redirect('/BankF') + } else { + errors.push({msg: 'User not found'}) + res.render('login',{ + errors:errors + }) + } } + } + //res.redirect('/login') }) From 95f5d2cf483d15e5df1abf348bc51bbb501f6dab Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Thu, 22 Apr 2021 19:16:45 +1000 Subject: [PATCH 4/9] fixed and twix proofed things --- index.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/index.js b/index.js index 3902139..f8ba68d 100644 --- a/index.js +++ b/index.js @@ -151,13 +151,14 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){ } logsent = logsent.body.value - if(logsent == 1 || logsent == -1){ + console.log(logsent) + if(logsent == 1 || logsent == -1 || logrec == null){ logsent = undefined }else{ logsent = logsent.filter(({ from }) => from === req.session.user) } logrec = logrec.body.value - if(logrec == 1 || logrec == -1){ + if(logrec == 1 || logrec == -1 || logrec == null){ logrec = undefined } else{ logrec = logrec.filter(({ to }) => to === req.session.user) @@ -233,18 +234,17 @@ app.post('/sendfunds', async function(req, res){ } logsent = logsent.body.value - if(logsent == 1){ + console.log(logsent) + if(logsent == 1|| logrec == -1 || logrec == null){ logsent = undefined - }else if (logsent == -1){ - logsent = undefined - } else{ - logsent = logsent.filter(({ from }) => from === req.session.user) + }else{ + logsent = await logsent.filter(({ from }) => from === req.session.user) } logrec = logrec.body.value - if(logrec == 1 || logrec == -1){ + if(logrec == 1 || logrec == -1 || logrec == null){ logrec = undefined } else{ - logrec = logrec.filter(({ to }) => to === req.session.user) + logrec = await logrec.filter(({ to }) => to === req.session.user) } for( i in logrec){ let d = new Date(logrec[i].time) From 5a67d13f75d16231fcddf4652cce9de19652a7d1 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Thu, 22 Apr 2021 21:16:15 +1000 Subject: [PATCH 5/9] fuggin session clearing fo admins pogchamp --- index.js | 3 --- routes/admin.js | 33 +++++++++++++++++++++++++++++++++ views/adminsettings.pug | 10 ++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index f8ba68d..0d9a083 100644 --- a/index.js +++ b/index.js @@ -151,7 +151,6 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){ } logsent = logsent.body.value - console.log(logsent) if(logsent == 1 || logsent == -1 || logrec == null){ logsent = undefined }else{ @@ -249,12 +248,10 @@ app.post('/sendfunds', async function(req, res){ for( i in logrec){ let d = new Date(logrec[i].time) logrec[i].time = d - console.log(logrec[i].time) } for( i in logsent){ let d = new Date(logsent[i].time) logsent[i].time = d - console.log(logsent[i].time) } res.render("bankf",{ diff --git a/routes/admin.js b/routes/admin.js index 7e9d447..1fb355b 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -9,7 +9,10 @@ const expressValidator = require('express-validator'); const session = require('express-session'); const {postUser} = require('../helpers/functions.js') const got = require('got') +const MemoryStore = require('memorystore')(session) console.log('Sen was here') + + router.get('/', checkAdmin, function(req, res){ res.render('adminsettings', { user: req.session.user, @@ -151,6 +154,36 @@ router.post('/userdelete', checkAdmin, async function(req,res){ errors: errors, }) }) +router.post('/destroyallsessions', checkAdmin, async function(req,res) { + let {attempt} = req.body; + let adminTest + let errors = [] + try{ + adminTest = await got.post(process.env.BANKAPIURL+'BankF/admin/vpass',{ + json:{ + attempt: attempt, + }, + responseType:'json' + }) + } catch(err){ + console.log(err) + } + console.log(adminTest.body.value) + if(adminTest){ + req.sessionStore.clear(function(err){ + console.log(err) + }) + res.redirect('/') + }else{ + errors.push({msg: "failed admin password check"}) + res.render("adminsettings",{ + user: req.session.user, + admin: req.session.admin, + errors: errors, + }) + } + +}) router.post('/close', checkAdmin, async function(req,res){ let {attempt} = req.body; let close; diff --git a/views/adminsettings.pug b/views/adminsettings.pug index fda251a..9d77978 100644 --- a/views/adminsettings.pug +++ b/views/adminsettings.pug @@ -57,6 +57,16 @@ block content br input.btn.btn-primary(type='submit',value='Submit') br + .card.shadow-lg + h4 Destroy All Sessions + form(method='POST', action='/admin/destroyallsessions') + #form-group + p WARNING THIS WILL DESTROY ALL LOGIN SESSIONS, EVERYONE WILL HAVE TO LOG IN AGAIN + label Confirm admin password to DESTROY + input.form-control(name='attempt', type='password') + br + input.btn.btn-danger(type='submit',value='Destroy') + br .card.shadow-lg h4 Close Server form(method='POST', action='/admin/close') From bfde2b1d4156a1d0ed90c8543c68fb529baf0a18 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Fri, 23 Apr 2021 12:11:07 +1000 Subject: [PATCH 6/9] benchmarking --- index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 0d9a083..ff19302 100644 --- a/index.js +++ b/index.js @@ -129,6 +129,7 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){ } let logsent let logrec + console.log('start '+Date.now()) try{ logsent = await got.post(process.env.BANKAPIURL+'BankF/'+req.session.user+'/log',{ json:{ @@ -149,7 +150,7 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){ } catch(e) { console.log(e) } - + console.log("query finished "+Date.now()) logsent = logsent.body.value if(logsent == 1 || logsent == -1 || logrec == null){ logsent = undefined @@ -168,6 +169,7 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){ for( i in logsent){ logsent[i].time = Date(logsent[i].time) } + console.log("begin render " + Date.now()) res.render('bankf',{ logrec:logrec, logsent:logsent, @@ -211,6 +213,7 @@ app.post('/sendfunds', async function(req, res){ let logsent let logrec + try{ logsent = await got.post(process.env.BANKAPIURL+'BankF/'+req.session.user+'/log',{ json:{ From c6beda3a044df186e032199e448300c2b217c6b7 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Fri, 23 Apr 2021 12:17:47 +1000 Subject: [PATCH 7/9] benchmark 2 old meme --- index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/index.js b/index.js index ff19302..11f7d84 100644 --- a/index.js +++ b/index.js @@ -150,6 +150,7 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){ } catch(e) { console.log(e) } + console.log("timings to server"+logrec.timings) console.log("query finished "+Date.now()) logsent = logsent.body.value if(logsent == 1 || logsent == -1 || logrec == null){ From bca67bba2a31c451b97d5b6252894d7bd1d20826 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Fri, 23 Apr 2021 12:23:49 +1000 Subject: [PATCH 8/9] benchmark 3 the fappening --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 11f7d84..41a96fc 100644 --- a/index.js +++ b/index.js @@ -150,7 +150,7 @@ app.get('/BankF', ensureAuthenticated, async function(req, res){ } catch(e) { console.log(e) } - console.log("timings to server"+logrec.timings) + console.log(logrec.timings) console.log("query finished "+Date.now()) logsent = logsent.body.value if(logsent == 1 || logsent == -1 || logrec == null){ From d74585a366ffeeb0c79449b9f87a962f8b5828e9 Mon Sep 17 00:00:00 2001 From: Expand-sys Date: Fri, 23 Apr 2021 12:36:39 +1000 Subject: [PATCH 9/9] specified exact dimenstions of the only image --- views/layout.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/layout.pug b/views/layout.pug index a59a25d..654731e 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -11,7 +11,7 @@ html nav.navbar.navbar-expand-lg.navbar-light.navbarrr.shadow-lg .container a.navbar-brand(href='/') - img(src="../CCashLogo3.png" style="width:75px") + img(src="../CCashLogo3.png" style="width:75px; height:74px") button.navbar-toggler(type='button', data-toggle='collapse', data-target='#navbars', aria-controls='navbars', aria-expanded='false', aria-label='Toggle navigation') span.navbar-toggler-icon #navbars.collapse.navbar-collapse