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

Add IPv6 support for isLocal checks (#1592)

Browse Source 
* Add IPv6 support for isLocal checks

* Replace magic values like 127.0.0.1 and use our utility
* Support for IPv6 local adresses in IPv6 only or dual stack environments
    * Loopback [::1]
    * Site-Local fc00::/7
    * Link-local fe80::/10

* Introduce extra method for loopback addresses

* Use public IP for passMaxLogin check

* Use non-local IP addresses in test after change in verification
This commit is contained in:
games647
2018-07-04 02:05:17 +02:00
committed by Gabriele C
parent fc07ad3df1
commit 0227cb3f74
6 changed files with 104 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/process/login/AsynchronousLoginTest.java
+15 -15
View File
@@ -124,7 +124,7 @@ public class AsynchronousLoginTest {
public void shouldNotForceLoginUserWithAlreadyOnlineIp() {
// given
String name = "oscar";
String ip = "127.0.12.245";
String ip = "1.1.1.245";
Player player = mockPlayer(name);
TestHelper.mockPlayerIp(player, ip);
given(playerCache.isAuthenticated(name)).willReturn(false);
@@ -147,7 +147,7 @@ public class AsynchronousLoginTest {
public void shouldNotForceLoginForCanceledEvent() {
// given
String name = "oscar";
String ip = "127.0.12.245";
String ip = "1.1.1.245";
Player player = mockPlayer(name);
TestHelper.mockPlayerIp(player, ip);
given(playerCache.isAuthenticated(name)).willReturn(false);
@@ -180,7 +180,7 @@ public class AsynchronousLoginTest {
mockOnlinePlayersInBukkitService();
// when
boolean result = asynchronousLogin.hasReachedMaxLoggedInPlayersForIp(player, "127.0.0.4");
boolean result = asynchronousLogin.hasReachedMaxLoggedInPlayersForIp(player, "1.1.1.1");
// then
assertThat(result, equalTo(false));
@@ -195,7 +195,7 @@ public class AsynchronousLoginTest {
given(commonService.getProperty(RestrictionSettings.MAX_LOGIN_PER_IP)).willReturn(0);
// when
boolean result = asynchronousLogin.hasReachedMaxLoggedInPlayersForIp(player, "192.168.0.1");
boolean result = asynchronousLogin.hasReachedMaxLoggedInPlayersForIp(player, "2.2.2.2");
// then
assertThat(result, equalTo(false));
@@ -210,7 +210,7 @@ public class AsynchronousLoginTest {
given(commonService.hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS)).willReturn(true);
// when
boolean result = asynchronousLogin.hasReachedMaxLoggedInPlayersForIp(player, "127.0.0.4");
boolean result = asynchronousLogin.hasReachedMaxLoggedInPlayersForIp(player, "1.1.1.1");
// then
assertThat(result, equalTo(false));
@@ -227,7 +227,7 @@ public class AsynchronousLoginTest {
mockOnlinePlayersInBukkitService();
// when
boolean result = asynchronousLogin.hasReachedMaxLoggedInPlayersForIp(player, "192.168.0.1");
boolean result = asynchronousLogin.hasReachedMaxLoggedInPlayersForIp(player, "2.2.2.2");
// then
assertThat(result, equalTo(true));
@@ -242,28 +242,28 @@ public class AsynchronousLoginTest {
}
private void mockOnlinePlayersInBukkitService() {
// 127.0.0.4: albania (online), brazil (offline)
// 1.1.1.1: albania (online), brazil (offline)
Player playerA = mockPlayer("albania");
TestHelper.mockPlayerIp(playerA, "127.0.0.4");
TestHelper.mockPlayerIp(playerA, "1.1.1.1");
given(dataSource.isLogged(playerA.getName())).willReturn(true);
Player playerB = mockPlayer("brazil");
TestHelper.mockPlayerIp(playerB, "127.0.0.4");
TestHelper.mockPlayerIp(playerB, "1.1.1.1");
given(dataSource.isLogged(playerB.getName())).willReturn(false);
// 192.168.0.1: congo (online), denmark (offline), ecuador (online)
// 2.2.2.2: congo (online), denmark (offline), ecuador (online)
Player playerC = mockPlayer("congo");
TestHelper.mockPlayerIp(playerC, "192.168.0.1");
TestHelper.mockPlayerIp(playerC, "2.2.2.2");
given(dataSource.isLogged(playerC.getName())).willReturn(true);
Player playerD = mockPlayer("denmark");
TestHelper.mockPlayerIp(playerD, "192.168.0.1");
TestHelper.mockPlayerIp(playerD, "2.2.2.2");
given(dataSource.isLogged(playerD.getName())).willReturn(false);
Player playerE = mockPlayer("ecuador");
TestHelper.mockPlayerIp(playerE, "192.168.0.1");
TestHelper.mockPlayerIp(playerE, "2.2.2.2");
given(dataSource.isLogged(playerE.getName())).willReturn(true);
// 192.168.0.0: france (offline)
// 3.3.3.3: france (offline)
Player playerF = mockPlayer("france");
TestHelper.mockPlayerIp(playerF, "192.168.0.0");
TestHelper.mockPlayerIp(playerF, "3.3.3.3");
List<Player> onlinePlayers = Arrays.asList(playerA, playerB, playerC, playerD, playerE, playerF);
returnGivenOnlinePlayers(bukkitService, onlinePlayers);
src/test/java/fr/xephi/authme/util/InternetProtocolUtilsTest.java
+31 -1
View File
@@ -3,8 +3,8 @@ package fr.xephi.authme.util;
import fr.xephi.authme.TestHelper;
import org.junit.Test;
import static org.junit.Assert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
/**
* Test for {@link InternetProtocolUtils}
@@ -13,14 +13,44 @@ public class InternetProtocolUtilsTest {
@Test
public void shouldCheckLocalAddress() {
// loopback
assertThat(InternetProtocolUtils.isLocalAddress("localhost"), equalTo(true));
assertThat(InternetProtocolUtils.isLocalAddress("127.0.0.1"), equalTo(true));
assertThat(InternetProtocolUtils.isLocalAddress("::1"), equalTo(true));
// site local
assertThat(InternetProtocolUtils.isLocalAddress("10.0.0.1"), equalTo(true));
assertThat(InternetProtocolUtils.isLocalAddress("172.0.0.1"), equalTo(false));
assertThat(InternetProtocolUtils.isLocalAddress("172.16.0.1"), equalTo(true));
assertThat(InternetProtocolUtils.isLocalAddress("192.168.0.1"), equalTo(true));
// deprecated site-local
// ref: https://en.wikipedia.org/wiki/IPv6_address#Default_address_selection
assertThat(InternetProtocolUtils.isLocalAddress("fec0::"), equalTo(true));
// unique site-local (not deprecated!)
// ref: https://en.wikipedia.org/wiki/Unique_local_address
assertThat(InternetProtocolUtils.isLocalAddress("fde4:8dba:82e1::"), equalTo(true));
assertThat(InternetProtocolUtils.isLocalAddress("fc00::"), equalTo(true));
assertThat(InternetProtocolUtils.isLocalAddress("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), equalTo(true));
assertThat(InternetProtocolUtils.isLocalAddress("fe00::"), equalTo(false));
// link local
assertThat(InternetProtocolUtils.isLocalAddress("169.254.0.64"), equalTo(true));
assertThat(InternetProtocolUtils.isLocalAddress("FE80:0000:0000:0000:C800:0EFF:FE74:0008"), equalTo(true));
// public
assertThat(InternetProtocolUtils.isLocalAddress("94.32.34.5"), equalTo(false));
}
@Test
public void testIsLoopback() {
// loopback
assertThat(InternetProtocolUtils.isLoopbackAddress("localhost"), equalTo(true));
assertThat(InternetProtocolUtils.isLoopbackAddress("127.0.0.1"), equalTo(true));
assertThat(InternetProtocolUtils.isLoopbackAddress("::1"), equalTo(true));
}
@Test
public void shouldHavePrivateConstructor() {
// given / when / then