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-14 10:10:57 +02:00
parent de220bb040
commit 5353f391e7
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,9 +153,14 @@ class IPRestrictionMiddleware {
return next(); return next();
} }
console.log('🔍 IP Restriction Check - Path:', req.path, 'Method:', req.method);
// Determine tenant // Determine tenant
const tenantId = await this.multiAuth.determineTenant(req); const 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();
} }
@@ -163,19 +168,34 @@ class IPRestrictionMiddleware {
// Get tenant configuration // Get tenant configuration
const tenant = await Tenant.findOne({ where: { slug: tenantId } }); const tenant = await Tenant.findOne({ where: { slug: tenantId } });
if (!tenant) { if (!tenant) {
console.log('🔍 IP Restriction - Tenant not found in database:', tenantId);
return next(); return next();
} }
console.log('🔍 IP Restriction - Tenant config:', {
slug: tenant.slug,
ip_restriction_enabled: tenant.ip_restriction_enabled,
ip_whitelist: tenant.ip_whitelist
});
// 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
});
// Check if IP is allowed // Check if IP is allowed
const isAllowed = this.isIPAllowed(clientIP, tenant.ip_whitelist); const isAllowed = this.isIPAllowed(clientIP, tenant.ip_whitelist);
console.log('🔍 IP Restriction - Is IP allowed:', isAllowed);
if (!isAllowed) { if (!isAllowed) {
console.log(`🚫 IP Access Denied: ${clientIP} attempted to access tenant "${tenantId}"`); console.log(`🚫 IP Access Denied: ${clientIP} attempted to access tenant "${tenantId}"`);