Merge branch 'master' into issue-3169

.github/workflows/build.yml

@@ -68,7 +68,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest, macOS-latest, windows-latest ]
-        java: [ 8, 11, 17, 18, 19 ]
+        java: [ 8, 11, 17, 18, 19, 20 ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3

brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java

@@ -42,6 +42,12 @@ public static void main(String[] args) throws BrutException {
         // headless
         System.setProperty("java.awt.headless", "true");
 
+        // Ignore stricter validation on zip files from java 11 onwards as this is a protection technique
+        // that applications use to thwart disassembly tools. We have protections in place for directory traversal
+        // and handling of bogus data in the zip header, so we can ignore this.
+        System.setProperty("jdk.nio.zipfs.allowDotZipEntry", "true");
+        System.setProperty("jdk.util.zip.disableZip64ExtraFieldValidation", "true");
+
         // set verbosity default
         Verbosity verbosity = Verbosity.NORMAL;
 

build.gradle

@@ -142,6 +142,10 @@ subprojects {
     apply plugin: 'java'
 
     test {
+        // https://github.com/iBotPeaches/Apktool/issues/3174
+        systemProperty 'jdk.nio.zipfs.allowDotZipEntry', 'true'
+        systemProperty 'jdk.util.zip.disableZip64ExtraFieldValidation', 'true'
+
         testLogging {
             exceptionFormat = 'full'
         }