diff --git a/Middlewares/watcherMiddleware.js b/Middlewares/watcherMiddleware.js index 21be177..9c1a03a 100644 --- a/Middlewares/watcherMiddleware.js +++ b/Middlewares/watcherMiddleware.js @@ -1,6 +1,7 @@ const path = require('path'); const chokidar = require('chokidar'); const fs = require('fs'); +const { logger, ErrorLogger, logRequestInfo } = require('../config/logs'); let userData = require(path.resolve(__dirname, '../user.json')); let setupData = require(path.resolve(__dirname, '../setup.json')); @@ -18,10 +19,10 @@ watcher.on('change', (filePath) => { setupData = require(filePath); } - console.log('File', filePath, 'has been changed'); + logger.info('File', filePath, 'has been changed'); }); module.exports = { - getUserData: () => userData, - getSetupData: () => setupData + getUserData: () => Promise.resolve(userData), + getSetupData: () => Promise.resolve(setupData) }; \ No newline at end of file diff --git a/models/Passport-ActiveDirectory.js b/models/Passport-ActiveDirectory.js index f390334..e7c246d 100644 --- a/models/Passport-ActiveDirectory.js +++ b/models/Passport-ActiveDirectory.js @@ -31,8 +31,8 @@ passport.serializeUser((user, done) => { done(null, user.name); }); -passport.deserializeUser((id, done) => { - const users = getUserData(); +passport.deserializeUser(async (id, done) => { + const users = await getUserData(); const user = users.find(u => u.name === id || u.name === `.${id}`); diff --git a/routes/index.js b/routes/index.js index c1848cc..75cc18c 100644 --- a/routes/index.js +++ b/routes/index.js @@ -82,7 +82,7 @@ router.get('/setup', (req, res) => { if (Object.keys(setup).length === 0 && setup.constructor === Object) { res.render('setup', { setup }); } else { - res.status(200).json({ success: false, message: 'The CDN configuration is already done.' }); + res.status(200).json({message: 'The CDN configuration is already done.' }); } }); }); diff --git a/server.js b/server.js index e748209..901777e 100644 --- a/server.js +++ b/server.js @@ -9,6 +9,7 @@ const { version } = require('./package.json'); const axios = require('axios'); const app = express(); const flash = require('connect-flash'); +const crypto = require('crypto'); const fs = require('fs'); const SystemReport = require('./models/reportManager.js'); @@ -34,12 +35,18 @@ app.get(['/user.json', '/file_info.json', '/setup.json'], (req, res) => { res.status(403).send('Access Denied'); });app.use(express.urlencoded({ extended: true })); +function generateSecretKey() { + return crypto.randomBytes(64).toString('hex'); +} + app.use(session({ - secret: '63a69c252dfe0bb20650b6365b48dc99ad6c7eac19faed62670e73a071c54236e2faf04ee009919592def437b98d3c726c40a56ef1d8759878c1703a93244aa3', + secret: generateSecretKey(), resave: false, saveUninitialized: true, cookie: { secure: false } -}));app.use(passport.initialize()); +})); + +app.use(passport.initialize()); app.use(passport.session()); app.use(bodyParser.urlencoded({ extended: true }));