Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #1617

Browse Source 
Dinstinct invalid countries ("--") from localhost addresses ("LOCALHOST"), allow localhost access by default.
This commit is contained in:
Gabriele C 2018-08-22 16:56:14 +02:00
parent 251308c4f4
commit adb3c06f51
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/fr/xephi/authme/service/GeoIpService.java
View File

@ -268,9 +268,13 @@ public class GeoIpService {
* Get the country code of the given IP address. * Get the country code of the given IP address.
* *
* @param ip textual IP address to lookup. * @param ip textual IP address to lookup.
* @return two-character ISO 3166-1 alpha code for the country or "--" if it cannot be fetched. * @return two-character ISO 3166-1 alpha code for the country, "LOCALHOST" for local addresses
* or "--" if it cannot be fetched.
*/ */
public String getCountryCode(String ip) { public String getCountryCode(String ip) {
if(InternetProtocolUtils.isLocalAddress(ip)) {
return "LOCALHOST";
}
return getCountry(ip).map(Country::getIsoCode).orElse("--"); return getCountry(ip).map(Country::getIsoCode).orElse("--");
} }
@ -278,9 +282,12 @@ public class GeoIpService {
* Get the country name of the given IP address. * Get the country name of the given IP address.
* *
* @param ip textual IP address to lookup. * @param ip textual IP address to lookup.
* @return The name of the country or "N/A" if it cannot be fetched. * @return The name of the country, "LocalHost" for local addresses, or "N/A" if it cannot be fetched.
*/ */
public String getCountryName(String ip) { public String getCountryName(String ip) {
if(InternetProtocolUtils.isLocalAddress(ip)) {
return "LocalHost";
}
return getCountry(ip).map(Country::getName).orElse("N/A"); return getCountry(ip).map(Country::getName).orElse("N/A");
} }
@ -297,7 +304,7 @@ public class GeoIpService {
* </ul> * </ul>
*/ */
private Optional<Country> getCountry(String ip) { private Optional<Country> getCountry(String ip) {
if (ip == null || ip.isEmpty() || InternetProtocolUtils.isLocalAddress(ip) || !isDataAvailable()) { if (ip == null || ip.isEmpty() || !isDataAvailable()) {
return Optional.empty(); return Optional.empty();
} }

3
src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java
View File

@ -23,9 +23,10 @@ public final class ProtectionSettings implements SettingsHolder {
@Comment({ @Comment({
"Countries allowed to join the server and register. For country codes, see", "Countries allowed to join the server and register. For country codes, see",
"https://dev.maxmind.com/geoip/legacy/codes/iso3166/", "https://dev.maxmind.com/geoip/legacy/codes/iso3166/",
"Use \"LOCALHOST\" for local addresses.",
"PLEASE USE QUOTES!"}) "PLEASE USE QUOTES!"})
public static final Property<List<String>> COUNTRIES_WHITELIST = public static final Property<List<String>> COUNTRIES_WHITELIST =
newListProperty("Protection.countries", "US", "GB"); newListProperty("Protection.countries", "US", "GB", "LOCALHOST");
@Comment({ @Comment({
"Countries not allowed to join the server and register", "Countries not allowed to join the server and register",