Use dnsjava/dnsjava as DNS Provider, also add it's experiment in lab, an dependency of #834

Ghost-chu · Ghost-chu · commit a06b86e0fca6 · 2024-12-27T01:28:27.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -510,5 +510,10 @@
             <artifactId>java-multiaddr</artifactId>
             <version>v1.4.12</version>
         </dependency>
+        <dependency>
+            <groupId>dnsjava</groupId>
+            <artifactId>dnsjava</artifactId>
+            <version>3.6.2</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/com/ghostchu/peerbanhelper/PeerBanHelperServer.java b/src/main/java/com/ghostchu/peerbanhelper/PeerBanHelperServer.java
@@ -23,6 +23,7 @@
 import com.ghostchu.peerbanhelper.invoker.impl.IPFilterInvoker;
 import com.ghostchu.peerbanhelper.ipdb.IPDB;
 import com.ghostchu.peerbanhelper.ipdb.IPGeoData;
+import com.ghostchu.peerbanhelper.lab.Experiments;
 import com.ghostchu.peerbanhelper.lab.Laboratory;
 import com.ghostchu.peerbanhelper.metric.BasicMetrics;
 import com.ghostchu.peerbanhelper.module.*;
@@ -34,6 +35,7 @@
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
 import com.ghostchu.peerbanhelper.torrent.Torrent;
 import com.ghostchu.peerbanhelper.util.*;
+import com.ghostchu.peerbanhelper.util.dns.DNSLookup;
 import com.ghostchu.peerbanhelper.util.encrypt.RSAUtils;
 import com.ghostchu.peerbanhelper.util.json.JsonUtil;
 import com.ghostchu.peerbanhelper.util.paging.Pageable;
@@ -59,6 +61,7 @@
 import inet.ipaddr.format.util.DualIPv4v6Tries;
 import io.javalin.util.JavalinBindException;
 import lombok.Getter;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.bspfsystems.yamlconfiguration.configuration.ConfigurationSection;
