mirror of
https://github.com/DumbWareio/DumbDrop.git
synced 2025-10-23 07:41:58 +00:00
Remove hsts from helmet and apply new pin status check limits
This commit is contained in:
@@ -17,7 +17,7 @@ const logger = require('./utils/logger');
|
|||||||
const { ensureDirectoryExists } = require('./utils/fileUtils');
|
const { ensureDirectoryExists } = require('./utils/fileUtils');
|
||||||
const { getHelmetConfig, requirePin } = require('./middleware/security');
|
const { getHelmetConfig, requirePin } = require('./middleware/security');
|
||||||
const { safeCompare } = require('./utils/security');
|
const { safeCompare } = require('./utils/security');
|
||||||
const { initUploadLimiter, pinVerifyLimiter, downloadLimiter } = require('./middleware/rateLimiter');
|
const { initUploadLimiter, pinVerifyLimiter, pinStatusLimiter, downloadLimiter } = require('./middleware/rateLimiter');
|
||||||
const { injectDemoBanner, demoMiddleware } = require('./utils/demoMode');
|
const { injectDemoBanner, demoMiddleware } = require('./utils/demoMode');
|
||||||
const { originValidationMiddleware, getCorsOptions } = require('./middleware/cors');
|
const { originValidationMiddleware, getCorsOptions } = require('./middleware/cors');
|
||||||
|
|
||||||
@@ -41,6 +41,7 @@ app.use((req, res, next) => {
|
|||||||
const publicPaths = [
|
const publicPaths = [
|
||||||
'/login',
|
'/login',
|
||||||
'/login.html',
|
'/login.html',
|
||||||
|
'/api/auth/logout',
|
||||||
'/api/auth/verify-pin',
|
'/api/auth/verify-pin',
|
||||||
'/api/auth/pin-required',
|
'/api/auth/pin-required',
|
||||||
'/api/auth/pin-length',
|
'/api/auth/pin-length',
|
||||||
@@ -71,6 +72,9 @@ const fileRoutes = require('./routes/files');
|
|||||||
const authRoutes = require('./routes/auth');
|
const authRoutes = require('./routes/auth');
|
||||||
|
|
||||||
// Use routes with appropriate middleware
|
// Use routes with appropriate middleware
|
||||||
|
// Apply strict rate limiting to PIN verification, but more permissive to status checks
|
||||||
|
app.use('/api/auth/pin-required', pinStatusLimiter);
|
||||||
|
app.use('/api/auth/logout', pinStatusLimiter);
|
||||||
app.use('/api/auth', pinVerifyLimiter, authRoutes);
|
app.use('/api/auth', pinVerifyLimiter, authRoutes);
|
||||||
app.use('/api/upload', requirePin(config.pin), initUploadLimiter, uploadRouter);
|
app.use('/api/upload', requirePin(config.pin), initUploadLimiter, uploadRouter);
|
||||||
app.use('/api/files', requirePin(config.pin), downloadLimiter, fileRoutes);
|
app.use('/api/files', requirePin(config.pin), downloadLimiter, fileRoutes);
|
||||||
|
@@ -48,7 +48,7 @@ const chunkUploadLimiter = createLimiter({
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Rate limiter for PIN verification attempts
|
* Rate limiter for PIN verification attempts
|
||||||
* Prevents brute force attacks
|
* Prevents brute force attacks on actual PIN verification
|
||||||
*/
|
*/
|
||||||
const pinVerifyLimiter = createLimiter({
|
const pinVerifyLimiter = createLimiter({
|
||||||
windowMs: 15 * 60 * 1000, // 15 minutes
|
windowMs: 15 * 60 * 1000, // 15 minutes
|
||||||
@@ -57,6 +57,24 @@ const pinVerifyLimiter = createLimiter({
|
|||||||
error: 'Too many PIN verification attempts. Please try again later.'
|
error: 'Too many PIN verification attempts. Please try again later.'
|
||||||
},
|
},
|
||||||
standardHeaders: true,
|
standardHeaders: true,
|
||||||
|
legacyHeaders: false,
|
||||||
|
// Apply strict rate limiting only to PIN verification, not PIN status checks
|
||||||
|
skip: (req) => {
|
||||||
|
return req.path === '/pin-required'; // Skip rate limiting for PIN requirement checks
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rate limiter for PIN status checks
|
||||||
|
* More permissive for checking if PIN is required
|
||||||
|
*/
|
||||||
|
const pinStatusLimiter = createLimiter({
|
||||||
|
windowMs: 60 * 1000, // 1 minute window
|
||||||
|
max: 30, // 30 requests per minute
|
||||||
|
message: {
|
||||||
|
error: 'Too many requests. Please wait before trying again.'
|
||||||
|
},
|
||||||
|
standardHeaders: true,
|
||||||
legacyHeaders: false
|
legacyHeaders: false
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -78,5 +96,6 @@ module.exports = {
|
|||||||
initUploadLimiter,
|
initUploadLimiter,
|
||||||
chunkUploadLimiter,
|
chunkUploadLimiter,
|
||||||
pinVerifyLimiter,
|
pinVerifyLimiter,
|
||||||
|
pinStatusLimiter,
|
||||||
downloadLimiter
|
downloadLimiter
|
||||||
};
|
};
|
@@ -48,16 +48,19 @@ const BASE_URL = process.env.BASE_URL || `http://localhost:${PORT}`;
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
function getHelmetConfig() {
|
function getHelmetConfig() {
|
||||||
|
// const isSecure = BASE_URL.startsWith('https://');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
noSniff: true, // Prevent MIME type sniffing
|
noSniff: true, // Prevent MIME type sniffing
|
||||||
frameguard: { action: 'deny' }, // Prevent clickjacking
|
frameguard: { action: 'deny' }, // Prevent clickjacking
|
||||||
hsts: { maxAge: 31536000, includeSubDomains: true }, // Enforce HTTPS for one year
|
crossOriginEmbedderPolicy: false, // Disable for local network access
|
||||||
crossOriginEmbedderPolicy: true,
|
crossOriginOpenerPolicy: false, // Disable to prevent warnings on HTTP
|
||||||
crossOriginOpenerPolicy: { policy: 'same-origin-allow-popups' },
|
crossOriginResourcePolicy: { policy: 'cross-origin' }, // Allow cross-origin for local network
|
||||||
crossOriginResourcePolicy: { policy: 'same-origin' },
|
|
||||||
referrerPolicy: { policy: 'no-referrer-when-downgrade' }, // Set referrer policy
|
referrerPolicy: { policy: 'no-referrer-when-downgrade' }, // Set referrer policy
|
||||||
ieNoOpen: true, // Prevent IE from executing downloads
|
ieNoOpen: true, // Prevent IE from executing downloads
|
||||||
|
// hsts: isSecure ? { maxAge: 31536000, includeSubDomains: true } : false, // Only enforce HTTPS if using HTTPS
|
||||||
// Disabled Helmet middlewares:
|
// Disabled Helmet middlewares:
|
||||||
|
hsts: false,
|
||||||
contentSecurityPolicy: false, // Disable CSP for now
|
contentSecurityPolicy: false, // Disable CSP for now
|
||||||
dnsPrefetchControl: true, // Disable DNS prefetching
|
dnsPrefetchControl: true, // Disable DNS prefetching
|
||||||
permittedCrossDomainPolicies: false,
|
permittedCrossDomainPolicies: false,
|
||||||
|
Reference in New Issue
Block a user