Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ else if (IPV6.equalsIgnoreCase(ipType)) {
Enumeration<InetAddress> inetAddress = netInterface.getInetAddresses();
while (inetAddress.hasMoreElements()) {
InetAddress currentAddress = inetAddress.nextElement();
if (currentAddress instanceof Inet4Address
|| currentAddress instanceof Inet6Address
if ((currentAddress instanceof Inet4Address
|| currentAddress instanceof Inet6Address)
&& !currentAddress.isLoopbackAddress()) {
ip = currentAddress.getHostAddress();
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@

package com.alibaba.cloud.nacos;

import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.Collections;
import java.util.List;
import java.util.UUID;

import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
import com.alibaba.cloud.nacos.event.NacosDiscoveryInfoChangedEvent;
import com.alibaba.cloud.nacos.registry.NacosServiceRegistryAutoConfiguration;
import com.alibaba.cloud.nacos.util.InetIPv6Utils;
import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
Expand All @@ -40,6 +45,7 @@
import static com.alibaba.cloud.nacos.NacosDiscoveryPropertiesTests.TestConfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;

/**
Expand Down Expand Up @@ -137,6 +143,34 @@ public void initShouldNotPutNullIpv6IntoMetadata() throws Exception {
assertThat(properties.getMetadata()).doesNotContainKey("IPv6");
}

@Test
public void initShouldSkipLoopbackAddressFromNetworkInterface() throws Exception {
NacosDiscoveryProperties properties = new NacosDiscoveryProperties();
properties.setServerAddr("127.0.0.1:8848");
properties.setNetworkInterface("eth-test");
ReflectionTestUtils.setField(properties, "environment", mock(Environment.class));
ReflectionTestUtils.setField(properties, "nacosServiceManager",
mock(NacosServiceManager.class));
ReflectionTestUtils.setField(properties, "applicationEventPublisher",
mock(ApplicationEventPublisher.class));

NetworkInterface networkInterface = mock(NetworkInterface.class);
when(networkInterface.getInetAddresses())
.thenReturn(Collections.enumeration(List.of(
InetAddress.getByName("127.0.0.1"),
InetAddress.getByName("192.168.1.10"))));

try (MockedStatic<NetworkInterface> mockedNetworkInterface = mockStatic(
NetworkInterface.class)) {
mockedNetworkInterface.when(() -> NetworkInterface.getByName("eth-test"))
.thenReturn(networkInterface);

properties.init();
}

assertThat(properties.getIp()).isEqualTo("192.168.1.10");
}

private static InetUtils inetUtils(String ipAddress) {
InetUtils inetUtils = mock(InetUtils.class);
InetUtils.HostInfo hostInfo = new InetUtils.HostInfo();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ private String getIPFromNetworkInterface(String networkInterface) {
Enumeration<InetAddress> inetAddress = netInterface.getInetAddresses();
while (inetAddress.hasMoreElements()) {
InetAddress currentAddress = inetAddress.nextElement();
if (currentAddress instanceof Inet4Address || currentAddress instanceof Inet6Address
if ((currentAddress instanceof Inet4Address
|| currentAddress instanceof Inet6Address)
&& !currentAddress.isLoopbackAddress()) {
return currentAddress.getHostAddress();
}
Expand Down Expand Up @@ -170,7 +171,8 @@ public static class TestConfig {
.getInetAddresses();
while (inetAddress.hasMoreElements()) {
InetAddress currentAddress = inetAddress.nextElement();
if (currentAddress instanceof Inet4Address || currentAddress instanceof Inet6Address
if ((currentAddress instanceof Inet4Address
|| currentAddress instanceof Inet6Address)
&& !currentAddress.isLoopbackAddress()) {
hasValidNetworkInterface = true;
netWorkInterfaceName = networkInterface.getName();
Expand Down
Loading