Refactor Dockerfile and docker-compose.yml to use new directory structure and update volume paths
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
2024-05-08 01:12:12 +02:00
parent 4c5019ab51
commit 11856846d8
21 changed files with 781 additions and 475 deletions

View File

@@ -0,0 +1,53 @@
const express = require('express');
const fs = require('fs');
const path = require('path');
const router = express.Router();
const fileUpload = require('express-fileupload');
const authMiddleware = require('../../../Middlewares/authMiddleware');
const { loggers } = require('winston');
const ncp = require('ncp').ncp;
const configFile = fs.readFileSync(path.join(__dirname, '../../../data', 'setup.json'), 'utf-8')
const config = JSON.parse(configFile);
const bodyParser = require('body-parser');
const crypto = require('crypto');
const os = require('os');
const { getUserData, getSetupData } = require('../../../Middlewares/watcherMiddleware');
const { logger, logRequestInfo, ErrorLogger, authLogger } = require('../../../config/logs');
let setupData = getSetupData();
let userData = getUserData();
router.use(bodyParser.json());
router.get('/', (req, res) => {
res.status(400).json({ error: 'Bad Request. The request cannot be fulfilled due to bad syntax or missing parameters.' });
});
router.post('/file_info', authMiddleware, (req, res) => {
const filePath = path.join(__dirname, '../../../data', 'file_info.json');
if (!fs.existsSync(filePath)) {
return res.status(404).json({ error: 'The specified file does not exist.' });
}
fs.readFile(filePath, 'utf-8', (err, data) => {
if (err) {
console.error(err);
return res.status(500).json({ error: 'Error reading the file.' });
}
const fileInfos = JSON.parse(data);
const fileLink = req.body.fileLink;
const fileName = fileLink.split('/').pop();
const fileInfo = fileInfos.find(file => file.fileName === fileName && file.Id);
console.log(fileInfos);
if (!fileInfo) {
return res.status(404).json({ error: `No information found for the file ${fileName}.` });
}
res.json(fileInfo);
});
});
module.exports = router;

View File

