Skip to content

utils: do not report invalid IPv6 ranges as overlap #37

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

Open
tllovesxs wants to merge 2 commits into
base: main
Choose a base branch
from
Open

utils: do not report invalid IPv6 ranges as overlap #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a9929c
utils: do not treat invalid IPv6 ranges as overlap
tllovesxs Sep 11, 2026
47d30aa
utils: log invalid IPv6 overlap inputs
tllovesxs Sep 11, 2026
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
6 changes: 4 additions & 2 deletions utils/src/main/java/org/zstack/utils/network/IPv6NetworkUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,10 @@ public static boolean isIpv6RangeOverlap(String startIp1, String endIp1, String
IPv6AddressRange range1 = IPv6AddressRange.fromFirstAndLast(s1, e1);
IPv6AddressRange range2 = IPv6AddressRange.fromFirstAndLast(s2, e2);
return range1.overlaps(range2);
} catch (Exception e) {
return true;
} catch (IllegalArgumentException e) {
logger.warn(String.format("invalid IPv6 range supplied: [%s, %s], [%s, %s]",
startIp1, endIp1, startIp2, endIp2), e);
return false;
}
}

Expand Down
29 changes: 29 additions & 0 deletions utils/src/test/java/org/zstack/utils/test/TestIPv6NetworkUtilsEdgeCases.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package org.zstack.utils.test;

import org.junit.Test;
import org.zstack.utils.network.IPv6NetworkUtils;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

public class TestIPv6NetworkUtilsEdgeCases {
@Test
public void testRangeOverlap() {
assertTrue(IPv6NetworkUtils.isIpv6RangeOverlap(
"2001:db8::1", "2001:db8::10",
"2001:db8::10", "2001:db8::20"));
assertFalse(IPv6NetworkUtils.isIpv6RangeOverlap(
"2001:db8::1", "2001:db8::10",
"2001:db8::11", "2001:db8::20"));
}

@Test
public void testInvalidRangeDoesNotOverlap() {
assertFalse(IPv6NetworkUtils.isIpv6RangeOverlap(
"2001:db8::10", "2001:db8::2",
"2001:db8::1", "2001:db8::20"));
assertFalse(IPv6NetworkUtils.isIpv6RangeOverlap(
"not-an-ip", "2001:db8::2",
"2001:db8::1", "2001:db8::20"));
}
}