dnsjava · tw-datascientist · Oct 2, 2024 · Oct 3, 2024 · Oct 18, 2024 · Dec 5, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,6 +44,11 @@ jobs:
           distribution: temurin
           cache: maven
 
+      - name: Set up Docker
+        uses: docker/setup-docker-action@v4
+        with:
+          set-host: true
+
       - name: Build with Maven
         shell: bash
         run: |

diff --git a/pom.xml b/pom.xml
@@ -685,6 +685,13 @@
             <version>0.16</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.20.4</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <profiles>

diff --git a/src/main/java/org/xbill/DNS/NioSocks5ProxyConfig.java b/src/main/java/org/xbill/DNS/NioSocks5ProxyConfig.java
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: BSD-3-Clause
+package org.xbill.DNS;
+
+import java.net.InetSocketAddress;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class NioSocks5ProxyConfig {
+  private InetSocketAddress proxyAddress;
+  private AuthMethod authMethod;
+  private String socks5User;
+  private String socks5Password;
+
+  public enum AuthMethod {
+    NONE,
+    GSSAPI,
+    USER_PASS
+  }
+
+  public NioSocks5ProxyConfig(InetSocketAddress proxyAddress) {
+    this(proxyAddress, null, null);
+    authMethod = AuthMethod.NONE;
+  }
+
+  public NioSocks5ProxyConfig(
+      InetSocketAddress proxyAddress, String socks5User, String socks5Password) {
+    this.proxyAddress = proxyAddress;
+    this.socks5User = socks5User;
+    this.socks5Password = socks5Password;
+    authMethod = AuthMethod.USER_PASS;
+  }
+
+  //  public Socks5ProxyConfig(InetSocketAddress proxyAddress, GSSCredential gssCredential) {
+  //    this(proxyAddress, null, null, gssCredential);
+  //  }
+}
diff --git a/src/main/java/org/xbill/DNS/NioSocks5ProxyFactory.java b/src/main/java/org/xbill/DNS/NioSocks5ProxyFactory.java
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: BSD-3-Clause
+package org.xbill.DNS;
+
+import java.util.Objects;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.xbill.DNS.io.IoClientFactory;
+import org.xbill.DNS.io.TcpIoClient;
+import org.xbill.DNS.io.UdpIoClient;
+
+@Getter
+@Slf4j
+public class NioSocks5ProxyFactory implements IoClientFactory {
+  private final NioSocks5ProxyConfig config;
+  private final TcpIoClient tcpIoClient;
+  private final UdpIoClient udpIoClient;
+
+  public NioSocks5ProxyFactory(NioSocks5ProxyConfig socks5Proxy) {
+    config = Objects.requireNonNull(socks5Proxy, "proxy config must not be null");
+    tcpIoClient = new NioSocksTcpClient(config);
+    udpIoClient = new NioSocksUdpClient(config);
+  }
+
+  @Override
+  public TcpIoClient createOrGetTcpClient() {
+    return tcpIoClient;
+  }
+
+  @Override
+  public UdpIoClient createOrGetUdpClient() {
+    return udpIoClient;
+  }
+}