@@ -28,20 +28,24 @@ router.post('/', authMiddleware, async (req, res) => {
const fileName = req.body.fileName;
const folderName = req.body.folderName;
if (!fileName || fileName.trim() === '') {
return res.status(400).send('No file selected for moving.');
}
const data = await fs.readFileSync(path.join(__dirname, '../../../data', 'user.json'), 'utf-8')
const users = JSON.parse(data);
const user = users.find(user => user.id === req.user.id);
if (!user) {
console.error('User not found in user.json');
return res.status(500).send('Erreur lors du déplacement du fichier.');
return res.status(500).send('Error moving the file.');
}
const userId = user.name;
if (!fileName || !userId) {
console.error('fileName or userId is undefined');
return res.status(500).send('Erreur lors du déplacement du fichier.');
return res.status(500).send('Error moving the file.');
}
const sourcePath = path.join('cdn-files', userId, fileName);
@@ -72,7 +76,7 @@ router.post('/', authMiddleware, async (req, res) => {
res.redirect('/dpanel/dashboard');
} catch (err) {
console.error(err);
return res.status(500).send('Erreur lors du déplacement du fichier.');
return res.status(500).send('Error moving the file.');
}
});
@@ -84,7 +88,7 @@ router.post('/:folderName', authMiddleware, async (req, res) => {
if (!fileName || !userId || !oldFolderName || !newFolderName) {
console.error('fileName, userId, oldFolderName, or newFolderName is undefined');
return res.status(500).send('Erreur lors du déplacement du fichier.');
return res.status(500).send('Error moving the file.');
}
const userDir = path.join(process.cwd(), 'cdn-files', userId);
@@ -112,7 +116,7 @@ router.post('/:folderName', authMiddleware, async (req, res) => {
res.redirect('/dpanel/dashboard');
} catch (err) {
console.error(err);
return res.status(500).send('Erreur lors du déplacement du fichier.');
return res.status(500).send('Error moving the file.');
}
});

View File

@@ -31,28 +31,31 @@ router.get('/', (req, res) => {
});
function clean(obj) {
for (var propName in obj) {
if (obj[propName] === null || obj[propName] === undefined || obj[propName] === '') {
delete obj[propName];
} else if (typeof obj[propName] === 'object') {
clean(obj[propName]);
if (Object.keys(obj[propName]).length === 0) {
delete obj[propName];
}
}
}
}
router.post('/', authMiddleware, async (req, res) => {
try {
let setup = JSON.parse(fs.readFileSync(path.join(__dirname, '../data', 'setup.json'), 'utf-8'));
if (!req.body.ldap || !req.body.ldap.enabled) {
delete setup.ldap;
} else {
setup.ldap = req.body.ldap;
}
let setup = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../data', 'setup.json'), 'utf-8'));
if (!req.body.discord || !req.body.discord.enabled) {
delete setup.discord;
} else {
setup.discord = req.body.discord;
}
clean(req.body);
setup[0] = req.body;
setup.domain = req.body.domain;
setup.uptime = req.body.uptime;
fs.writeFileSync(path.join(__dirname, '../../../data', 'setup.json'), 'utf-8'), JSON.stringify(setup, null, 2);
fs.writeFileSync(path.join(__dirname, '../../../data', 'setup.json'), JSON.stringify(setup, null, 2), 'utf-8');
res.redirect('/dpanel/dashboard/admin');
res.redirect('/dpanel/dashboard/admin/settingsetup');
} catch (err) {
console.error(err);
res.status(500).send('Server Error');

View File

@@ -27,18 +27,25 @@ router.get('/', authMiddleware, async (req, res) => {
try {
const data = fs.readFileSync(path.join(__dirname, '../../../data', 'user.json'), 'utf8');
const users = JSON.parse(data);
console.log("Users:", users);
const user = users.find(user => user.name === req.user.name);
console.log("Found user:", user);
if (!user || user.role !== 'admin') {
console.log('Access denied');
return res.status(403).json({ message: "You do not have the necessary rights to access this resource." });
}
res.render('paramAdminSettingSetup', { users: User, setup: setup });
const setupData = fs.readFileSync(path.join(__dirname, '../../../data', 'setup.json'), 'utf8');
const setup = JSON.parse(setupData);
console.log("Setup:", setup);
res.render('paramAdminSettingSetup', { user: user, setup: setup[0] });
} catch (err) {
console.error(err);
res.status(500).send('Server Error');
}
});
module.exports = router;

View File

@@ -1,12 +1,8 @@
const express = require('express');
const router = express.Router();
const path = require('path');
const { checkUpdates } = require('../Middlewares/checkUpdate');
const { applyUpdate, restartCDN } = require('../models/updateManager');
const { logger, ErrorLogger, logRequestInfo } = require('../config/logs');
const util = require('util');
const exec = util.promisify(require('child_process').exec);
const authMiddleware = require('../Middlewares/authMiddleware');
const fs = require('fs');
router.use(express.json());
@@ -19,57 +15,6 @@ router.get('/attachments', (req, res) => {
res.render('acces-denied');
});
router.get('/checkupdate',authMiddleware, checkUpdates);
router.get('/applyupdate',authMiddleware, async (req, res) => {
const updateUrl = 'https://apollon.dinawo.fr/api/download/all';
const updateFolder = path.join(__dirname, '..');
try {
logger.info('------Before applying the update------');
await applyUpdate(updateUrl, updateFolder);
logger.info('------After applying the update------');
res.json({
success: true,
message: 'Mise à jour appliquée avec succès. Pensé à redémarrer le serveur pour que la MàJ soit prise en compte. (systemctl restart cdn).'
});
} catch (error) {
ErrorLogger.error('Error applying update:', error);
return res.status(500).json({ success: false, message: 'Erreur lors de l\'application de la mise à jour.' });
}
});
router.get('/translateAll', async (req, res) => {
const targetLanguage = req.query.lang || 'en';
const viewsFolder = path.join(__dirname, '../views');
try {
const translatedFiles = [];
const files = fs.readdirSync(viewsFolder);
for (const file of files) {
if (file.endsWith('.ejs')) {
const filePath = path.join(viewsFolder, file);
const translatedContent = await translateEJSFile(filePath, targetLanguage);
if (translatedContent !== null) {
translatedFiles.push({
fileName: file,
translatedContent,
});
}
}
}
res.json(translatedFiles);
} catch (error) {
console.error('Error translating all EJS files :', error.message);
res.status(500).json({ error: 'Translation mistake' });
}
});
router.get('/setup', (req, res) => {
fs.readFile(path.join(__dirname, '../data/setup.json'), 'utf8', (err, data) => {
if (err) {

View File

@@ -2,6 +2,7 @@ const express = require('express');
const router = express.Router();
const { logAndBanSuspiciousActivity } = require('../models/banModel.js');
const { logApiRequest } = require('../config/logs.js');
const discordWebhookSuspisiousAlertMiddleware = require('../Middlewares/discordWebhookSuspisiousAlertMiddleware.js');
const indexRoute = require('./index.js');
const DpanelDashboardRoute = require('./Dpanel/Dashboard/index.js');
@@ -19,6 +20,7 @@ const UpdateRoleAdminRoute = require('./Dpanel/API/Upload-Role-Admin.js');
const UpdateSetupAdminRoute = require('./Dpanel/API/Update-Setup-Admin.js');
const DeleteFolderRoute = require('./Dpanel/API/DeleteFolfder.js');
const DeleteFileFolderRoute = require('./Dpanel/API/DeleteFileFolder.js');
const GetMetaDataFileRoute = require('./Dpanel/API/GetMetaDataFile.js');
const loginRoute = require('./Auth/Login.js');
const logoutRoute = require('./Auth/Logout.js');
@@ -44,20 +46,21 @@ router.use('/dpanel/dashboard/admin/settingsetup', AdminSettingSetupDpanelRoute)
router.use('/dpanel/dashboard/admin/stats-logs', AdminStatsLogsDpanelRoute);;
router.use('/dpanel/dashboard/admin/Privacy-Security', AdminPrivacySecurityDpanelRoute);
router.use('/api/dpanel/dashboard/newfolder', logApiRequest, NewFolderRoute);
router.use('/api/dpanel/dashboard/rename', logApiRequest, RenameFileRoute);
router.use('/api/dpanel/dashboard/delete', logApiRequest, DeleteFileRoute);
router.use('/api/dpanel/dashboard/movefile', logApiRequest, MoveFileRoute);
router.use('/api/dpanel/upload', logApiRequest, UploadRoute);
router.use('/api/dpanel/dashboard/admin/update-role', logApiRequest, UpdateRoleAdminRoute);
router.use('/api/dpanel/dashboard/admin/update-setup', logApiRequest, UpdateSetupAdminRoute);
router.use('/api/dpanel/dashboard/deletefolder', logApiRequest, DeleteFolderRoute);
router.use('/api/dpanel/dashboard/deletefile/', logApiRequest,DeleteFileFolderRoute);
router.use('/api/dpanel/dashboard/newfolder',discordWebhookSuspisiousAlertMiddleware, logApiRequest, NewFolderRoute);
router.use('/api/dpanel/dashboard/rename',discordWebhookSuspisiousAlertMiddleware, logApiRequest, RenameFileRoute);
router.use('/api/dpanel/dashboard/delete',discordWebhookSuspisiousAlertMiddleware, logApiRequest, DeleteFileRoute);
router.use('/api/dpanel/dashboard/movefile',discordWebhookSuspisiousAlertMiddleware, logApiRequest, MoveFileRoute);
router.use('/api/dpanel/upload',discordWebhookSuspisiousAlertMiddleware, logApiRequest, UploadRoute);
router.use('/api/dpanel/dashboard/admin/update-role',discordWebhookSuspisiousAlertMiddleware, logApiRequest, UpdateRoleAdminRoute);
router.use('/api/dpanel/dashboard/admin/update-setup',discordWebhookSuspisiousAlertMiddleware, logApiRequest, UpdateSetupAdminRoute);
router.use('/api/dpanel/dashboard/deletefolder',discordWebhookSuspisiousAlertMiddleware, logApiRequest, DeleteFolderRoute);
router.use('/api/dpanel/dashboard/deletefile/', discordWebhookSuspisiousAlertMiddleware, logApiRequest,DeleteFileFolderRoute);
router.use('/api/dpanel/dashboard/getmetadatafile',discordWebhookSuspisiousAlertMiddleware, logApiRequest, GetMetaDataFileRoute);
router.use('/auth/login', loginRoute);
router.use('/auth/logout', logoutRoute);
router.use('/auth/activedirectory', activeDirectoryRoute);
router.use('/auth/discord', discordRoute);
router.use('/auth/activedirectory',discordWebhookSuspisiousAlertMiddleware, activeDirectoryRoute);
router.use('/auth/discord',discordWebhookSuspisiousAlertMiddleware, discordRoute);
router.use('/*', logAndBanSuspiciousActivity, indexRoute);