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-15 07:53:10 +02:00
parent a3c12efcf0
commit b643724706
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ class IPRestrictionMiddleware {
} }
// Fallback to connection IP // Fallback to connection IP
return req.connection.remoteAddress || req.socket.remoteAddress || req.ip || 'unknown'; return req.connection?.remoteAddress || req.socket?.remoteAddress || req.ip || 'unknown';
} }
/** /**
@@ -224,7 +224,7 @@ class IPRestrictionMiddleware {
console.log('🔍 IP Restriction - Request headers:', { console.log('🔍 IP Restriction - Request headers:', {
'x-forwarded-for': req.headers['x-forwarded-for'], 'x-forwarded-for': req.headers['x-forwarded-for'],
'x-real-ip': req.headers['x-real-ip'], 'x-real-ip': req.headers['x-real-ip'],
'remote-address': req.connection.remoteAddress 'remote-address': req.connection?.remoteAddress
}); });
// Parse allowed IPs (convert string to array) // Parse allowed IPs (convert string to array)

7
server/middleware/multi-tenant-auth.js
View File

@@ -44,6 +44,7 @@ class MultiTenantAuth {
async determineTenant(req) { async determineTenant(req) {
// Method 1: From authenticated user (highest priority) // Method 1: From authenticated user (highest priority)
if (req.user && req.user.tenantId) { if (req.user && req.user.tenantId) {
console.log('🏢 Tenant from req.user.tenantId:', req.user.tenantId);
return req.user.tenantId; return req.user.tenantId;
} }
@@ -68,9 +69,11 @@ class MultiTenantAuth {
// Method 4: x-forwarded-host header (for proxied requests) // Method 4: x-forwarded-host header (for proxied requests)
const forwardedHost = req.headers['x-forwarded-host']; const forwardedHost = req.headers['x-forwarded-host'];
console.log('🏢 x-forwarded-host header:', forwardedHost);
if (forwardedHost) { if (forwardedHost) {
const subdomain = forwardedHost.split('.')[0]; const subdomain = forwardedHost.split('.')[0];
if (subdomain && subdomain !== 'www' && subdomain !== 'api' && !subdomain.includes(':')) { if (subdomain && subdomain !== 'www' && subdomain !== 'api' && !subdomain.includes(':')) {
console.log('🏢 Tenant from x-forwarded-host:', subdomain);
return subdomain; return subdomain;
} }
} }
@@ -86,7 +89,9 @@ class MultiTenantAuth {
// Method 6: URL path (/tenant2/api/...) // Method 6: URL path (/tenant2/api/...)
const pathSegments = (req.path || req.url || '').split('/').filter(segment => segment); const pathSegments = (req.path || req.url || '').split('/').filter(segment => segment);
console.log('🏢 URL path segments:', pathSegments, 'from path:', req.path, 'or url:', req.url);
if (pathSegments.length > 0 && pathSegments[0] !== 'api') { if (pathSegments.length > 0 && pathSegments[0] !== 'api') {
console.log('🏢 Tenant from URL path:', pathSegments[0]);
return pathSegments[0]; return pathSegments[0];
} }
@@ -97,9 +102,11 @@ class MultiTenantAuth {
// Return null for localhost without tenant info // Return null for localhost without tenant info
if (hostname && hostname.startsWith('localhost')) { if (hostname && hostname.startsWith('localhost')) {
console.log('🏢 Localhost detected, returning null');
return null; return null;
} }
console.log('🏢 No tenant determined, returning null');
// Default to null // Default to null
return null; return null;
} }