Skip to content

Commit

Permalink
HADOOP-17317. [JDK 11] Upgrade dnsjava to remove illegal access warni…
Browse files Browse the repository at this point in the history 
…ngs (#2442) (#6981)

(cherry picked from commit 4c35466)

Co-authored-by: Akira Ajisaka <aajisaka@apache.org>
  • Loading branch information
@adoroszlai @aajisaka
adoroszlai and aajisaka authored Aug 6, 2024
1 parent c34cfd3 commit 870a216
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 114 deletions.
7 changes: 2 additions & 5 deletions ...p-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,11 +623,8 @@ protected static class QualifiedHostResolver implements HostResolver {
private List<String> searchDomains = new ArrayList<>();
{
ResolverConfig resolverConfig = ResolverConfig.getCurrentConfig();
Name[] names = resolverConfig.searchPath();
if (names != null) {
for (Name name : names) {
searchDomains.add(name.toString());
}
for (Name name : resolverConfig.searchPath()) {
searchDomains.add(name.toString());
}
}

Expand Down
77 changes: 29 additions & 48 deletions ...ject/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.nio.channels.DatagramChannel;
Expand All @@ -87,8 +86,10 @@
import java.security.spec.InvalidKeySpecException;
import java.security.spec.RSAPrivateKeySpec;
import java.text.SimpleDateFormat;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.Enumeration;
Expand Down Expand Up @@ -232,13 +233,7 @@ private void updateDNSServer(Configuration conf) {
} catch (SocketException e) {
}
ResolverConfig.refresh();
ExtendedResolver resolver;
try {
resolver = new ExtendedResolver();
} catch (UnknownHostException e) {
LOG.error("Can not resolve DNS servers: ", e);
return;
}
ExtendedResolver resolver = new ExtendedResolver();
for (Resolver check : resolver.getResolvers()) {
if (check instanceof SimpleResolver) {
InetAddress address = ((SimpleResolver) check).getAddress()
Expand All @@ -247,7 +242,7 @@ private void updateDNSServer(Configuration conf) {
resolver.deleteResolver(check);
continue;
} else {
check.setTimeout(30);
check.setTimeout(Duration.ofSeconds(30));
}
} else {
LOG.error("Not simple resolver!!!?" + check);
Expand All @@ -260,12 +255,10 @@ private void updateDNSServer(Configuration conf) {
}
StringBuilder message = new StringBuilder();
message.append("DNS servers: ");
if (ResolverConfig.getCurrentConfig().servers() != null) {
for (String server : ResolverConfig.getCurrentConfig()
.servers()) {
message.append(server);
message.append(" ");
}
for (InetSocketAddress address :
ResolverConfig.getCurrentConfig().servers()) {
message.append(address);
message.append(" ");
}
LOG.info(message.toString());
}
Expand Down Expand Up @@ -331,11 +324,10 @@ private void signZones() throws IOException {
if (isDNSSECEnabled()) {
Collection<Zone> zoneCollection = zones.values();
for (Zone zone : zoneCollection) {
Iterator itor = zone.iterator();
Iterator<RRset> itor = zone.iterator();
while (itor.hasNext()) {
RRset rRset = (RRset) itor.next();
Iterator sigs = rRset.sigs();
if (!sigs.hasNext()) {
RRset rRset = itor.next();
if (!rRset.sigs().isEmpty()) {
try {
signSiteRecord(zone, rRset.first());
} catch (DNSSEC.DNSSECException e) {
Expand Down Expand Up @@ -692,10 +684,8 @@ private void signSiteRecord(Zone zone, Record record)
throws DNSSEC.DNSSECException {
RRset rrset = zone.findExactMatch(record.getName(),
record.getType());
Calendar cal = Calendar.getInstance();
Date inception = cal.getTime();
cal.add(Calendar.YEAR, 1);
Date expiration = cal.getTime();
Instant inception = Instant.now();
Instant expiration = inception.plus(365, ChronoUnit.DAYS);
RRSIGRecord rrsigRecord =
DNSSEC.sign(rrset, dnsKeyRecs.get(zone.getOrigin()),
privateKey, inception, expiration);
Expand Down Expand Up @@ -1159,7 +1149,7 @@ private byte remoteLookup(Message response, Name name, int type,
}
}
if (r.getType() == Type.CNAME) {
Name cname = ((CNAMERecord) r).getAlias();
Name cname = r.getName();
if (iterations < 6) {
remoteLookup(response, cname, type, iterations + 1);
}
Expand Down Expand Up @@ -1255,9 +1245,7 @@ private int getMaxLength(Socket s, OPTRecord queryOPT) {
* @param flags the flags.
*/
private void addAdditional2(Message response, int section, int flags) {
Record[] records = response.getSectionArray(section);
for (int i = 0; i < records.length; i++) {
Record r = records[i];
for (Record r : response.getSection(section)) {
Name glueName = r.getAdditionalName();
if (glueName != null) {
addGlue(response, glueName, flags);
Expand Down Expand Up @@ -1403,11 +1391,10 @@ byte addAnswer(Message response, Name name, int type, int dclass,
response.getHeader().setFlag(Flags.AA);
}
} else if (sr.isSuccessful()) {
RRset[] rrsets = sr.answers();
List<RRset> rrsets = sr.answers();
LOG.info("found answers {}", rrsets);
for (int i = 0; i < rrsets.length; i++) {
addRRset(name, response, rrsets[i],
Section.ANSWER, flags);
for (RRset rrset : rrsets) {
addRRset(name, response, rrset, Section.ANSWER, flags);
}
addNS(response, zone, flags);
if (iterations == 0) {
Expand Down Expand Up @@ -1456,7 +1443,7 @@ private void addSOA(Message response, Zone zone, int flags) {
private void addNXT(Message response, int flags)
throws DNSSEC.DNSSECException, IOException {
Record nxtRecord = getNXTRecord(
response.getSectionArray(Section.QUESTION)[0]);
response.getSection(Section.QUESTION).get(0));
Zone zone = findBestZone(nxtRecord.getName());
addRecordCommand.exec(zone, nxtRecord);
RRset nxtRR = zone.findExactMatch(nxtRecord.getName(), Type.NXT);
Expand Down Expand Up @@ -1515,19 +1502,15 @@ private void addRRset(Name name, Message response, RRset rrset, int section,
}
}
if ((flags & FLAG_SIGONLY) == 0) {
Iterator it = rrset.rrs();
while (it.hasNext()) {
Record r = (Record) it.next();
for (Record r : rrset.rrs()) {
if (r.getName().isWild() && !name.isWild()) {
r = r.withName(name);
}
response.addRecord(r, section);
}
}
if ((flags & (FLAG_SIGONLY | FLAG_DNSSECOK)) != 0) {
Iterator it = rrset.sigs();
while (it.hasNext()) {
Record r = (Record) it.next();
for (Record r : rrset.sigs()) {
if (r.getName().isWild() && !name.isWild()) {
r = r.withName(name);
}
Expand All @@ -1554,21 +1537,21 @@ byte[] doAXFR(Name name, Message query, TSIG tsig, TSIGRecord qtsig,
if (zone == null) {
return errorMessage(query, Rcode.REFUSED);
}
Iterator it = zone.AXFR();
Iterator<RRset> it = zone.AXFR();
try {
DataOutputStream dataOut;
dataOut = new DataOutputStream(s.getOutputStream());
int id = query.getHeader().getID();
while (it.hasNext()) {
RRset rrset = (RRset) it.next();
RRset rrset = it.next();
Message response = new Message(id);
Header header = response.getHeader();
header.setFlag(Flags.QR);
header.setFlag(Flags.AA);
addRRset(rrset.getName(), response, rrset,
Section.ANSWER, FLAG_DNSSECOK);
if (tsig != null) {
tsig.applyStream(response, qtsig, first);
tsig.apply(response, qtsig, first);
qtsig = response.getTSIG();
}
first = false;
Expand Down Expand Up @@ -1688,10 +1671,8 @@ public void exec(Zone zone, Record record) throws IOException {
zone.addRecord(record);
LOG.info("Registered {}", record);
if (isDNSSECEnabled()) {
Calendar cal = Calendar.getInstance();
Date inception = cal.getTime();
cal.add(Calendar.YEAR, 1);
Date expiration = cal.getTime();
Instant inception = Instant.now();
Instant expiration = inception.plus(365, ChronoUnit.DAYS);
RRset rRset =
zone.findExactMatch(record.getName(), record.getType());
try {
Expand Down Expand Up @@ -1727,8 +1708,8 @@ public void exec(Zone zone, Record record) throws IOException {
*/
private void addDSRecord(Zone zone,
Name name, int dClass, long dsTtl,
Date inception,
Date expiration) throws DNSSEC.DNSSECException {
Instant inception,
Instant expiration) throws DNSSEC.DNSSECException {
RRset rRset;
RRSIGRecord rrsigRecord;

Expand Down
3 changes: 1 addition & 2 deletions ...t/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/SecureableZone.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ public Record getNXTRecord(Record queryRecord, Zone zone) {
SetResponse sr = zone.findRecords(base.getName(), Type.ANY);
BitSet bitMap = new BitSet();
bitMap.set(Type.NXT);
RRset[] rRsets = sr.answers();
for (RRset rRset : rRsets) {
for (RRset rRset : sr.answers()) {
int typeCode = rRset.getType();
if (typeCode > 0 && typeCode < 128) {
bitMap.set(typeCode);
Expand Down
Loading

0 comments on commit 870a216

Please # to comment.