Commit 9cf3af0c authored by nanahira's avatar nanahira

fix

parent 585a8921
...@@ -904,7 +904,7 @@ CLIENT_get_authorize_key = global.CLIENT_get_authorize_key = (client) -> ...@@ -904,7 +904,7 @@ CLIENT_get_authorize_key = global.CLIENT_get_authorize_key = (client) ->
if !settings.modules.mycard.enabled and client.vpass if !settings.modules.mycard.enabled and client.vpass
return client.name_vpass return client.name_vpass
else if settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or settings.modules.challonge.enabled or client.is_local else if settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or settings.modules.challonge.enabled or client.is_local
return client.name return client.name or client.ip or 'undefined'
else else
return client.ip + ":" + client.name return client.ip + ":" + client.name
...@@ -1218,8 +1218,11 @@ toIpv6 = global.toIpv6 = (ip) -> ...@@ -1218,8 +1218,11 @@ toIpv6 = global.toIpv6 = (ip) ->
isTrustedProxy = global.isTrustedProxy = (ip) -> isTrustedProxy = global.isTrustedProxy = (ip) ->
return settings.modules.trusted_proxies.some((trusted) -> return settings.modules.trusted_proxies.some((trusted) ->
cidr = if trusted.includes('/') then ip6addr.createCIDR(trusted) else ip6addr.createAddrRange(trusted, trusted) try
return cidr.contains(ip) cidr = if trusted.includes('/') then ip6addr.createCIDR(trusted) else ip6addr.createAddrRange(trusted, trusted)
return cidr.contains(ip)
catch e
return false
) )
getRealIp = global.getRealIp = (physical_ip, xff_ip) -> getRealIp = global.getRealIp = (physical_ip, xff_ip) ->
......
...@@ -1183,7 +1183,7 @@ ...@@ -1183,7 +1183,7 @@
if (!settings.modules.mycard.enabled && client.vpass) { if (!settings.modules.mycard.enabled && client.vpass) {
return client.name_vpass; return client.name_vpass;
} else if (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || settings.modules.challonge.enabled || client.is_local) { } else if (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || settings.modules.challonge.enabled || client.is_local) {
return client.name; return client.name || client.ip || 'undefined';
} else { } else {
return client.ip + ":" + client.name; return client.ip + ":" + client.name;
} }
...@@ -1604,9 +1604,14 @@ ...@@ -1604,9 +1604,14 @@
isTrustedProxy = global.isTrustedProxy = function(ip) { isTrustedProxy = global.isTrustedProxy = function(ip) {
return settings.modules.trusted_proxies.some(function(trusted) { return settings.modules.trusted_proxies.some(function(trusted) {
var cidr; var cidr, e;
cidr = trusted.includes('/') ? ip6addr.createCIDR(trusted) : ip6addr.createAddrRange(trusted, trusted); try {
return cidr.contains(ip); cidr = trusted.includes('/') ? ip6addr.createCIDR(trusted) : ip6addr.createAddrRange(trusted, trusted);
return cidr.contains(ip);
} catch (error1) {
e = error1;
return false;
}
}); });
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment