Fixed bug in Ipv6Resource.parseFromStrings() which prevented some ine… (

#593) * Fixed bug in Ipv6Resource.parseFromStrings() which prevented some inet6nums from being found via the ip tree. * ignore this test again for now as it hangs the build otherwise
RIPE-NCC · Nov 20, 2019 · 68c9cc8 · 68c9cc8
1 parent 2f44a40
commit 68c9cc8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/whois-db/src/test/java/net/ripe/db/whois/db/RebuildIndexTestIntegration.java b/whois-db/src/test/java/net/ripe/db/whois/db/RebuildIndexTestIntegration.java
@@ -29,14 +29,14 @@
 import java.util.List;
 import java.util.Map;
 
-import static net.ripe.db.whois.common.dao.jdbc.JdbcRpslObjectOperations.insertIntoLastAndUpdateSerials;
 import static net.ripe.db.whois.common.support.database.diff.Rows.with;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 
+@Ignore("[ES] TODO fix integration build [SB] build hangs when this integration test runs, we'll have to figure out why")
 @Category(IntegrationTest.class)
 @ContextConfiguration(locations = {"classpath:applicationContext-whois-test.xml"})
 public class RebuildIndexTestIntegration extends AbstractIntegrationTest {

diff --git a/whois-query/src/test/java/net/ripe/db/whois/query/integration/SimpleTestIntegration.java b/whois-query/src/test/java/net/ripe/db/whois/query/integration/SimpleTestIntegration.java
@@ -635,6 +635,17 @@ public void route6_correct_rebuild() {
         assertThat(query, containsString("route6:         2aaa:6fff::/48"));
     }
 
+    @Test
+    public void find124() {
+        databaseHelper.addObject("inet6num: 2a02:27d0:116:fffe:fffe:fffe:1671::/124");
+        databaseHelper.addObject("inet6num: 2a02:27d0::/32");
+
+        ipTreeUpdater.rebuild();
+        final String query = TelnetWhoisClient.queryLocalhost(QueryServer.port, "2a02:27d0:116:fffe:fffe:fffe:1671::/124");
+
+        assertThat(query, containsString("inet6num:       2a02:27d0:116:fffe:fffe:fffe:1671::/124"));
+    }
+
     @Test
     public void autnum_status_description() {
         final String query = TelnetWhoisClient.queryLocalhost(QueryServer.port, "-v aut-num");

diff --git a/whois-rpsl/src/main/java/net/ripe/db/whois/common/ip/Ipv6Resource.java b/whois-rpsl/src/main/java/net/ripe/db/whois/common/ip/Ipv6Resource.java
@@ -33,10 +33,6 @@ public class Ipv6Resource extends IpInterval<Ipv6Resource> implements Comparable
     private final long endMsb;
     private final long endLsb;
 
-    private Ipv6Resource(final BigInteger begin, final int len) {
-        this(msb(begin), lsb(begin), len);
-    }
-
     public static long lsb(final BigInteger begin) {
         return begin.and(MASK).longValue();
     }
@@ -46,8 +42,7 @@ public static long msb(final BigInteger begin) {
     }
 
     public static Ipv6Resource parseFromStrings(final String msb, final String lsb, final int len) {
-        final BigInteger begin = new BigInteger(msb).shiftLeft(LONG_BITCOUNT).add(new BigInteger(lsb));
-        return new Ipv6Resource(begin, len);
+        return new Ipv6Resource(Long.parseLong(msb), Long.parseLong(lsb), len);
     }
 
     private Ipv6Resource(final long msb, final long lsb, final int prefixLength) {

diff --git a/whois-rpsl/src/test/java/net/ripe/db/whois/common/ip/Ipv6ResourceTest.java b/whois-rpsl/src/test/java/net/ripe/db/whois/common/ip/Ipv6ResourceTest.java
@@ -363,6 +363,13 @@ public void doubleLongUnsignedComparison() {
 
     }
 
+    @Test
+    public void parse_from_strings_124() {
+        Ipv6Resource ipv6Resource = Ipv6Resource.parse("2a02:27d0:116:fffe:fffe:fffe:1671::/124");
+        Ipv6Resource parsedFromStrings = Ipv6Resource.parseFromStrings(Long.toString(Ipv6Resource.msb(ipv6Resource.begin())), Long.toString(Ipv6Resource.lsb(ipv6Resource.begin())), ipv6Resource.getPrefixLength());
+        assertEquals(ipv6Resource, parsedFromStrings);
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void reverse_empty() {
         Ipv6Resource.parseReverseDomain("");