Compare commits
3 Commits
main
...
secops/sec
| Author | SHA1 | Date | |
|---|---|---|---|
| a8af857cd3 | |||
| 1fbfc28780 | |||
| 76dc23c861 |
@@ -171,7 +171,8 @@ const inputValidationMiddleware = (req, res, next) => {
|
||||
if (req.body && typeof req.body === 'object') {
|
||||
const bodyStr = JSON.stringify(req.body);
|
||||
if (suspiciousPatterns.some(pattern => pattern.test(bodyStr))) {
|
||||
logger.warn(`Suspicious input detected in request body from ${req.ip}: ${req.path}`);
|
||||
logger.warn(`Suspicious input blocked in request body from ${req.ip}: ${req.path}`);
|
||||
return res.status(400).json({ error: 'Input invalide détecté.' });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -179,11 +180,11 @@ const inputValidationMiddleware = (req, res, next) => {
|
||||
if (req.query && typeof req.query === 'object') {
|
||||
const queryStr = JSON.stringify(req.query);
|
||||
if (suspiciousPatterns.some(pattern => pattern.test(queryStr))) {
|
||||
logger.warn(`Suspicious input detected in query params from ${req.ip}: ${req.path}`);
|
||||
logger.warn(`Suspicious input blocked in query params from ${req.ip}: ${req.path}`);
|
||||
return res.status(400).json({ error: 'Input invalide détecté.' });
|
||||
}
|
||||
}
|
||||
|
||||
// Continuer sans bloquer (logging only pour ne pas casser l'app)
|
||||
next();
|
||||
} catch (error) {
|
||||
logger.error('Error in input validation middleware:', error);
|
||||
|
||||
@@ -12,7 +12,7 @@ const securityHeadersMiddleware = (req, res, next) => {
|
||||
'Content-Security-Policy',
|
||||
[
|
||||
"default-src 'self'",
|
||||
"script-src 'self' 'unsafe-inline' 'unsafe-eval' https://code.jquery.com https://cdnjs.cloudflare.com https://maxcdn.bootstrapcdn.com https://cdn.jsdelivr.net https://cdn.tailwindcss.com",
|
||||
"script-src 'self' 'unsafe-inline' https://code.jquery.com https://cdnjs.cloudflare.com https://maxcdn.bootstrapcdn.com https://cdn.jsdelivr.net https://cdn.tailwindcss.com",
|
||||
"style-src 'self' 'unsafe-inline' https://cdnjs.cloudflare.com https://fonts.googleapis.com",
|
||||
"img-src 'self' data: https: blob:",
|
||||
"font-src 'self' https://cdnjs.cloudflare.com https://fonts.gstatic.com",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@cdn-app/insider-myaxrin-labs-dinawo",
|
||||
"version": "1.2.1-beta",
|
||||
"version": "1.2.3-beta",
|
||||
"description": "",
|
||||
"main": "server.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
// Dashboard JavaScript - Version corrigée
|
||||
|
||||
function escapeAttr(str) {
|
||||
if (typeof str !== 'string') return '';
|
||||
return str.replace(/&/g, '&').replace(/'/g, ''').replace(/"/g, '"').replace(/</g, '<').replace(/>/g, '>');
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Initialisation générale
|
||||
initializeDashboard();
|
||||
@@ -683,9 +689,9 @@ function createCollaborationModal(itemName, itemType, data) {
|
||||
<div class="collaboration-user-item">
|
||||
<div class="user-avatar-wrapper">
|
||||
<img src="${user.profilePicture || getDefaultAvatar(user.name)}"
|
||||
alt="${user.name}"
|
||||
alt="${escapeAttr(user.name)}"
|
||||
class="user-avatar"
|
||||
onerror="this.src='${getDefaultAvatar(user.name)}'">
|
||||
onerror="this.src='${escapeAttr(getDefaultAvatar(user.name))}'">
|
||||
<div class="user-status-indicator"></div>
|
||||
</div>
|
||||
<div class="user-details">
|
||||
@@ -697,7 +703,7 @@ function createCollaborationModal(itemName, itemType, data) {
|
||||
</div>
|
||||
<div class="user-actions">
|
||||
<button class="action-btn remove-btn"
|
||||
onclick="removeCollaborator('${itemName}', '${itemType}', '${user.id}')"
|
||||
onclick="removeCollaborator('${escapeAttr(itemName)}', '${escapeAttr(itemType)}', '${escapeAttr(user.id)}')"
|
||||
title="Retirer ce collaborateur">
|
||||
<i class="fas fa-user-minus"></i>
|
||||
</button>
|
||||
@@ -795,9 +801,9 @@ function searchCollabUser(username, itemName, itemType, modal) {
|
||||
<div class="result-user-info">
|
||||
<div class="result-avatar-wrapper">
|
||||
<img src="${result.user.profilePicture || getDefaultAvatar(result.user.name)}"
|
||||
alt="${result.user.name}"
|
||||
alt="${escapeAttr(result.user.name)}"
|
||||
class="result-avatar"
|
||||
onerror="this.src='${getDefaultAvatar(result.user.name)}'">
|
||||
onerror="this.src='${escapeAttr(getDefaultAvatar(result.user.name))}'">
|
||||
</div>
|
||||
<div class="result-details">
|
||||
<div class="result-name">${result.user.name}</div>
|
||||
@@ -808,7 +814,7 @@ function searchCollabUser(username, itemName, itemType, modal) {
|
||||
</div>
|
||||
</div>
|
||||
<button class="btn btn-primary add-user-btn"
|
||||
onclick="addCollaborator('${itemName}', '${itemType}', '${result.user.id}')"
|
||||
onclick="addCollaborator('${escapeAttr(itemName)}', '${escapeAttr(itemType)}', '${escapeAttr(result.user.id)}')"
|
||||
title="Ajouter ce collaborateur">
|
||||
<i class="fas fa-user-plus"></i>
|
||||
<span>Ajouter</span>
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
function escapeAttr(str) {
|
||||
if (typeof str !== 'string') return '';
|
||||
return str.replace(/&/g, '&').replace(/'/g, ''').replace(/"/g, '"').replace(/</g, '<').replace(/>/g, '>');
|
||||
}
|
||||
|
||||
const body = document.body;
|
||||
const themeSwitcher = document.getElementById('themeSwitcher');
|
||||
|
||||
@@ -319,11 +324,11 @@ function addPath(type) {
|
||||
const div = document.createElement('div');
|
||||
div.className = 'flex items-center space-x-2 py-2 px-3 bg-gray-800 rounded-lg animate';
|
||||
div.innerHTML = `
|
||||
<span class="flex-1">${value}</span>
|
||||
<span class="flex-1">${escapeAttr(value)}</span>
|
||||
<button type="button" onclick="removePath(this)" class="text-gray-400 hover:text-red-500">
|
||||
<i class="fas fa-times"></i>
|
||||
</button>
|
||||
<input type="hidden" name="logs[${type === 'exclude' ? 'excludePaths' : 'includeOnly'}][]" value="${value}">
|
||||
<input type="hidden" name="logs[${type === 'exclude' ? 'excludePaths' : 'includeOnly'}][]" value="${escapeAttr(value)}">
|
||||
`;
|
||||
list.appendChild(div);
|
||||
input.value = '';
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const os = require('os');
|
||||
const child_process = require('child_process');
|
||||
const packageJson = require('../package.json');
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
@@ -64,7 +63,7 @@ router.get('/', async (req, res) => {
|
||||
res.json(buildMetadata);
|
||||
} catch (error) {
|
||||
console.error('Error in /build-metadata: ', error);
|
||||
res.status(500).send('Error in /build-metadata: ' + error.toString());
|
||||
res.status(500).send('Internal server error');
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -13,6 +13,16 @@ router.post('/wallpaper', (req, res) => {
|
||||
return res.status(400).send('No wallpaper URL provided.');
|
||||
}
|
||||
|
||||
// Validate URL to prevent XSS/CSS injection via malicious URLs
|
||||
try {
|
||||
const parsed = new URL(wallpaperUrl);
|
||||
if (!['http:', 'https:'].includes(parsed.protocol)) {
|
||||
return res.status(400).send('Invalid URL protocol. Only HTTP/HTTPS allowed.');
|
||||
}
|
||||
} catch {
|
||||
return res.status(400).send('Invalid URL format.');
|
||||
}
|
||||
|
||||
updateUserWallpaper(userId, wallpaperUrl, res);
|
||||
});
|
||||
|
||||
|
||||
@@ -156,19 +156,30 @@ router.post('/', authenticateToken, (req, res) => {
|
||||
return res.status(400).json({ message: 'User ID or filename missing for file deletion.' });
|
||||
}
|
||||
|
||||
const userFolderPath = path.join('cdn-files', userId);
|
||||
const userFolderPath = path.resolve('cdn-files', userId);
|
||||
|
||||
function findAndDeleteFile(folderPath) {
|
||||
const resolvedFolder = path.resolve(folderPath);
|
||||
if (!resolvedFolder.startsWith(userFolderPath + path.sep) && resolvedFolder !== userFolderPath) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const filesInFolder = fs.readdirSync(folderPath);
|
||||
|
||||
for (const file of filesInFolder) {
|
||||
const filePath = path.join(folderPath, file);
|
||||
const resolvedFilePath = path.resolve(filePath);
|
||||
|
||||
if (!filePath.startsWith(userFolderPath)) {
|
||||
if (!resolvedFilePath.startsWith(userFolderPath + path.sep)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (fs.statSync(filePath).isDirectory()) {
|
||||
const stat = fs.lstatSync(filePath);
|
||||
if (stat.isSymbolicLink()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (stat.isDirectory()) {
|
||||
const fileDeletedInSubfolder = findAndDeleteFile(filePath);
|
||||
if (fileDeletedInSubfolder) {
|
||||
return true;
|
||||
|
||||
@@ -26,8 +26,25 @@ router.post('/:folderName', authMiddleware, (req, res) => {
|
||||
const userId = req.userData.name;
|
||||
const { filename } = req.body;
|
||||
|
||||
const userFolderPath = path.join('cdn-files', userId || '');
|
||||
const filePath = path.join(userFolderPath, req.params.folderName, filename || '');
|
||||
if (!userId || !filename) {
|
||||
return res.status(400).json({ error: 'Paramètres manquants.' });
|
||||
}
|
||||
|
||||
const userFolderPath = path.resolve('cdn-files', userId);
|
||||
const filePath = path.resolve(userFolderPath, req.params.folderName, filename);
|
||||
|
||||
if (!filePath.startsWith(userFolderPath + path.sep)) {
|
||||
return res.status(403).json({ error: 'Accès non autorisé.' });
|
||||
}
|
||||
|
||||
try {
|
||||
const stat = fs.lstatSync(filePath);
|
||||
if (stat.isSymbolicLink()) {
|
||||
return res.status(403).json({ error: 'Accès non autorisé.' });
|
||||
}
|
||||
} catch (e) {
|
||||
return res.status(404).json({ error: 'Le fichier spécifié n\'existe pas.' });
|
||||
}
|
||||
|
||||
if (!fs.existsSync(filePath)) {
|
||||
return res.status(404).json({ error: 'Le fichier spécifié n\'existe pas.' });
|
||||
|
||||
@@ -129,9 +129,9 @@ function authenticateToken(req, res, next) {
|
||||
return res.status(401).json({ message: 'Unauthorized' });
|
||||
}
|
||||
|
||||
fs.readFile(path.join(__dirname, '../../../data', 'user.jso,'), 'utf8', (err, data) => {
|
||||
fs.readFile(path.join(__dirname, '../../../data', 'user.json'), 'utf8', (err, data) => {
|
||||
if (err) {
|
||||
console.error('Error reading user.jso,:', err);
|
||||
console.error('Error reading user.json:', err);
|
||||
return res.status(401).json({ message: 'Unauthorized' });
|
||||
}
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ function authenticateToken(req, res, next) {
|
||||
return res.status(401).json({ message: 'Unauthorized' });
|
||||
}
|
||||
|
||||
fs.readFile(path.join(__dirname, '../../../data', 'user.jso,'), 'utf8', (err, data) => {
|
||||
fs.readFile(path.join(__dirname, '../../../data', 'user.json'), 'utf8', (err, data) => {
|
||||
if (err) {
|
||||
console.error('Error reading user.json:', err);
|
||||
return res.status(401).json({ message: 'Unauthorized' });
|
||||
|
||||
@@ -13,6 +13,16 @@ router.post('/', (req, res) => {
|
||||
return res.status(400).send('No profile picture URL provided.');
|
||||
}
|
||||
|
||||
// Validate URL to prevent XSS/injection via malicious URLs
|
||||
try {
|
||||
const parsed = new URL(profilePictureUrl);
|
||||
if (!['http:', 'https:'].includes(parsed.protocol)) {
|
||||
return res.status(400).send('Invalid URL protocol. Only HTTP/HTTPS allowed.');
|
||||
}
|
||||
} catch {
|
||||
return res.status(400).send('Invalid URL format.');
|
||||
}
|
||||
|
||||
updateUserProfilePicture(userId, profilePictureUrl, res);
|
||||
});
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ function authenticateToken(req, res, next) {
|
||||
}
|
||||
}
|
||||
|
||||
fs.readFile(path.join(__dirname, '../../../data', 'user.jso,'), 'utf8', (err, data) => {
|
||||
fs.readFile(path.join(__dirname, '../../../data', 'user.json'), 'utf8', (err, data) => {
|
||||
if (err) {
|
||||
console.error('Error reading user.json:', err);
|
||||
return res.status(401).json({ message: 'Unauthorized' });
|
||||
@@ -142,16 +142,21 @@ router.post('/', authMiddleware, async (req, res) => {
|
||||
return res.status(400).json('Both currentName and newName must be provided.');
|
||||
}
|
||||
|
||||
const userDir = path.join('cdn-files', userId);
|
||||
const currentPath = path.join(userDir, filePath, currentName);
|
||||
const newPath = path.join(userDir, filePath, newName);
|
||||
const userDir = path.resolve('cdn-files', userId);
|
||||
const currentPath = path.resolve(userDir, filePath, currentName);
|
||||
const newPath = path.resolve(userDir, filePath, newName);
|
||||
|
||||
if (!currentPath.startsWith(userDir) || !newPath.startsWith(userDir)) {
|
||||
if (!currentPath.startsWith(userDir + path.sep) || !newPath.startsWith(userDir + path.sep)) {
|
||||
ErrorLogger.error('Unauthorized directory access attempt');
|
||||
return res.status(403).json('Unauthorized directory access attempt');
|
||||
}
|
||||
|
||||
try {
|
||||
const stat = await fs.promises.lstat(currentPath);
|
||||
if (stat.isSymbolicLink()) {
|
||||
return res.status(403).json('Unauthorized: symbolic links are not allowed');
|
||||
}
|
||||
|
||||
await fs.promises.rename(currentPath, newPath);
|
||||
|
||||
const data = await fs.promises.readFile(path.join(__dirname, '../../../data', 'file_info.json'), 'utf8');
|
||||
@@ -186,16 +191,21 @@ router.post('/:filePath*', authMiddleware, async (req, res) => {
|
||||
return res.status(400).json('Both currentName and newName must be provided.');
|
||||
}
|
||||
|
||||
const userDir = path.join('cdn-files', userId);
|
||||
const currentPath = path.join(userDir, filePath, currentName);
|
||||
const newPath = path.join(userDir, filePath, newName);
|
||||
const userDir = path.resolve('cdn-files', userId);
|
||||
const currentPath = path.resolve(userDir, filePath, currentName);
|
||||
const newPath = path.resolve(userDir, filePath, newName);
|
||||
|
||||
if (!currentPath.startsWith(userDir) || !newPath.startsWith(userDir)) {
|
||||
if (!currentPath.startsWith(userDir + path.sep) || !newPath.startsWith(userDir + path.sep)) {
|
||||
ErrorLogger.error('Unauthorized directory access attempt');
|
||||
return res.status(403).json('Unauthorized directory access attempt');
|
||||
}
|
||||
|
||||
try {
|
||||
const stat = await fs.promises.lstat(currentPath);
|
||||
if (stat.isSymbolicLink()) {
|
||||
return res.status(403).json('Unauthorized: symbolic links are not allowed');
|
||||
}
|
||||
|
||||
await fs.promises.rename(currentPath, newPath);
|
||||
|
||||
const data = await fs.promises.readFile(path.join(__dirname, '../../../data', 'file_info.json'), 'utf8');
|
||||
|
||||
@@ -68,6 +68,14 @@ router.post('/', (req, res) => {
|
||||
const filename = fields.filename ? fields.filename[0] : file.originalFilename;
|
||||
const filePath = path.join(userDir, filename);
|
||||
|
||||
// Path traversal protection: ensure resolved path stays within user directory
|
||||
const resolvedUserDir = path.resolve(process.cwd(), 'cdn-files', userName);
|
||||
const resolvedFilePath = path.resolve(filePath);
|
||||
if (!resolvedFilePath.startsWith(resolvedUserDir + path.sep) && resolvedFilePath !== resolvedUserDir) {
|
||||
if (fs.existsSync(file.path)) fs.unlinkSync(file.path);
|
||||
return res.status(403).send('Path traversal detected');
|
||||
}
|
||||
|
||||
// Récupérer les champs supplémentaires
|
||||
const expiryDate = fields.expiryDate ? fields.expiryDate[0] : '';
|
||||
const password = fields.password ? fields.password[0] : '';
|
||||
|
||||
@@ -30,21 +30,37 @@ async function findFileInUserDir(userId, filename) {
|
||||
return findFileInDir(userDir, filename);
|
||||
}
|
||||
|
||||
async function findFileInDir(dir, filename) {
|
||||
async function findFileInDir(dir, filename, baseDir) {
|
||||
if (!baseDir) baseDir = dir;
|
||||
const resolvedDir = path.resolve(dir);
|
||||
const resolvedBase = path.resolve(baseDir);
|
||||
|
||||
if (resolvedDir !== resolvedBase && !resolvedDir.startsWith(resolvedBase + path.sep)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
let files;
|
||||
try {
|
||||
files = await fs.readdir(dir, { withFileTypes: true });
|
||||
} catch (err) {
|
||||
return null; // Directory does not exist
|
||||
return null;
|
||||
}
|
||||
|
||||
for (const file of files) {
|
||||
const filePath = path.join(dir, file.name);
|
||||
|
||||
if (file.isSymbolicLink()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (file.name === filename && file.isFile()) {
|
||||
const resolvedFile = path.resolve(filePath);
|
||||
if (resolvedFile.startsWith(resolvedBase + path.sep)) {
|
||||
return filePath;
|
||||
}
|
||||
return null;
|
||||
} else if (file.isDirectory()) {
|
||||
const found = await findFileInDir(filePath, filename);
|
||||
const found = await findFileInDir(filePath, filename, baseDir);
|
||||
if (found) {
|
||||
return found;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user