Skip to content

Commit 2073a0c

Browse files
ibauersachsibauersachs
committed
CVE-2024-25638: Message normalization
1 parent 774c17f commit 2073a0c

28 files changed

Lines changed: 1817 additions & 348 deletions

‎README.adoc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,13 @@ Do NOT use it.
108108
|1000
109109
|700
110110

111+
.2+|dnsjava.harden_unknown_additional
112+
3+|Harden against unknown records in the authority section and additional section.
113+
If disabled, such records are copied from the upstream and presented to the client together with the answer.
114+
|Boolean
115+
|True
116+
|False
117+
111118
4+h|dnssec options
112119
.2+|dnsjava.dnssec.keycache.max_ttl
113120
3+|Maximum time-to-live (TTL) of entries in the key cache in seconds.

‎pom.xml‎

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<plugin>
7676
<groupId>org.apache.maven.plugins</groupId>
7777
<artifactId>maven-gpg-plugin</artifactId>
78-
<version>3.2.2</version>
78+
<version>3.2.4</version>
7979
<executions>
8080
<execution>
8181
<id>sign-artifacts</id>
@@ -265,7 +265,7 @@
265265
<plugin>
266266
<groupId>com.github.siom79.japicmp</groupId>
267267
<artifactId>japicmp-maven-plugin</artifactId>
268-
<version> 0.20.0</version>
268+
<version>0.20.0</version>
269269
<configuration>
270270
<newVersion>
271271
<file>
@@ -528,6 +528,18 @@
528528
<version>${org.junit.version}</version>
529529
<scope>test</scope>
530530
</dependency>
531+
<dependency>
532+
<groupId>org.assertj</groupId>
533+
<artifactId>assertj-core</artifactId>
534+
<version>3.25.3</version>
535+
<scope>test</scope>
536+
</dependency>
537+
<dependency>
538+
<groupId>org.junit-pioneer</groupId>
539+
<artifactId>junit-pioneer</artifactId>
540+
<version>2.2.0</version>
541+
<scope>test</scope>
542+
</dependency>
531543
<dependency>
532544
<groupId>org.mockito</groupId>
533545
<artifactId>mockito-core</artifactId>
@@ -540,6 +552,12 @@
540552
<version>${mockito.version}</version>
541553
<scope>test</scope>
542554
</dependency>
555+
<dependency>
556+
<groupId>net.bytebuddy</groupId>
557+
<artifactId>byte-buddy-agent</artifactId>
558+
<version>1.14.14</version>
559+
<scope>test</scope>
560+
</dependency>
543561
<dependency>
544562
<groupId>org.slf4j</groupId>
545563
<artifactId>slf4j-simple</artifactId>
@@ -676,7 +694,9 @@
676694
<artifactId>maven-surefire-plugin</artifactId>
677695
<configuration>
678696
<argLine>
679-
${argLine} --add-opens java.base/sun.net.dns=ALL-UNNAMED
697+
@{argLine}
698+
--add-opens java.base/sun.net.dns=ALL-UNNAMED
699+
--add-opens java.base/sun.net.dns=org.dnsjava
680700
</argLine>
681701
<additionalClasspathElements>
682702
<additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
@@ -784,12 +804,29 @@
784804
</executions>
785805
</plugin>
786806

807+
<plugin>
808+
<groupId>org.apache.maven.plugins</groupId>
809+
<artifactId>maven-dependency-plugin</artifactId>
810+
<version>3.6.1</version>
811+
<executions>
812+
<execution>
813+
<phase>initialize</phase>
814+
<goals>
815+
<goal>properties</goal>
816+
</goals>
817+
</execution>
818+
</executions>
819+
</plugin>
820+
787821
<plugin>
788822
<groupId>org.apache.maven.plugins</groupId>
789823
<artifactId>maven-surefire-plugin</artifactId>
790824
<configuration>
791825
<argLine>
792-
${argLine} --add-opens java.base/sun.net.dns=ALL-UNNAMED
826+
@{argLine}
827+
--add-opens java.base/sun.net.dns=ALL-UNNAMED
828+
--add-opens java.base/sun.net.dns=org.dnsjava
829+
-javaagent:${net.bytebuddy:byte-buddy-agent:jar}
793830
</argLine>
794831
<additionalClasspathElements>
795832
<additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>

0 commit comments

Comments
 (0)