mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-06 06:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: refinements for ipv6 only testing (#40723)

Browse Source 
closes: #21277

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins
2025-06-26 03:02:27 -04:00
committed by GitHub
parent dcb136ff4e
commit c679fe4696
5 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/actions/update-hosts/nipio-hosts vendored
View File

@@ -1 +1,2 @@
127.0.0.1 127.0.0.1.nip.io admin.127.0.0.1.nip.io localhost-myapp.127.0.0.1.nip.io localhost-sso.127.0.0.1.nip.io realmFrontend.127.0.0.1.nip.io proxy.kc.127.0.0.1.nip.io
127.0.0.1 localtest.me 127.0.0.1.nip.io admin.127.0.0.1.nip.io localhost-myapp.127.0.0.1.nip.io localhost-sso.127.0.0.1.nip.io realmFrontend.127.0.0.1.nip.io proxy.kc.127.0.0.1.nip.io
::1 localtest.me 127.0.0.1.nip.io admin.127.0.0.1.nip.io localhost-myapp.127.0.0.1.nip.io localhost-sso.127.0.0.1.nip.io realmFrontend.127.0.0.1.nip.io proxy.kc.127.0.0.1.nip.io

16
testsuite/integration-arquillian/tests/base/pom.xml
View File

@@ -45,6 +45,7 @@
<mvel.version>2.5.2.Final</mvel.version>
<systemrules.version>1.19.0</systemrules.version>
<common.resources>${basedir}/../../servers/auth-server/common</common.resources>
<auth.server.ipv6>false</auth.server.ipv6>
</properties>
<dependencies>
@@ -433,7 +434,20 @@
</build>
<profiles>
<profile>
<id>ipv6</id>
<activation>
<property>
<name>java.net.preferIPv6Addresses</name>
<value>true</value>
</property>
</activation>
<properties>
<auth.server.ipv6>true</auth.server.ipv6>
</properties>
</profile>
<profile>
<id>app-server-wildfly</id>
<activation>

4
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java
View File

@@ -164,7 +164,7 @@ public class SessionRestServiceTest extends AbstractRestServiceTest {
List<SessionRepresentation> sessions = device.getSessions();
assertEquals(1, sessions.size());
SessionRepresentation session = sessions.get(0);
assertEquals("127.0.0.1", session.getIpAddress());
assertThat(session.getIpAddress(), anyOf(equalTo("127.0.0.1"), equalTo("0:0:0:0:0:0:0:1")));
assertTrue(device.getLastAccess() == session.getLastAccess());
List<ClientRepresentation> clients = session.getClients();
@@ -372,7 +372,7 @@ public class SessionRestServiceTest extends AbstractRestServiceTest {
List<SessionRepresentation> sessions = device.getSessions();
assertEquals(1, sessions.size());
SessionRepresentation session = sessions.get(0);
assertEquals("127.0.0.1", session.getIpAddress());
assertThat(session.getIpAddress(), anyOf(equalTo("127.0.0.1"), equalTo("0:0:0:0:0:0:0:1")));
assertEquals(device.getLastAccess(), session.getLastAccess());
assertEquals(1, session.getClients().size());

6
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AttributeTest.java
View File

@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.net.InetAddress;
import java.net.Inet4Address;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Collection;
@@ -68,7 +68,7 @@ public class AttributeTest {
assertEquals(new SimpleDateFormat("dd/MM/yyyy").parse("12/12/2016"), attributes.getValue("date").asDate(0, "dd/MM/yyyy"));
assertEquals(InetAddress.getLoopbackAddress(), attributes.getValue("ip_network_address").asInetAddress(0));
assertEquals(InetAddress.getLoopbackAddress(), attributes.getValue("host_network_address").asInetAddress(0));
assertEquals("127.0.0.1", attributes.getValue("ip_network_address").asInetAddress(0).getHostAddress());
assertEquals("localhost", attributes.getValue("host_network_address").asInetAddress(0).getHostName());
}
}

2
testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
View File

@@ -288,7 +288,7 @@
</property>
<property name="bindHttpPortOffset">${auth.server.port.offset}</property>
<property name="javaOpts">-Xms512m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=512m
-Dauth.server.db.host=some
-Dauth.server.db.host=some -Djava.net.preferIPv6Addresses=${auth.server.ipv6}
</property>
<property name="enabledFeatures">${auth.server.feature}</property>
<property name="disabledFeatures">${auth.server.feature.disable}</property>