feat(net): support config domain besides IP #68
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package org.tron.core.config.args; | ||
|
|
||
| import java.net.InetAddress; | ||
| import java.net.InetSocketAddress; | ||
| import java.net.UnknownHostException; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.Future; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.tron.common.es.ExecutorServiceManager; | ||
| import org.tron.p2p.dns.lookup.LookUpTxt; | ||
| import org.tron.p2p.utils.NetUtil; | ||
|
|
||
| @Slf4j(topic = "app") | ||
| public class InetUtil { | ||
|
|
||
| public static List<InetSocketAddress> getInetSocketAddressList(List<String> items) { | ||
| List<InetSocketAddress> ret = new ArrayList<>(); | ||
| if (items.isEmpty()) { | ||
| return ret; | ||
| } | ||
| // Collect entries whose host part is a domain name (not an IP literal). | ||
| List<String> domainEntries = new ArrayList<>(); | ||
| for (String item : items) { | ||
| String host = NetUtil.parseInetSocketAddress(item).getHostString(); | ||
| if (!NetUtil.validIpV4(host) && !NetUtil.validIpV6(host)) { | ||
|
Comment on lines
+21
to
+30
There was a problem hiding this comment. Guard Line 29 and Line 65 call Possible fix+ private static InetSocketAddress tryParseInetSocketAddress(String configString) {
+ try {
+ return NetUtil.parseInetSocketAddress(configString);
+ } catch (IllegalArgumentException e) {
+ logger.warn("Invalid address format, skip: {}", configString);
+ return null;
+ }
+ }
+
public static List<InetSocketAddress> getInetSocketAddressList(List<String> items) {
List<InetSocketAddress> ret = new ArrayList<>();
if (items.isEmpty()) {
return ret;
}
@@
List<String> domainEntries = new ArrayList<>();
for (String item : items) {
- String host = NetUtil.parseInetSocketAddress(item).getHostString();
+ InetSocketAddress parsed = tryParseInetSocketAddress(item);
+ if (parsed == null) {
+ continue;
+ }
+ String host = parsed.getHostString();
if (!NetUtil.validIpV4(host) && !NetUtil.validIpV6(host)) {
domainEntries.add(item);
}
}
@@
for (String configString : items) {
InetSocketAddress inetSocketAddress;
- InetSocketAddress parsed = NetUtil.parseInetSocketAddress(configString);
+ InetSocketAddress parsed = tryParseInetSocketAddress(configString);
+ if (parsed == null) {
+ continue;
+ }
if (NetUtil.validIpV4(parsed.getHostString()) || NetUtil.validIpV6(parsed.getHostString())) {
inetSocketAddress = parsed;
} else {
inetSocketAddress = domainResolved.get(configString);
}Also applies to: 63-66 🤖 Prompt for AI Agents |
||
| domainEntries.add(item); | ||
| } | ||
| } | ||
|
|
||
| // Resolve domain names: spin up a thread pool only when there are multiple domains | ||
| Map<String, InetSocketAddress> domainResolved = new HashMap<>(); | ||
| if (domainEntries.size() > 1) { | ||
| String poolName = "args-dns-lookup"; | ||
| ExecutorService dnsPool = ExecutorServiceManager | ||
| .newFixedThreadPool(poolName, domainEntries.size(), true); | ||
| List<Future<InetSocketAddress>> futures = new ArrayList<>(domainEntries.size()); | ||
| for (String entry : domainEntries) { | ||
| futures.add(dnsPool.submit(() -> resolveInetSocketAddress(entry))); | ||
| } | ||
| for (int i = 0; i < domainEntries.size(); i++) { | ||
| String entry = domainEntries.get(i); | ||
| try { | ||
| domainResolved.put(entry, futures.get(i).get()); | ||
| } catch (InterruptedException e) { | ||
| Thread.currentThread().interrupt(); | ||
| logger.warn("DNS lookup interrupted for: {}", entry); | ||
| } catch (ExecutionException e) { | ||
| logger.warn("Failed to resolve address, skip: {}", entry); | ||
| } | ||
| } | ||
| ExecutorServiceManager.shutdownAndAwaitTermination(dnsPool, poolName); | ||
| } else if (domainEntries.size() == 1) { | ||
| String entry = domainEntries.get(0); | ||
| domainResolved.put(entry, resolveInetSocketAddress(entry)); | ||
| } | ||
|
|
||
| // Build the result list preserving the original config order. | ||
| for (String configString : items) { | ||
| InetSocketAddress inetSocketAddress; | ||
| InetSocketAddress parsed = NetUtil.parseInetSocketAddress(configString); | ||
| if (NetUtil.validIpV4(parsed.getHostString()) || NetUtil.validIpV6(parsed.getHostString())) { | ||
| inetSocketAddress = parsed; | ||
| } else { | ||
| inetSocketAddress = domainResolved.get(configString); | ||
| } | ||
| if (inetSocketAddress == null) { | ||
| continue; | ||
| } | ||
| ret.add(inetSocketAddress); | ||
| } | ||
| return ret; | ||
| } | ||
|
|
||
| /** | ||
| * Resolves a {@code domain:port} address string to an {@link InetSocketAddress} via DNS. | ||
| */ | ||
| private static InetSocketAddress resolveInetSocketAddress(String configString) { | ||
| InetSocketAddress parsed = NetUtil.parseInetSocketAddress(configString); | ||
| String host = parsed.getHostString(); | ||
| int port = parsed.getPort(); | ||
| InetAddress address = LookUpTxt.lookUpIp(host, true); | ||
| if (address == null) { | ||
| address = LookUpTxt.lookUpIp(host, false); | ||
| } | ||
| if (address == null) { | ||
| return null; | ||
| } | ||
| logger.info("Resolve {} to {}", host, address.getHostAddress()); | ||
| return new InetSocketAddress(address, port); | ||
| } | ||
|
|
||
| /** | ||
| * Resolves a hostname or IP string to a numeric IP address string. | ||
| */ | ||
| public static InetAddress resolveInetAddress(String ipOrDomain) { | ||
| // Fast path: already a numeric address — no lookup needed. | ||
| if (NetUtil.validIpV4(ipOrDomain) || NetUtil.validIpV6(ipOrDomain)) { | ||
| try { | ||
| return InetAddress.getByName(ipOrDomain); | ||
| } catch (UnknownHostException e) { | ||
| return null; | ||
| } | ||
| } | ||
| InetAddress address = LookUpTxt.lookUpIp(ipOrDomain, true); | ||
| if (address == null) { | ||
| address = LookUpTxt.lookUpIp(ipOrDomain, false); | ||
| } | ||
| return address; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -247,6 +247,14 @@ | |
| <sha256 value="e58f48ac14e4dbd48595d69e20bad35019ec1281514ef7ef155e18072ada617f" origin="Generated by Gradle"/> | ||
| </artifact> | ||
| </component> | ||
| <component group="com.github.317787106" name="libp2p" version="v0.0.9"> | ||
| <artifact name="libp2p-v0.0.9.jar"> | ||
| <sha256 value="2a955c3e133590e8ccc5411e7fbda358088f5829b13bd9052c39824b2258aac6" origin="Generated by Gradle"/> | ||
| </artifact> | ||
| <artifact name="libp2p-v0.0.9.module"> | ||
| <sha256 value="0434f4772b9e5df2a7bdd607091aa985a096c60eb889e75193fe1162e4e1ecd8" origin="Generated by Gradle"/> | ||
| </artifact> | ||
| </component> | ||
| <component group="com.github.briandilley.jsonrpc4j" name="jsonrpc4j" version="1.6"> | ||
| <artifact name="jsonrpc4j-1.6.jar"> | ||
| <sha256 value="700620939640e1ba55a39713656a1c7df554e7a4e679c6b349c37734ebd04182" origin="Generated by Gradle"/> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P0: Supply-chain risk: This replaces the official
io.github.tronprotocollibp2p artifact with a personal GitHub fork (com.github.317787106) resolved via JitPack. For a blockchain node, pulling a core networking dependency from an individual's fork introduces serious supply-chain risk — the fork is outside the project's normal review/release process and could contain unaudited changes. If this is intentional for local development, it should not be merged to a shared branch; if the upstream library needs patches, they should be contributed back and released under the official group ID.Prompt for AI agents