Disable GeoIP with config: remove field, fix tests
This commit is contained in:
parent
65a272d6cb
commit
9b93e0e4b6
|
@ -64,8 +64,6 @@ public class GeoIpService {
|
||||||
private GeoIp2Provider databaseReader;
|
private GeoIp2Provider databaseReader;
|
||||||
private volatile boolean downloading;
|
private volatile boolean downloading;
|
||||||
|
|
||||||
private boolean enabled = true;
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
GeoIpService(@DataFolder File dataFolder, BukkitService bukkitService, Settings settings) {
|
GeoIpService(@DataFolder File dataFolder, BukkitService bukkitService, Settings settings) {
|
||||||
this.bukkitService = bukkitService;
|
this.bukkitService = bukkitService;
|
||||||
|
@ -94,7 +92,6 @@ public class GeoIpService {
|
||||||
|
|
||||||
// If this feature is disabled, just stop
|
// If this feature is disabled, just stop
|
||||||
if (!settings.getProperty(ProtectionSettings.ENABLE_GEOIP)) {
|
if (!settings.getProperty(ProtectionSettings.ENABLE_GEOIP)) {
|
||||||
enabled = false;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -289,9 +286,6 @@ public class GeoIpService {
|
||||||
* or "--" if it cannot be fetched.
|
* or "--" if it cannot be fetched.
|
||||||
*/
|
*/
|
||||||
public String getCountryCode(String ip) {
|
public String getCountryCode(String ip) {
|
||||||
if (!enabled) {
|
|
||||||
return "--";
|
|
||||||
}
|
|
||||||
if (InternetProtocolUtils.isLocalAddress(ip)) {
|
if (InternetProtocolUtils.isLocalAddress(ip)) {
|
||||||
return "LOCALHOST";
|
return "LOCALHOST";
|
||||||
}
|
}
|
||||||
|
@ -305,9 +299,6 @@ public class GeoIpService {
|
||||||
* @return The name of the country, "LocalHost" for local addresses, 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 (!enabled) {
|
|
||||||
return "N/A";
|
|
||||||
}
|
|
||||||
if (InternetProtocolUtils.isLocalAddress(ip)) {
|
if (InternetProtocolUtils.isLocalAddress(ip)) {
|
||||||
return "LocalHost";
|
return "LocalHost";
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,12 +3,8 @@ package fr.xephi.authme.service;
|
||||||
import com.maxmind.db.GeoIp2Provider;
|
import com.maxmind.db.GeoIp2Provider;
|
||||||
import com.maxmind.db.model.Country;
|
import com.maxmind.db.model.Country;
|
||||||
import com.maxmind.db.model.CountryResponse;
|
import com.maxmind.db.model.CountryResponse;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.net.InetAddress;
|
|
||||||
|
|
||||||
import fr.xephi.authme.settings.Settings;
|
import fr.xephi.authme.settings.Settings;
|
||||||
|
import fr.xephi.authme.settings.properties.ProtectionSettings;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
@ -17,14 +13,18 @@ import org.junit.runner.RunWith;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.junit.MockitoJUnitRunner;
|
import org.mockito.junit.MockitoJUnitRunner;
|
||||||
|
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
import java.io.File;
|
||||||
import static org.mockito.BDDMockito.given;
|
import java.io.IOException;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
|
||||||
import static org.hamcrest.Matchers.equalTo;
|
import static org.hamcrest.Matchers.equalTo;
|
||||||
import static org.junit.Assert.assertThat;
|
import static org.junit.Assert.assertThat;
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.BDDMockito.given;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
import static org.mockito.Mockito.never;
|
import static org.mockito.Mockito.never;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.verifyNoInteractions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test for {@link GeoIpService}.
|
* Test for {@link GeoIpService}.
|
||||||
|
@ -65,6 +65,7 @@ public class GeoIpServiceTest {
|
||||||
CountryResponse response = mock(CountryResponse.class);
|
CountryResponse response = mock(CountryResponse.class);
|
||||||
given(response.getCountry()).willReturn(country);
|
given(response.getCountry()).willReturn(country);
|
||||||
given(lookupService.getCountry(ip)).willReturn(response);
|
given(lookupService.getCountry(ip)).willReturn(response);
|
||||||
|
given(settings.getProperty(ProtectionSettings.ENABLE_GEOIP)).willReturn(true);
|
||||||
|
|
||||||
// when
|
// when
|
||||||
String result = geoIpService.getCountryCode(ip.getHostAddress());
|
String result = geoIpService.getCountryCode(ip.getHostAddress());
|
||||||
|
@ -99,6 +100,7 @@ public class GeoIpServiceTest {
|
||||||
CountryResponse response = mock(CountryResponse.class);
|
CountryResponse response = mock(CountryResponse.class);
|
||||||
given(response.getCountry()).willReturn(country);
|
given(response.getCountry()).willReturn(country);
|
||||||
given(lookupService.getCountry(ip)).willReturn(response);
|
given(lookupService.getCountry(ip)).willReturn(response);
|
||||||
|
given(settings.getProperty(ProtectionSettings.ENABLE_GEOIP)).willReturn(true);
|
||||||
|
|
||||||
// when
|
// when
|
||||||
String result = geoIpService.getCountryName(ip.getHostAddress());
|
String result = geoIpService.getCountryName(ip.getHostAddress());
|
||||||
|
@ -120,4 +122,18 @@ public class GeoIpServiceTest {
|
||||||
assertThat(result, equalTo("LocalHost"));
|
assertThat(result, equalTo("LocalHost"));
|
||||||
verify(lookupService, never()).getCountry(ip);
|
verify(lookupService, never()).getCountry(ip);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shouldNotLookUpCountryNameIfDisabled() throws Exception {
|
||||||
|
// given
|
||||||
|
InetAddress ip = InetAddress.getByName("24.45.167.89");
|
||||||
|
given(settings.getProperty(ProtectionSettings.ENABLE_GEOIP)).willReturn(false);
|
||||||
|
|
||||||
|
// when
|
||||||
|
String result = geoIpService.getCountryName(ip.getHostAddress());
|
||||||
|
|
||||||
|
// then
|
||||||
|
assertThat(result, equalTo("N/A"));
|
||||||
|
verifyNoInteractions(lookupService);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue