borg/drone-detector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix jwt-token

Browse Source
This commit is contained in:
Alexander Borg
2025-09-16 21:49:10 +02:00
parent 6199f84ae5
commit 70c8a41508
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/middleware/ip-restriction.js
View File

@@ -168,27 +168,21 @@ class IPRestrictionMiddleware {
// Skip IP restrictions for management routes - they have their own access controls // Skip IP restrictions for management routes - they have their own access controls
if (path.startsWith('/api/management/')) { if (path.startsWith('/api/management/')) {
console.log('🔍 IP Restriction - Skipping for management route:', path);
return next(); return next();
} }
// Skip IP restrictions for auth config - users need to see login form and get proper error // Skip IP restrictions for auth config - users need to see login form and get proper error
if (path === '/api/auth/config') { if (path === '/api/auth/config') {
console.log('🔍 IP Restriction - Skipping for auth config route');
return next(); return next();
} }
console.log('🔍 IP Restriction Check - Path:', req.path, 'Method:', req.method);
// Determine tenant (check req.tenant first for test contexts) // Determine tenant (check req.tenant first for test contexts)
let tenantId = req.tenant; let tenantId = req.tenant;
if (!tenantId) { if (!tenantId) {
tenantId = await this.multiAuth.determineTenant(req); tenantId = await this.multiAuth.determineTenant(req);
} }
console.log('🔍 IP Restriction - Determined tenant:', tenantId);
if (!tenantId) { if (!tenantId) {
console.log('🔍 IP Restriction - No tenant found, skipping IP check');
// No tenant found, continue without IP checking // No tenant found, continue without IP checking
return next(); return next();
} }
@@ -200,32 +194,16 @@ class IPRestrictionMiddleware {
attributes: ['id', 'slug', 'ip_restriction_enabled', 'ip_whitelist', 'ip_restriction_message', 'updated_at'] attributes: ['id', 'slug', 'ip_restriction_enabled', 'ip_whitelist', 'ip_restriction_message', 'updated_at']
}); });
if (!tenant) { if (!tenant) {
console.log('🔍 IP Restriction - Tenant not found in database:', tenantId);
return next(); return next();
} }
console.log('🔍 IP Restriction - Tenant config (fresh from DB):', {
id: tenant.id,
slug: tenant.slug,
ip_restriction_enabled: tenant.ip_restriction_enabled,
ip_whitelist: tenant.ip_whitelist,
updated_at: tenant.updated_at
});
// Check if IP restrictions are enabled // Check if IP restrictions are enabled
if (!tenant.ip_restriction_enabled) { if (!tenant.ip_restriction_enabled) {
console.log('🔍 IP Restriction - Restrictions disabled for tenant');
return next(); return next();
} }
// Get client IP // Get client IP
const clientIP = this.getClientIP(req); const clientIP = this.getClientIP(req);
console.log('🔍 IP Restriction - Client IP:', clientIP);
console.log('🔍 IP Restriction - Request headers:', {
'x-forwarded-for': req.headers['x-forwarded-for'],
'x-real-ip': req.headers['x-real-ip'],
'remote-address': req.connection?.remoteAddress
});
// Parse allowed IPs (convert string to array) // Parse allowed IPs (convert string to array)
let allowedIPs = []; let allowedIPs = [];
@@ -239,11 +217,8 @@ class IPRestrictionMiddleware {
// Check if IP is allowed // Check if IP is allowed
const isAllowed = this.isIPAllowed(clientIP, allowedIPs); const isAllowed = this.isIPAllowed(clientIP, allowedIPs);
console.log('🔍 IP Restriction - Is IP allowed:', isAllowed, 'Allowed IPs:', allowedIPs);
if (!isAllowed) { if (!isAllowed) {
console.log(`🚫 IP Access Denied: ${clientIP} attempted to access tenant "${tenantId}"`);
// Log the access attempt for security auditing // Log the access attempt for security auditing
console.log(`[SECURITY AUDIT] ${new Date().toISOString()} - IP ${clientIP} denied access to tenant ${tenantId} - User-Agent: ${req.headers['user-agent']}`); console.log(`[SECURITY AUDIT] ${new Date().toISOString()} - IP ${clientIP} denied access to tenant ${tenantId} - User-Agent: ${req.headers['user-agent']}`);
@@ -256,7 +231,6 @@ class IPRestrictionMiddleware {
} }
// IP is allowed, continue // IP is allowed, continue
console.log(`✅ IP Access Allowed: ${clientIP} accessing tenant "${tenantId}"`);
next(); next();
} catch (error) { } catch (error) {