Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/appHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ var serialize = require("node-serialize")
const Op = db.Sequelize.Op

module.exports.userSearch = function (req, res) {
var query = "SELECT name,id FROM Users WHERE login='" + req.body.login + "'";
var query = "SELECT name,id FROM Users WHERE login=:login";
db.sequelize.query(query, {
replacements: { login: req.body.login },
model: db.User
}).then(user => {
if (user.length) {
Expand Down
8 changes: 5 additions & 3 deletions core/authHandler.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var db = require('../models')
var bCrypt = require('bcrypt')
var md5 = require('md5')
var crypto = require('crypto') // Change from md5 to crypto for secure hashing

module.exports.isAuthenticated = function (req, res, next) {
if (req.isAuthenticated()) {
Expand Down Expand Up @@ -46,7 +46,8 @@ module.exports.resetPw = function (req, res) {
}
}).then(user => {
if (user) {
if (req.query.token == md5(req.query.login)) {
const token = crypto.createHash('sha256').update(req.query.login).digest('hex'); // Secure hashing
if (req.query.token == token) {
res.render('resetpw', {
login: req.query.login,
token: req.query.token
Expand Down Expand Up @@ -75,7 +76,8 @@ module.exports.resetPwSubmit = function (req, res) {
}
}).then(user => {
if (user) {
if (req.body.token == md5(req.body.login)) {
const token = crypto.createHash('sha256').update(req.body.login).digest('hex'); // Secure hashing
if (req.body.token == token) {
user.password = bCrypt.hashSync(req.body.password, bCrypt.genSaltSync(10), null)
user.save().then(function () {
req.flash('success', "Passowrd successfully reset")
Expand Down
5 changes: 3 additions & 2 deletions models/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ var env = process.env.NODE_ENV || "development";
var config = require("../config/db.js")

if (process.env.DATABASE_URL) {
var sequelize = new Sequelize(process.env.DATABASE_URL);
var sequelize = new Sequelize(process.env.DATABASE_URL, { logging: false });
} else {
var sequelize = new Sequelize(config.database, config.username, config.password, {
host: config.host,
dialect: config.dialect
dialect: config.dialect,
logging: false
});
}

Expand Down
13 changes: 10 additions & 3 deletions routes/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
var router = require('express').Router()
var appHandler = require('../core/appHandler')
var authHandler = require('../core/authHandler')
var rateLimit = require('express-rate-limit')

// Define a rate limiter for expensive operations
const limiter = rateLimit({
windowMs: 15 * 60 * 1000, // 15 minutes
max: 100 // limit each IP to 100 requests per windowMs
})

module.exports = function () {
router.get('/', authHandler.isAuthenticated, function (req, res) {
Expand All @@ -19,7 +26,7 @@ module.exports = function () {
})
})

router.get('/bulkproducts', authHandler.isAuthenticated, function (req, res) {
router.get('/bulkproducts', authHandler.isAuthenticated, limiter, function (req, res) {
res.render('app/bulkproducts',{legacy:req.query.legacy})
})

Expand Down Expand Up @@ -59,9 +66,9 @@ module.exports = function () {

router.post('/calc', authHandler.isAuthenticated, appHandler.calc)

router.post('/bulkproducts',authHandler.isAuthenticated, appHandler.bulkProducts);
router.post('/bulkproducts',authHandler.isAuthenticated, limiter, appHandler.bulkProducts);

router.post('/bulkproductslegacy',authHandler.isAuthenticated, appHandler.bulkProductsLegacy);
router.post('/bulkproductslegacy',authHandler.isAuthenticated, limiter, appHandler.bulkProductsLegacy);

return router
}
18 changes: 16 additions & 2 deletions routes/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
var router = require('express').Router()
var vulnDict = require('../config/vulns')
var authHandler = require('../core/authHandler')
var rateLimit = require('express-rate-limit');

// Define a rate limiter for login and expensive operations
const loginLimiter = rateLimit({
windowMs: 15 * 60 * 1000, // 15 minutes
max: 5, // limit each IP to 5 requests per windowMs
message: 'Too many login attempts from this IP, please try again after 15 minutes'
});

const generalLimiter = rateLimit({
windowMs: 15 * 60 * 1000, // 15 minutes
max: 100, // limit each IP to 100 requests per windowMs
message: 'Too many requests from this IP, please try again after 15 minutes'
});

module.exports = function (passport) {
router.get('/', authHandler.isAuthenticated, function (req, res) {
Expand All @@ -11,7 +25,7 @@ module.exports = function (passport) {
res.render('login')
})

router.get('/learn/vulnerability/:vuln', authHandler.isAuthenticated, function (req, res) {
router.get('/learn/vulnerability/:vuln', authHandler.isAuthenticated, generalLimiter, function (req, res) {
res.render('vulnerabilities/layout', {
vuln: req.params.vuln,
vuln_title: vulnDict[req.params.vuln],
Expand Down Expand Up @@ -48,7 +62,7 @@ module.exports = function (passport) {

router.get('/resetpw', authHandler.resetPw)

router.post('/login', passport.authenticate('login', {
router.post('/login', loginLimiter, passport.authenticate('login', {
successRedirect: '/learn',
failureRedirect: '/login',
failureFlash: true
Expand Down
12 changes: 10 additions & 2 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,16 @@ app.use(fileUpload());
// Enable for Reverse proxy support
// app.set('trust proxy', 1)

// Use Helmet to secure Express headers
const helmet = require('helmet');
app.use(helmet());

// Intialize Session
app.use(session({
secret: 'keyboard cat',
secret: process.env.SESSION_SECRET || 'defaultSecret',
resave: true,
saveUninitialized: true,
cookie: { secure: false }
cookie: { secure: true }
}))

// Initialize Passport
Expand All @@ -34,6 +38,10 @@ app.use(passport.session())
// Initialize express-flash
app.use(require('express-flash')());

// CSRF protection
const csurf = require('csurf');
app.use(csurf());

// Routing
app.use('/app',require('./routes/app')())
app.use('/',require('./routes/main')(passport))
Expand Down