@@ -139,6 +142,8 @@ public class PeerBanHelperServer implements Reloadable {
     private BanListDao banListDao;
     @Autowired
     private Laboratory laboratory;
+    @Autowired
+    private DNSLookup dnsLookup;
 //    @Autowired
 //    private IPFSBanListShare share;
 
@@ -197,7 +202,15 @@ public void start() throws SQLException {
         Main.getReloadManager().register(this);
         Main.getEventBus().post(new PBHServerStartedEvent(this));
         sendSnapshotAlert();
+        runTestCode();
+    }
 
+    @SneakyThrows
+    private void runTestCode() {
+        if (!"LiveDebug".equalsIgnoreCase(System.getProperty("pbh.release"))) {
+            return;
+        }
+        // run some junky test code here
     }
 
     private void setupScriptEngine() {
@@ -675,7 +688,7 @@ public void updateDownloader(@NotNull Downloader downloader, boolean updateBanLi
         try {
             var loginResult = downloader.login();
             if (!loginResult.success()) {
-                if(loginResult.getStatus() != DownloaderLoginResult.Status.PAUSED) {
+                if (loginResult.getStatus() != DownloaderLoginResult.Status.PAUSED) {
                     log.error(tlUI(Lang.ERR_CLIENT_LOGIN_FAILURE_SKIP, downloader.getName(), downloader.getEndpoint(), tlUI(loginResult.getMessage())));
                     downloader.setLastStatus(DownloaderLastStatus.ERROR, loginResult.getMessage());
                 }
@@ -769,7 +782,7 @@ public Map<Torrent, List<Peer>> collectPeers(Downloader downloader) {
         Map<Torrent, List<Peer>> peers = new ConcurrentHashMap<>();
         var loginResult = downloader.login();
         if (!loginResult.success()) {
-            if(loginResult.getStatus() != DownloaderLoginResult.Status.PAUSED){
+            if (loginResult.getStatus() != DownloaderLoginResult.Status.PAUSED) {
                 log.error(tlUI(Lang.ERR_CLIENT_LOGIN_FAILURE_SKIP, downloader.getName(), downloader.getEndpoint(), tlUI(loginResult.getMessage())));
                 downloader.setLastStatus(DownloaderLastStatus.ERROR, loginResult.getMessage());
                 if (loginResult.getStatus() == DownloaderLoginResult.Status.MISSING_COMPONENTS || loginResult.getStatus() == DownloaderLoginResult.Status.REQUIRE_TAKE_ACTIONS) {
@@ -920,9 +933,19 @@ private void banPeer(@NotNull Collection<PeerAddress> compareWith, @NotNull BanM
         banMetadata.setReverseLookup("N/A");
         if (Main.getMainConfig().getBoolean("lookup.dns-reverse-lookup")) {
             executor.submit(() -> {
-                String hostName = peer.getPeerAddress().getAddress().toInetAddress().getHostName();
-                if (!peer.getPeerAddress().getIp().equals(hostName)) {
-                    banMetadata.setReverseLookup(peer.getPeerAddress().getAddress().toInetAddress().getHostName());
+                if (laboratory.isExperimentActivated(Experiments.DNSJAVA.getExperiment())) {
+                    dnsLookup.ptr(peer.getPeerAddress().getAddress().toReverseDNSLookupString()).thenAccept(hostName -> {
+                        if (hostName.isPresent()) {
+                            if (!peer.getPeerAddress().getIp().equals(hostName.get())) {
+                                banMetadata.setReverseLookup(hostName.get());
+                            }
+                        }
+                    });
+                } else {
+                    String hostName = peer.getPeerAddress().getAddress().toInetAddress().getHostName();
+                    if (!peer.getPeerAddress().getIp().equals(hostName)) {
+                        banMetadata.setReverseLookup(peer.getPeerAddress().getAddress().toInetAddress().getHostName());
+                    }
                 }
             });
         }
diff --git a/src/main/java/com/ghostchu/peerbanhelper/lab/Experiments.java b/src/main/java/com/ghostchu/peerbanhelper/lab/Experiments.java
@@ -6,7 +6,8 @@
 import java.util.List;
 
 public enum Experiments {
-    IPFS(new Experiment("ipfs", List.of(0), new TranslationComponent(Lang.LAB_EXPERIMENT_IPFS_TITLE), new TranslationComponent(Lang.LAB_EXPERIMENT_IPFS_DESCRIPTION)));
+    IPFS(new Experiment("ipfs", List.of(0), new TranslationComponent(Lang.LAB_EXPERIMENT_IPFS_TITLE), new TranslationComponent(Lang.LAB_EXPERIMENT_IPFS_DESCRIPTION))),
+    DNSJAVA(new Experiment("dnsjava", List.of(0, 1, 2), new TranslationComponent(Lang.LAB_EXPERIMENT_DNSJAVA_TITLE), new TranslationComponent(Lang.LAB_EXPERIMENT_DNSJAVA_DESCRIPTION)));
 
     private final Experiment experiment;
 
diff --git a/src/main/java/com/ghostchu/peerbanhelper/lab/Laboratory.java b/src/main/java/com/ghostchu/peerbanhelper/lab/Laboratory.java
@@ -37,7 +37,7 @@ public Laboratory() throws IOException {
     }
 
     public boolean isExperimentActivated(Experiment experiment) {
-        if(!isEnabled()){
+        if (!isEnabled()) {
             return false;
         }
         var value = labConfig.getString(experiment.getId());
@@ -57,16 +57,16 @@ public boolean isExperimentActivated(Experiment experiment) {
         }
     }
 
-    public void setExperimentActivated(String id, Boolean activated) throws IllegalArgumentException{
+    public void setExperimentActivated(String id, Boolean activated) throws IllegalArgumentException {
         for (Experiments value : Experiments.values()) {
-            if(!value.getExperiment().getId().equals(id)){
+            if (!value.getExperiment().getId().equals(id)) {
                 continue;
             }
             labConfig.set(value.getExperiment().getId(), activated == null ? "default" : activated);
             saveLabConfig();
             return;
         }
-        throw new IllegalArgumentException("Invalid experiment id: "+id+", it's not exists in Experiments registry");
+        throw new IllegalArgumentException("Invalid experiment id: " + id + ", it's not exists in Experiments registry");
     }
 
     private void saveLabConfig() {
diff --git a/src/main/java/com/ghostchu/peerbanhelper/text/Lang.java b/src/main/java/com/ghostchu/peerbanhelper/text/Lang.java
@@ -467,7 +467,7 @@ public enum Lang {
     FREE_LICENSE_DESCRIPTION,
     FREE_LICENSE_SOURCE,
     FREE_LICENSE_LICENSE_TO,
-    FREE_LICENSE_RENEW_STILL_ACTIVE, PBH_PLUS_LICENSE_UPDATED, DOWNLOADER_QB_DISABLE_SAME_IP_MULTI_CONNECTION_FAILED, DOWNLOADER_PAUSED;
+    FREE_LICENSE_RENEW_STILL_ACTIVE, PBH_PLUS_LICENSE_UPDATED, DOWNLOADER_QB_DISABLE_SAME_IP_MULTI_CONNECTION_FAILED, DOWNLOADER_PAUSED, LAB_EXPERIMENT_DNSJAVA_TITLE, LAB_EXPERIMENT_DNSJAVA_DESCRIPTION;
 
     public String getKey() {
         return name();
diff --git a/src/main/java/com/ghostchu/peerbanhelper/util/dns/DNSLookup.java b/src/main/java/com/ghostchu/peerbanhelper/util/dns/DNSLookup.java
@@ -0,0 +1,91 @@
+package com.ghostchu.peerbanhelper.util.dns;
+
+import com.ghostchu.peerbanhelper.Main;
+import com.ghostchu.simplereloadlib.ReloadResult;
+import com.ghostchu.simplereloadlib.Reloadable;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.xbill.DNS.Record;
+import org.xbill.DNS.*;
+import oshi.SystemInfo;
+
+import java.net.UnknownHostException;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+@Slf4j
+@Component
+public class DNSLookup implements Reloadable {
+    private volatile ExtendedResolver resolver = new ExtendedResolver();
+
+    public DNSLookup() {
+        reloadConfig();
+        Main.getReloadManager().register(this);
+    }
+
+    @Override
+    public ReloadResult reloadModule() throws Exception {
+        reloadConfig();
+        return Reloadable.super.reloadModule();
+    }
+
+    private void reloadConfig() {
+        // get system dns via oshi
+        SystemInfo systemInfo = new SystemInfo();
+        var dnsServers = systemInfo.getOperatingSystem().getNetworkParams().getDnsServers();
+        List<String> dns = Main.getMainConfig().getStringList("resolvers.servers");
+        if (Main.getMainConfig().getBoolean("resolvers.use-system",true)) {
+            dns.addAll(Arrays.asList(dnsServers));
+        }
+        applyDnsServers(dns);
+    }
+
+    private void applyDnsServers(List<String> servers) {
+        List<Resolver> resolvers = new ArrayList<>();
+        for (String dns : servers) {
+            if (dns.startsWith("http")) {
+                resolvers.add(new DohResolver(dns));
+                log.info("Added DoH resolver: {}", dns);
+            } else {
+                try {
+                    resolvers.add(new SimpleResolver(dns));
+                    log.info("Added resolver: {}", dns);
+                } catch (UnknownHostException e) {
+                    log.warn("Failed to add resolver: {}", dns, e);
+                }
+            }
+        }
+        var replace = new ExtendedResolver(resolvers.toArray(new Resolver[0]));
+        replace.setLoadBalance(true);
+        replace.setTimeout(Duration.of(3, ChronoUnit.SECONDS));
+        resolver = replace;
+    }
+
+    public CompletableFuture<Optional<String>> ptr(String query) {
+        return CompletableFuture.supplyAsync(() -> {
+            try {
+                Lookup lookup = new Lookup(query, Type.PTR);
+                lookup.setResolver(resolver);
+                lookup.run();
+                if (lookup.getResult() == Lookup.SUCCESSFUL) {
+                    Record[] records = lookup.getAnswers();
+                    for (Record record : records) {
+                        if (record instanceof PTRRecord ptr) {
+                            return Optional.of(ptr.getTarget().toString());
+                        }
+                    }
+                    return Optional.empty();
+                }
+                return Optional.empty();
+            } catch (TextParseException ignored) {
+                return Optional.empty();
+            }
+        });
+    }
+
+}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -173,3 +173,17 @@ decentralized:
     # 发布当前封禁列表到 IPFS 以允许它人订阅您的封禁列表内容，时间单位：毫秒，设置为 -1 以禁用
     # Publish current banlist to IPFS to allow others subscribe your banlist, time unit: milliseconds, set to -1 to disable
     publish-banlist: 3600000
+
+# 自定义 DNS 解析器，暂不支持 DoH/DoT/DoQ
+# 留空则使用系统 DNS
+# 部分 DNS 存在速率限制，建议使用与系统 DNS 不同的 DNS，以避免影响正常上网解析
+# 要使此配置生效，需要启用 DNSJava 实验
+# Custom DNS resolver, DoT/DoQ are not supported yet
+# Leave it empty to use system DNS
+# Some DNS have rate limit, it's recommended to use different DNS with system DNS to avoid affect normal internet access
+# To make this config take effect, you need enable DNSJava experiment
+resolvers:
+  # 使用系统 DNS - Use system DNS
+  use-system: true
+  # 自定义 DNS 服务器列表 - Custom DNS server list
+  servers: []
diff --git a/src/main/resources/lang/en_us/messages.yml b/src/main/resources/lang/en_us/messages.yml
@@ -535,4 +535,6 @@ FREE_LICENSE_RENEW_STILL_ACTIVE: "The current license is still active and does n
 FREE_LICENSE_SOURCE: "Locally generated free license."
 FREE_LICENSE_LICENSE_TO: "{} for personal use."
 FREE_LICENSE_DESCRIPTION: "Local generated renewable free license, for personal use only."
-DOWNLOADER_PAUSED: Downloader paused
+DOWNLOADER_PAUSED: Downloader paused
+LAB_EXPERIMENT_DNSJAVA_TITLE: "DNSJava DNS"
+LAB_EXPERIMENT_DNSJAVA_DESCRIPTION: "Use [dnsjava/dnsjava](https://github.com/dnsjava/dnsjava) to replace the default JDK DNS resolver in some modules, providing more reliable hostname and reverse DNS lookup capabilities, and supporting custom DNS servers and load balancing. DNSJava only works for certain functions (such as reverse DNS lookup), while other functions will continue to use JDK DNS.  \nAfter enabling this experiment, you can configure the DNS server addresses for DNSJava in the configuration file."
diff --git a/src/main/resources/lang/messages_fallback.yml b/src/main/resources/lang/messages_fallback.yml
@@ -535,4 +535,6 @@ FREE_LICENSE_SOURCE: "本地生成的免费许可证"
 FREE_LICENSE_LICENSE_TO: "{} 用于个人用途"
 FREE_LICENSE_DESCRIPTION: "本地生成的循环免费许可证，仅用于个人用途"
 DOWNLOADER_QB_DISABLE_SAME_IP_MULTI_CONNECTION_FAILED: "禁用 {} ({}) 的高级设置 “允许来自不同 IP 地址的多重连接” 失败：{} - {}！此功能必须关闭，否则将导致 PCB 封禁误判。"
-DOWNLOADER_PAUSED: "下载器已暂停"
+DOWNLOADER_PAUSED: "下载器已暂停"
+LAB_EXPERIMENT_DNSJAVA_TITLE: "DNSJava DNS 解析"
+LAB_EXPERIMENT_DNSJAVA_DESCRIPTION: "在部分功能模块中使用 [dnsjava/dnsjava](https://github.com/dnsjava/dnsjava) 替代 JDK 默认的 DNS 解析器，以提供更可靠的主机名和反向 DNS 查询能力，并支持自定义 DNS 服务器和负载均衡的能力。DNSJava 仅在部分功能上工作（如 DNS 反查），其它功能将继续使用 JDK DNS。  \n启用此实验后，您可以在配置文件中配置 DNSJava 的 DNS 服务器地址。"
diff --git a/src/main/resources/lang/zh_cn/messages.yml b/src/main/resources/lang/zh_cn/messages.yml
@@ -532,4 +532,6 @@ FREE_LICENSE_RENEW_STILL_ACTIVE: "当前许可证仍在有效期内，无需重
 FREE_LICENSE_SOURCE: "本地生成的免费许可证"
 FREE_LICENSE_LICENSE_TO: "{} 用于个人用途"
 FREE_LICENSE_DESCRIPTION: "本地生成的循环免费许可证，仅用于个人用途"
-DOWNLOADER_PAUSED: "下载器已暂停"
+DOWNLOADER_PAUSED: "下载器已暂停"
+LAB_EXPERIMENT_DNSJAVA_TITLE: "DNSJava DNS 解析"
+LAB_EXPERIMENT_DNSJAVA_DESCRIPTION: "在部分功能模块中使用 [dnsjava/dnsjava](https://github.com/dnsjava/dnsjava) 替代 JDK 默认的 DNS 解析器，以提供更可靠的主机名和反向 DNS 查询能力，并支持自定义 DNS 服务器和负载均衡的能力。DNSJava 仅在部分功能上工作（如 DNS 反查），其它功能将继续使用 JDK DNS。  \n启用此实验后，您可以在配置文件中配置 DNSJava 的 DNS 服务器地址。"

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public Laboratory() throws IOException {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public boolean isExperimentActivated(Experiment experiment) {`
`40`		`- if(!isEnabled()){`
	`40`	`+ if (!isEnabled()) {`
`41`	`41`	`return false;`
`42`	`42`	`}`
`43`	`43`	`var value = labConfig.getString(experiment.getId());`
`@@ -57,16 +57,16 @@ public boolean isExperimentActivated(Experiment experiment) {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- public void setExperimentActivated(String id, Boolean activated) throws IllegalArgumentException{`
	`60`	`+ public void setExperimentActivated(String id, Boolean activated) throws IllegalArgumentException {`
`61`	`61`	`for (Experiments value : Experiments.values()) {`
`62`		`- if(!value.getExperiment().getId().equals(id)){`
	`62`	`+ if (!value.getExperiment().getId().equals(id)) {`
`63`	`63`	`continue;`
`64`	`64`	`}`
`65`	`65`	`labConfig.set(value.getExperiment().getId(), activated == null ? "default" : activated);`
`66`	`66`	`saveLabConfig();`
`67`	`67`	`return;`
`68`	`68`	`}`
`69`		`- throw new IllegalArgumentException("Invalid experiment id: "+id+", it's not exists in Experiments registry");`
	`69`	`+ throw new IllegalArgumentException("Invalid experiment id: " + id + ", it's not exists in Experiments registry");`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`private void saveLabConfig() {`