Make use of BaseResolverConfigProvider in all built-ins

ibauersachs · ibauersachs · commit 7c526afedc21 · 2020-06-06T15:50:54.000+02:00
This also removes the limitation to 3 nameservers of the resolv.conf
reader. We're not bound to the libc limitation, there's no need to
restrict the number of server.
diff --git a/src/main/java/org/xbill/DNS/config/AndroidResolverConfigProvider.java b/src/main/java/org/xbill/DNS/config/AndroidResolverConfigProvider.java
@@ -49,7 +49,7 @@ private void initializeNameservers() {
     for (int i = 1; i <= 4; i++) {
       String server = SystemProperties.get("net.dns" + i);
       if (server != null && !server.isEmpty()) {
-        nameservers.add(new InetSocketAddress(server, SimpleResolver.DEFAULT_PORT));
+        addNameserver(new InetSocketAddress(server, SimpleResolver.DEFAULT_PORT));
       }
     }
   }
diff --git a/src/main/java/org/xbill/DNS/config/ResolvConfResolverConfigProvider.java b/src/main/java/org/xbill/DNS/config/ResolvConfResolverConfigProvider.java
@@ -49,7 +49,7 @@ protected void parseResolvConf(InputStream in) throws IOException {
 
         switch (st.nextToken()) {
           case "nameserver":
-            addServer(st.nextToken());
+            addNameserver(new InetSocketAddress(st.nextToken(), SimpleResolver.DEFAULT_PORT));
             break;
 
           case "domain":
@@ -110,12 +110,6 @@ protected void parseResolvConf(InputStream in) throws IOException {
     }
   }
 
-  private void addServer(String server) {
-    if (nameservers.size() < 3) {
-      addNameserver(new InetSocketAddress(server, SimpleResolver.DEFAULT_PORT));
-    }
-  }
-
   @Override
   public int ndots() {
     return ndots;
diff --git a/src/main/java/org/xbill/DNS/config/SunJvmResolverConfigProvider.java b/src/main/java/org/xbill/DNS/config/SunJvmResolverConfigProvider.java
@@ -1,14 +1,10 @@
 // SPDX-License-Identifier: BSD-2-Clause
 package org.xbill.DNS.config;
 
-import static java.util.stream.Collectors.toList;
 
 import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
-import java.util.Collections;
 import java.util.List;
-import org.xbill.DNS.Name;
-import org.xbill.DNS.TextParseException;
 
 /**
  * Resolver config provider that queries the traditional class {@code
@@ -17,10 +13,7 @@
  * <p>As of Java 9, this generates an illegal reflective access exception and on Windows, this may
  * return invalid nameservers of disconnected NICs.
  */
-public class SunJvmResolverConfigProvider implements ResolverConfigProvider {
-  private List<InetSocketAddress> nameservers = null;
-  private List<Name> searchlist = null;
-
+public class SunJvmResolverConfigProvider extends BaseResolverConfigProvider {
   public void initialize() throws InitializationException {
     try {
       Class<?> resConfClass = Class.forName("sun.net.dns.ResolverConfiguration");
@@ -30,46 +23,21 @@ public void initialize() throws InitializationException {
       Method nameserversMethod = resConfClass.getMethod("nameservers");
       @SuppressWarnings("unchecked")
       List<String> jvmNameservers = (List<String>) nameserversMethod.invoke(resConf);
-      nameservers =
-          jvmNameservers.stream().map(ns -> new InetSocketAddress(ns, 53)).collect(toList());
+      for (String ns : jvmNameservers) {
+        addNameserver(new InetSocketAddress(ns, 53));
+      }
 
       Method searchlistMethod = resConfClass.getMethod("searchlist");
       @SuppressWarnings("unchecked")
       List<String> jvmSearchlist = (List<String>) searchlistMethod.invoke(resConf);
-      searchlist =
-          jvmSearchlist.stream()
-              .map(
-                  n -> {
-                    try {
-                      return Name.fromString(n, Name.root);
-                    } catch (TextParseException e) {
-                      throw new IllegalArgumentException(e);
-                    }
-                  })
-              .collect(toList());
+      for (String n : jvmSearchlist) {
+        addSearchPath(n);
+      }
     } catch (Exception e) {
       throw new InitializationException(e);
     }
   }
 
-  @Override
-  public List<InetSocketAddress> servers() {
-    if (nameservers == null) {
-      throw new IllegalStateException("not initialized");
-    }
-
-    return Collections.unmodifiableList(nameservers);
-  }
-
-  @Override
-  public List<Name> searchPaths() {
-    if (searchlist == null) {
-      throw new IllegalStateException("not initialized");
-    }
-
-    return Collections.unmodifiableList(searchlist);
-  }
-
   @Override
   public boolean isEnabled() {
     return Boolean.getBoolean("dnsjava.configprovider.sunjvm.enabled");
diff --git a/src/test/java/org/xbill/DNS/ResolverConfigTest.java b/src/test/java/org/xbill/DNS/ResolverConfigTest.java
@@ -2,7 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.xbill.DNS.config.PropertyResolverConfigProvider.DNS_NDOTS_PROP;
 import static org.xbill.DNS.config.PropertyResolverConfigProvider.DNS_SEARCH_PROP;
@@ -160,12 +159,6 @@ void jndi() {
     rc.initialize();
   }
 
-  @Test
-  void sunJvmThrowsIfNotInitialized() {
-    SunJvmResolverConfigProvider rc = new SunJvmResolverConfigProvider();
-    assertThrows(IllegalStateException.class, rc::servers);
-  }
-
   @Test
   void sunJvm() throws InitializationException {
     SunJvmResolverConfigProvider rc = new SunJvmResolverConfigProvider();

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ private void initializeNameservers() {`
`49`	`49`	`for (int i = 1; i <= 4; i++) {`
`50`	`50`	`String server = SystemProperties.get("net.dns" + i);`
`51`	`51`	`if (server != null && !server.isEmpty()) {`
`52`		`- nameservers.add(new InetSocketAddress(server, SimpleResolver.DEFAULT_PORT));`
	`52`	`+ addNameserver(new InetSocketAddress(server, SimpleResolver.DEFAULT_PORT));`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`