Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] fix ignored interface name matches method #8629

Merged
merged 6 commits into from Sep 8, 2021
Merged

[master] fix ignored interface name matches method #8629

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fad985
set literal pattern string for ignored given interface name tests
zrlw Aug 28, 2021
dbc15c9
add equals method for ignored given interface name comparison
zrlw Aug 28, 2021
8ac7d39
catch exception of ignored interface name matches method
zrlw Aug 29, 2021
49f419c
mock static method of final class NetworkInterface by Mockito
zrlw Aug 29, 2021
0c2a992
improve test case of ignored given interface name with meta characters
zrlw Aug 29, 2021
ab783e2
correct comment of ignoreNetworkInterface matches exception
zrlw Aug 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java
View file
Open in desktop
Expand Up @@ -330,7 +330,8 @@ private static boolean ignoreNetworkInterface(NetworkInterface networkInterface)
if(StringUtils.isNotEmpty(ignoredInterfaces)
&&StringUtils.isNotEmpty(networkInterfaceDisplayName=networkInterface.getDisplayName())){
for(String ignoredInterface: ignoredInterfaces.split(",")){
if(networkInterfaceDisplayName.matches(ignoredInterface.trim())){
if(networkInterfaceDisplayName.matches(ignoredInterface.trim())
|| networkInterfaceDisplayName.equals(ignoredInterface.trim())){
return true;
}
}
Expand Down
5 changes: 3 additions & 2 deletions dubbo-common/src/test/java/org/apache/dubbo/common/utils/NetUtilsTest.java
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.regex.Pattern;
import java.net.NetworkInterface;

import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_NETWORK_IGNORED_INTERFACE;
Expand Down Expand Up @@ -352,7 +353,7 @@ public void testIgnoreGivenInterface(){
NetworkInterface networkInterface = NetUtils.findNetworkInterface();
assertNotNull(networkInterface);
// ignore the given network interface's display name
this.setIgnoredInterfaces(networkInterface.getDisplayName());
this.setIgnoredInterfaces(Pattern.quote(networkInterface.getDisplayName()));
NetworkInterface newNetworkInterface = NetUtils.findNetworkInterface();
if(newNetworkInterface!=null){
assertTrue(!networkInterface.getDisplayName().equals(newNetworkInterface.getDisplayName()));
Expand All @@ -373,7 +374,7 @@ public void testIgnoreGivenPrefixInterfaceName(){
// ignore the given prefix network interface's display name
String displayName = networkInterface.getDisplayName();
if(StringUtils.isNotEmpty(displayName)&&displayName.length()>2){
String ignoredInterfaces = displayName.substring(0,1)+".*";
String ignoredInterfaces = Pattern.quote(displayName.substring(0,1)) + ".*";
this.setIgnoredInterfaces(ignoredInterfaces);
NetworkInterface newNetworkInterface = NetUtils.findNetworkInterface();
if(newNetworkInterface!=null){
Expand Down