Skip to content

fix(pd): resolve hostname entries in IpAuthHandler allowlist #2962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imbajin merged 7 commits into from
Mar 17, 2026
Merged

fix(pd): resolve hostname entries in IpAuthHandler allowlist #2962

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b9154b
Fix #2960: resolve hostname allowlist entries in IpAuthHandler at sta…
bitflicker64 Mar 5, 2026
0f2f00b
Fix IpAuthHandler hostname resolution and refresh allowlist after pee…
bitflicker64 Mar 11, 2026
1fca2c8
fix: refresh IpAuthHandler allowlist via updatePdRaft() bypass path
bitflicker64 Mar 15, 2026
980020a
Add TODO notes documenting current PD authentication limitations
bitflicker64 Mar 15, 2026
c888632
fix(test): add regression test for changePeerList -> IpAuthHandler.re…
bitflicker64 Mar 15, 2026
5d6e38e
fix: add timeout to changePeerList() and fix IPv6 flaky test
bitflicker64 Mar 16, 2026
0aa2d5f
fix: avoid changePeerList timeout race and update tests
bitflicker64 Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/auth/IpAuthHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
package org.apache.hugegraph.pd.raft.auth;

import java.net.InetSocketAddress;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;

import io.netty.channel.ChannelDuplexHandler;
Expand All @@ -30,11 +33,14 @@
@ChannelHandler.Sharable
public class IpAuthHandler extends ChannelDuplexHandler {

// Retained for potential refresh of resolvedIps on membership changes
private final Set<String> allowedIps;
private volatile Set<String> resolvedIps;
private static volatile IpAuthHandler instance;

private IpAuthHandler(Set<String> allowedIps) {
this.allowedIps = Collections.unmodifiableSet(allowedIps);
this.resolvedIps = resolveAll(allowedIps);
}

public static IpAuthHandler getInstance(Set<String> allowedIps) {
Expand Down Expand Up @@ -65,7 +71,24 @@ private static String getClientIp(ChannelHandlerContext ctx) {
}

private boolean isIpAllowed(String ip) {
return allowedIps.isEmpty() || allowedIps.contains(ip);
Set<String> resolved = this.resolvedIps;
return resolved.isEmpty() || resolved.contains(ip);
}

private static Set<String> resolveAll(Set<String> entries) {
Set<String> result = new HashSet<>(entries);

for (String entry : entries) {
try {
for (InetAddress addr : InetAddress.getAllByName(entry)) {
result.add(addr.getHostAddress());
}
} catch (UnknownHostException e) {
log.warn("Could not resolve allowlist entry '{}': {}", entry, e.getMessage());
}
}

return Collections.unmodifiableSet(result);
}

@Override
Expand Down
Loading