big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-19237. Upgrade to dnsjava 3.6.1 due to CVEs (#6961)

Browse Source 
Contributed by P J Fanning
This commit is contained in:
PJ Fanning 2024-08-01 20:07:36 +01:00 committed by GitHub
parent 059e996c02
commit c593c17255
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE-binary
View File

@ -379,7 +379,7 @@ hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/fuse-dfs/util/tree
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/compat/{fstatat|openat|unlinkat}.h hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/compat/{fstatat|openat|unlinkat}.h
com.github.luben:zstd-jni:1.5.2-1 com.github.luben:zstd-jni:1.5.2-1
dnsjava:dnsjava:2.1.7 dnsjava:dnsjava:3.6.1
org.codehaus.woodstox:stax2-api:4.2.1 org.codehaus.woodstox:stax2-api:4.2.1

2
hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
View File

@ -51,6 +51,8 @@ allowed_expr+="|^[^-]*-default.xml$"
allowed_expr+="|^[^-]*-version-info.properties$" allowed_expr+="|^[^-]*-version-info.properties$"
# * Hadoop's application classloader properties file. # * Hadoop's application classloader properties file.
allowed_expr+="|^org.apache.hadoop.application-classloader.properties$" allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
# Comes from dnsjava, not sure if relocatable.
allowed_expr+="|^messages.properties$"
# public suffix list used by httpcomponents # public suffix list used by httpcomponents
allowed_expr+="|^mozilla/$" allowed_expr+="|^mozilla/$"
allowed_expr+="|^mozilla/public-suffix-list.txt$" allowed_expr+="|^mozilla/public-suffix-list.txt$"

3
hadoop-client-modules/hadoop-client-runtime/pom.xml
View File

@ -229,6 +229,8 @@
<exclude>jnamed*</exclude> <exclude>jnamed*</exclude>
<exclude>lookup*</exclude> <exclude>lookup*</exclude>
<exclude>update*</exclude> <exclude>update*</exclude>
<exclude>META-INF/versions/21/*</exclude>
<exclude>META-INF/versions/21/**/*</exclude>
</excludes> </excludes>
</filter> </filter>
<filter> <filter>
@ -243,6 +245,7 @@
<excludes> <excludes>
<exclude>META-INF/versions/9/module-info.class</exclude> <exclude>META-INF/versions/9/module-info.class</exclude>
<exclude>META-INF/versions/11/module-info.class</exclude> <exclude>META-INF/versions/11/module-info.class</exclude>
<exclude>META-INF/versions/21/module-info.class</exclude>
</excludes> </excludes>
</filter> </filter>

2
hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/dns/RegistryDNS.java
View File

@ -1682,7 +1682,7 @@ public void exec(Zone zone, Record record) throws IOException {
DNSSEC.sign(rRset, dnskeyRecord, privateKey, DNSSEC.sign(rRset, dnskeyRecord, privateKey,
inception, expiration); inception, expiration);
LOG.info("Adding {}", rrsigRecord); LOG.info("Adding {}", rrsigRecord);
rRset.addRR(rrsigRecord); zone.addRecord(rrsigRecord);
//addDSRecord(zone, record.getName(), record.getDClass(), //addDSRecord(zone, record.getName(), record.getDClass(),
// record.getTTL(), inception, expiration); // record.getTTL(), inception, expiration);

8
hadoop-common-project/hadoop-registry/src/test/java/org/apache/hadoop/registry/server/dns/TestRegistryDNS.java
View File

@ -350,7 +350,7 @@ public void testMissingReverseLookup() throws Exception {
Name name = Name.fromString("19.1.17.172.in-addr.arpa."); Name name = Name.fromString("19.1.17.172.in-addr.arpa.");
Record question = Record.newRecord(name, Type.PTR, DClass.IN); Record question = Record.newRecord(name, Type.PTR, DClass.IN);
Message query = Message.newQuery(question); Message query = Message.newQuery(question);
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null); OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO);
query.addRecord(optRecord, Section.ADDITIONAL); query.addRecord(optRecord, Section.ADDITIONAL);
byte[] responseBytes = getRegistryDNS().generateReply(query, null); byte[] responseBytes = getRegistryDNS().generateReply(query, null);
Message response = new Message(responseBytes); Message response = new Message(responseBytes);
@ -392,7 +392,7 @@ private List<Record> assertDNSQuery(String lookup, int type, int numRecs)
Name name = Name.fromString(lookup); Name name = Name.fromString(lookup);
Record question = Record.newRecord(name, type, DClass.IN); Record question = Record.newRecord(name, type, DClass.IN);
Message query = Message.newQuery(question); Message query = Message.newQuery(question);
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null); OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO);
query.addRecord(optRecord, Section.ADDITIONAL); query.addRecord(optRecord, Section.ADDITIONAL);
byte[] responseBytes = getRegistryDNS().generateReply(query, null); byte[] responseBytes = getRegistryDNS().generateReply(query, null);
Message response = new Message(responseBytes); Message response = new Message(responseBytes);
@ -421,7 +421,7 @@ private List<Record> assertDNSQueryNotNull(
Name name = Name.fromString(lookup); Name name = Name.fromString(lookup);
Record question = Record.newRecord(name, type, DClass.IN); Record question = Record.newRecord(name, type, DClass.IN);
Message query = Message.newQuery(question); Message query = Message.newQuery(question);
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null); OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO);
query.addRecord(optRecord, Section.ADDITIONAL); query.addRecord(optRecord, Section.ADDITIONAL);
byte[] responseBytes = getRegistryDNS().generateReply(query, null); byte[] responseBytes = getRegistryDNS().generateReply(query, null);
Message response = new Message(responseBytes); Message response = new Message(responseBytes);
@ -592,7 +592,7 @@ public void testReadMasterFile() throws Exception {
Name name = Name.fromString("5.0.17.172.in-addr.arpa."); Name name = Name.fromString("5.0.17.172.in-addr.arpa.");
Record question = Record.newRecord(name, Type.PTR, DClass.IN); Record question = Record.newRecord(name, Type.PTR, DClass.IN);
Message query = Message.newQuery(question); Message query = Message.newQuery(question);
OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO, null); OPTRecord optRecord = new OPTRecord(4096, 0, 0, Flags.DO);
query.addRecord(optRecord, Section.ADDITIONAL); query.addRecord(optRecord, Section.ADDITIONAL);
byte[] responseBytes = getRegistryDNS().generateReply(query, null); byte[] responseBytes = getRegistryDNS().generateReply(query, null);
Message response = new Message(responseBytes); Message response = new Message(responseBytes);

2
hadoop-project/pom.xml
View File

@ -106,7 +106,7 @@
<zookeeper.version>3.8.4</zookeeper.version> <zookeeper.version>3.8.4</zookeeper.version>
<curator.version>5.2.0</curator.version> <curator.version>5.2.0</curator.version>
<findbugs.version>3.0.5</findbugs.version> <findbugs.version>3.0.5</findbugs.version>
<dnsjava.version>3.4.0</dnsjava.version> <dnsjava.version>3.6.1</dnsjava.version>
<guava.version>27.0-jre</guava.version> <guava.version>27.0-jre</guava.version>
<guice.version>5.1.0</guice.version> <guice.version>5.1.0</guice.version>