Check for gaps between file blocks in zip.

chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkVerifySignatureTest.java

Index: chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkVerifySignatureTest.java
diff --git a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkVerifySignatureTest.java b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkVerifySignatureTest.java
index 4a032a6aa8ffbb5269ecd32a04970110b62ab299..3d19f55c18f1de87629803a9d696b99754f86e20 100644
--- a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkVerifySignatureTest.java
+++ b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkVerifySignatureTest.java
@@ -7,11 +7,31 @@ package org.chromium.webapk.lib.client;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
+import static org.chromium.webapk.lib.client.WebApkVerifySignature.ERROR_BAD_APK;
+import static org.chromium.webapk.lib.client.WebApkVerifySignature.ERROR_BAD_BLANK_SPACE;
+import static org.chromium.webapk.lib.client.WebApkVerifySignature.ERROR_BAD_V2_SIGNING_BLOCK;
+import static org.chromium.webapk.lib.client.WebApkVerifySignature.ERROR_EXTRA_FIELD_TOO_LARGE;
+import static org.chromium.webapk.lib.client.WebApkVerifySignature.ERROR_INCORRECT_SIGNATURE;
+import static org.chromium.webapk.lib.client.WebApkVerifySignature.ERROR_OK;
+import static org.chromium.webapk.lib.client.WebApkVerifySignature.ERROR_SIGNATURE_NOT_FOUND;
+import static org.chromium.webapk.lib.client.WebApkVerifySignature.ERROR_TOO_MANY_META_INF_FILES;
+
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 import org.chromium.testing.local.LocalRobolectricTestRunner;
+import org.chromium.testing.local.TestDir;
+
+import java.io.RandomAccessFile;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.KeyFactory;
+import java.security.PublicKey;
+import java.security.spec.X509EncodedKeySpec;
 
 /** Unit tests for WebApkVerifySignature for Android. */
 @RunWith(LocalRobolectricTestRunner.class)
@@ -22,6 +42,14 @@ public class WebApkVerifySignatureTest {
 
     private static final String TEST_DATA_DIR = "/webapks/";
 
+    static PublicKey readPublicKey(String publicDER) throws Exception {
+        return createPublicKey(Files.readAllBytes(Paths.get(publicDER)));
+    }
+
+    private static PublicKey createPublicKey(byte[] bytes) throws Exception {
+        return KeyFactory.getInstance(KEY_FACTORY).generatePublic(new X509EncodedKeySpec(bytes));
+    }
+
     @Test
     public void testHexToBytes() throws Exception {
         byte[] empty = {};
@@ -50,4 +78,72 @@ public class WebApkVerifySignatureTest {
                 WebApkVerifySignature.parseCommentSignature(
                         "prefixed: chrome-webapk:000:decafbad :suffixed"));
     }
+
+    class FileResult {
+        FileResult(String filename, int expect) {
+            this.filename = filename;
+            this.want = expect;
+        }
+
+        public final String filename;
+        public final int want;
+    }
+
+    @Test
+    public void testBadVerifyFiles() throws Exception {
+        PublicKey pub = readPublicKey(testFilePath("public.der"));
+        FileResult[] tests = {
+                new FileResult("example.apk", ERROR_OK),
+                new FileResult("java-example.apk", ERROR_OK),
+                new FileResult("v2-signed-ok.apk", ERROR_OK),
+                new FileResult("bad-sig.apk", ERROR_INCORRECT_SIGNATURE),
+                new FileResult("bad-utf8-fname.apk", ERROR_INCORRECT_SIGNATURE),
+                new FileResult("empty.apk", ERROR_BAD_APK),
+                new FileResult("extra-field-too-large.apk", ERROR_EXTRA_FIELD_TOO_LARGE),
+                new FileResult("extra-len-too-large.apk", ERROR_BAD_APK),
+                new FileResult("no-cd.apk", ERROR_BAD_APK),
+                new FileResult("no-comment.apk", ERROR_SIGNATURE_NOT_FOUND),
+                new FileResult("no-eocd.apk", ERROR_BAD_APK),
+                new FileResult("no-lfh.apk", ERROR_BAD_APK),
+                new FileResult("not-an.apk", ERROR_BAD_APK),
+                new FileResult("too-many-metainf.apk", ERROR_TOO_MANY_META_INF_FILES),
+                new FileResult("truncated.apk", ERROR_BAD_APK),
+                new FileResult("zeros.apk", ERROR_BAD_APK),
+                new FileResult("zeros-at-end.apk", ERROR_BAD_APK),
+                new FileResult("block-before-first.apk", ERROR_BAD_BLANK_SPACE),
+                new FileResult("block-at-end.apk", ERROR_BAD_BLANK_SPACE),
+                new FileResult("block-before-eocd.apk", ERROR_BAD_BLANK_SPACE),
+                new FileResult("block-before-cd.apk", ERROR_BAD_BLANK_SPACE),
+                new FileResult("block-middle.apk", ERROR_BAD_BLANK_SPACE),
+                new FileResult("v2-signed-too-large.apk", ERROR_BAD_V2_SIGNING_BLOCK),
+                // This badly fuzzed file should return ERROR_FILE_COMMENT_TOO_LARGE.
+                new FileResult("fcomment-too-large.apk", ERROR_BAD_APK),
+        };
+        for (FileResult test : tests) {
+            RandomAccessFile file = new RandomAccessFile(testFilePath(test.filename), "r");
+            FileChannel inChannel = file.getChannel();
+            MappedByteBuffer buf =
+                    inChannel.map(FileChannel.MapMode.READ_ONLY, 0, inChannel.size());
+            buf.load();
+            WebApkVerifySignature v = new WebApkVerifySignature(buf);
+            try {
+                int readError = v.read();
+                if (readError == WebApkVerifySignature.ERROR_OK) {
+                    assertEquals(test.filename, test.want, v.verifySignature(pub));
+                } else {
+                    assertEquals(test.filename, test.want, readError);
+                }
+            } catch (Exception e) {
+                Assert.fail("verify exception: " + e);
+            }
+            buf.clear();
+            inChannel.close();
+            file.close();
+        }
+    }
+
+    // Get the full test file path.
+    private static String testFilePath(String fileName) {
+        return TestDir.getTestFilePath(TEST_DATA_DIR + fileName);
+    }
 }