Dinawo/CDN-APP-INSIDER
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update .gitignore and add new dependencies and routes
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
.dinawo
2024-04-02 20:59:13 +02:00
parent aa75d50361
commit 8f3e604774
16 changed files with 823 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Middlewares/UserIDMiddlewareAD.js
View File

@@ -1,7 +1,7 @@
const fs = require('fs').promises;
const path = require('path');
const filePath = path.join(__dirname, '../user.json');
const filePath = path.join(__dirname, '../data/user.json');
async function getUserData() {
try {
@@ -15,9 +15,14 @@ async function getUserData() {
async function checkUserExistsAD(req, res, next) {
let userData = await getUserData();
console.log('User data:', userData);
if (!req.user || (!req.user.name && !req.user.id)) {
return res.status(500).send('Internal Server Error');
if (Array.isArray(req.user)) {
req.user = req.user.find(u => u._json && u._json.sAMAccountName);
}
if (req.user && req.user._json && req.user._json.sAMAccountName) {
req.user.name = req.user._json.sAMAccountName;
}
try {
@@ -40,7 +45,7 @@ async function checkUserExistsAD(req, res, next) {
users.push(newUser);
try {
await fs.promises.writeFile(filePath, JSON.stringify(users, null, 2), 'utf8');
await fs.writeFile(filePath, JSON.stringify(users, null, 2), 'utf8');
} catch (error) {
console.error(`Failed to write to ${filePath}: ${error}`);
return next(error);

51
Middlewares/authMiddleware.js
View File

@@ -1,30 +1,41 @@
const fs = require('fs');
const path = require('path');
const { logger, logRequestInfo, ErrorLogger, authLogger } = require('../config/logs');
const debug = require('debug')('app:authMiddleware');
const authMiddleware = async (req, res, next) => {
if (req.isAuthenticated() || (req.user && req.user.name)) {
const data = await fs.promises.readFile('user.json', 'utf8');
const users = JSON.parse(data);
const user = users.find(user => user.name === req.user.name);
debug('Checking if user is authenticated...');
if (req.isAuthenticated() || (req.session && req.session.user && req.session.user.name)) {
debug('User is authenticated, reading user data...');
const data = await fs.promises.readFile(path.join(__dirname, '../data', 'user.json'), 'utf8');
const users = JSON.parse(data);
debug('User data:', users);
const user = users.find(user => user.name === (req.session.user && req.session.user.name));
if (!user) {
authLogger.info('User is not authenticated and user name is not set');
return res.redirect('/auth/login');
}
debug('User name from session:', req.session.user && req.session.user.name);
if (!req.session.user) {
authLogger.info('User connection attempt in progress, verification in progress...');
authLogger.info(`Login successfully completed, logged in user is: id=${user.id}, name=${user.name}, role=${user.role}, IP: ${req.ip}, User Agent: ${req.headers['user-agent']}`);
}
res.locals.user = user;
req.session.user = user;
req.userData = user;
return next();
} else {
authLogger.info(`Authentication failed for IP: ${req.ip}, User Agent: ${req.headers['user-agent']}. Redirecting to login.`);
res.redirect('/auth/login');
if (!user) {
authLogger.info('User is not authenticated and user name is not set');
debug('User not found in user data, redirecting to login...');
return res.redirect('/auth/login');
}
if (!req.session.user) {
authLogger.info('User connection attempt in progress, verification in progress...');
authLogger.info(`Login successfully completed, logged in user is: id=${user.id}, name=${user.name}, role=${user.role}, IP: ${req.ip}, User Agent: ${req.headers['user-agent']}`);
}
debug('Setting user data in session and locals...');
res.locals.user = user;
req.session.user = user;
req.userData = user;
debug('User data set, calling next middleware...');
return next();
} else {
authLogger.info(`Authentication failed for IP: ${req.ip}, User Agent: ${req.headers['user-agent']}. Redirecting to login.`);
debug('User is not authenticated, redirecting to login...');
res.redirect('/auth/login');
}
};
module.exports = authMiddleware;

43
Middlewares/watcherMiddleware.js
View File

@@ -3,23 +3,46 @@ 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'));
const userFilePath = path.resolve(__dirname, '../data/user.json');
const setupFilePath = path.resolve(__dirname, '../data/setup.json');
const watcher = chokidar.watch([path.resolve(__dirname, '../user.json'), path.resolve(__dirname, '../setup.json')], {
let userData, setupData;
try {
userData = JSON.parse(fs.readFileSync(userFilePath, 'utf-8'));
} catch (error) {
ErrorLogger.error(`Error parsing user.json: ${error}`);
}
try {
setupData = JSON.parse(fs.readFileSync(setupFilePath, 'utf-8'));
} catch (error) {
ErrorLogger.error(`Error parsing setup.json: ${error}`);
}
const watcher = chokidar.watch([userFilePath, setupFilePath], {
persistent: true
});
watcher.on('change', (filePath) => {
delete require.cache[require.resolve(filePath)];
if (filePath === path.resolve(__dirname, '../user.json')) {
userData = require(filePath);
} else if (filePath === path.resolve(__dirname, '../setup.json')) {
setupData = require(filePath);
let modifiedFile;
if (filePath === userFilePath) {
try {
userData = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
modifiedFile = 'user.json';
} catch (error) {
logger.error(`Error parsing user.json: ${error}`);
}
} else if (filePath === setupFilePath) {
try {
setupData = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
modifiedFile = 'setup.json';
} catch (error) {
logger.error(`Error parsing setup.json: ${error}`);
}
}
logger.info('File', filePath, 'has been changed');
logger.info(`File ${modifiedFile} has been modified`);
});
module.exports = {