debc1cbc0a
Motivation: https://github.com/netty/netty/pull/9021 did apply some changes to filter out duplicates InetAddress when calling resolveAll(...) to mimic JDK behaviour. Unfortunally this also introduced a regression as we should not filter duplicates when the user explicit calls resolveAll(DnsQuestion). Modifications: - Only filter duplicates if resolveAll(String) is used - Add unit test Result: Fixes regressions introduces by https://github.com/netty/netty/pull/9021
106 lines
4.2 KiB
Java
106 lines
4.2 KiB
Java
/*
|
|
* Copyright 2018 The Netty Project
|
|
*
|
|
* The Netty Project licenses this file to you under the Apache License,
|
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
package io.netty.resolver.dns;
|
|
|
|
import static io.netty.resolver.dns.DnsAddressDecoder.decodeAddress;
|
|
|
|
import java.net.InetAddress;
|
|
import java.net.UnknownHostException;
|
|
import java.util.List;
|
|
|
|
import io.netty.channel.EventLoop;
|
|
import io.netty.handler.codec.dns.DnsRecord;
|
|
import io.netty.handler.codec.dns.DnsRecordType;
|
|
import io.netty.util.concurrent.Promise;
|
|
|
|
final class DnsAddressResolveContext extends DnsResolveContext<InetAddress> {
|
|
|
|
private final DnsCache resolveCache;
|
|
private final AuthoritativeDnsServerCache authoritativeDnsServerCache;
|
|
private final boolean completeEarlyIfPossible;
|
|
|
|
DnsAddressResolveContext(DnsNameResolver parent, String hostname, DnsRecord[] additionals,
|
|
DnsServerAddressStream nameServerAddrs, DnsCache resolveCache,
|
|
AuthoritativeDnsServerCache authoritativeDnsServerCache,
|
|
boolean completeEarlyIfPossible) {
|
|
super(parent, hostname, DnsRecord.CLASS_IN, parent.resolveRecordTypes(), additionals, nameServerAddrs);
|
|
this.resolveCache = resolveCache;
|
|
this.authoritativeDnsServerCache = authoritativeDnsServerCache;
|
|
this.completeEarlyIfPossible = completeEarlyIfPossible;
|
|
}
|
|
|
|
@Override
|
|
DnsResolveContext<InetAddress> newResolverContext(DnsNameResolver parent, String hostname,
|
|
int dnsClass, DnsRecordType[] expectedTypes,
|
|
DnsRecord[] additionals,
|
|
DnsServerAddressStream nameServerAddrs) {
|
|
return new DnsAddressResolveContext(parent, hostname, additionals, nameServerAddrs, resolveCache,
|
|
authoritativeDnsServerCache, completeEarlyIfPossible);
|
|
}
|
|
|
|
@Override
|
|
InetAddress convertRecord(DnsRecord record, String hostname, DnsRecord[] additionals, EventLoop eventLoop) {
|
|
return decodeAddress(record, hostname, parent.isDecodeIdn());
|
|
}
|
|
|
|
@Override
|
|
List<InetAddress> filterResults(List<InetAddress> unfiltered) {
|
|
unfiltered.sort(PreferredAddressTypeComparator.comparator(parent.preferredAddressType()));
|
|
return unfiltered;
|
|
}
|
|
|
|
@Override
|
|
boolean isCompleteEarly(InetAddress resolved) {
|
|
return completeEarlyIfPossible && parent.preferredAddressType().addressType() == resolved.getClass();
|
|
}
|
|
|
|
@Override
|
|
boolean isDuplicateAllowed() {
|
|
// We don't want include duplicates to mimic JDK behaviour.
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
void cache(String hostname, DnsRecord[] additionals,
|
|
DnsRecord result, InetAddress convertedResult) {
|
|
resolveCache.cache(hostname, additionals, convertedResult, result.timeToLive(), parent.ch.eventLoop());
|
|
}
|
|
|
|
@Override
|
|
void cache(String hostname, DnsRecord[] additionals, UnknownHostException cause) {
|
|
resolveCache.cache(hostname, additionals, cause, parent.ch.eventLoop());
|
|
}
|
|
|
|
@Override
|
|
void doSearchDomainQuery(String hostname, Promise<List<InetAddress>> nextPromise) {
|
|
// Query the cache for the hostname first and only do a query if we could not find it in the cache.
|
|
if (!DnsNameResolver.doResolveAllCached(
|
|
hostname, additionals, nextPromise, resolveCache, parent.resolvedInternetProtocolFamiliesUnsafe())) {
|
|
super.doSearchDomainQuery(hostname, nextPromise);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
DnsCache resolveCache() {
|
|
return resolveCache;
|
|
}
|
|
|
|
@Override
|
|
AuthoritativeDnsServerCache authoritativeDnsServerCache() {
|
|
return authoritativeDnsServerCache;
|
|
}
|
|
}
|