bbb6e126b1
Motiviation: We incorrectly did ignore NS servers during redirect which had no ADDITIONAL record. This could at worse have the affect that we failed the query completely as none of the NS servers had a ADDITIONAL record. Beside this using a DnsCache to cache authoritative nameservers does not work in practise as we we need different features and semantics when cache these servers (for example we also want to cache unresolved nameservers and resolve these on the fly when needed). Modifications: - Correctly take NS records into account that have no matching ADDITIONAL record - Correctly handle multiple ADDITIONAL records for the same NS record - Introduce AuthoritativeDnsServerCache as a replacement of the DnsCache when caching authoritative nameservers + adding default implementation - Add an adapter layer to reduce API breakage as much as possible - Replace DnsNameResolver.uncachedRedirectDnsServerStream(...) with newRedirectDnsServerStream(...) - Add unit tests Result: Our DnsResolver now correctly handle redirects in all cases.
74 lines
2.1 KiB
Java
74 lines
2.1 KiB
Java
/*
|
|
* Copyright 2015 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 java.net.InetSocketAddress;
|
|
import java.util.Collection;
|
|
import java.util.List;
|
|
|
|
final class SequentialDnsServerAddressStream implements DnsServerAddressStream {
|
|
|
|
private final List<? extends InetSocketAddress> addresses;
|
|
private int i;
|
|
|
|
SequentialDnsServerAddressStream(List<? extends InetSocketAddress> addresses, int startIdx) {
|
|
this.addresses = addresses;
|
|
i = startIdx;
|
|
}
|
|
|
|
@Override
|
|
public InetSocketAddress next() {
|
|
int i = this.i;
|
|
InetSocketAddress next = addresses.get(i);
|
|
if (++ i < addresses.size()) {
|
|
this.i = i;
|
|
} else {
|
|
this.i = 0;
|
|
}
|
|
return next;
|
|
}
|
|
|
|
@Override
|
|
public int size() {
|
|
return addresses.size();
|
|
}
|
|
|
|
@Override
|
|
public SequentialDnsServerAddressStream duplicate() {
|
|
return new SequentialDnsServerAddressStream(addresses, i);
|
|
}
|
|
|
|
@Override
|
|
public String toString() {
|
|
return toString("sequential", i, addresses);
|
|
}
|
|
|
|
static String toString(String type, int index, Collection<? extends InetSocketAddress> addresses) {
|
|
final StringBuilder buf = new StringBuilder(type.length() + 2 + addresses.size() * 16);
|
|
buf.append(type).append("(index: ").append(index);
|
|
buf.append(", addrs: (");
|
|
for (InetSocketAddress a: addresses) {
|
|
buf.append(a).append(", ");
|
|
}
|
|
|
|
buf.setLength(buf.length() - 2);
|
|
buf.append("))");
|
|
|
|
return buf.toString();
|
|
}
|
|
}
|