Commment signed webapks working and verified.

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

Index: chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
diff --git a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
index dc7ca80e19313807e32ee1426b257caa7b8f8a07..d5eac28f03613d490962ea78f71e9bf40c6d4682 100644
--- a/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
+++ b/chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java
@@ -5,16 +5,21 @@
 package org.chromium.webapk.lib.client;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import static org.chromium.webapk.lib.common.WebApkMetaDataKeys.START_URL;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.pm.Signature;
+import android.os.Bundle;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -23,13 +28,14 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.res.builder.RobolectricPackageManager;
 
+import org.chromium.testing.local.LocalRobolectricTestRunner;
+import org.chromium.testing.local.TestDir;
+
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Unit tests for {@link org.chromium.webapk.lib.client.WebApkValidator}.
- */
+/** Unit tests for {@link org.chromium.webapk.lib.client.WebApkValidator}. */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class WebApkValidatorTest {
@@ -37,29 +43,38 @@ public class WebApkValidatorTest {
     private static final String INVALID_WEBAPK_PACKAGE_NAME = "invalid.org.chromium.webapk.foo";
     private static final String URL_OF_WEBAPK = "https://www.foo.com";
     private static final String URL_WITHOUT_WEBAPK = "https://www.other.com";
+    private static final String TEST_DATA_DIR = "webapks/";
+
+    private static final byte[] EXPECTED_SIGNATURE = new byte[] {48, -126, 3, -121, 48, -126, 2,
+            111, -96, 3, 2, 1, 2, 2, 4, 20, -104, -66, -126, 48, 13, 6, 9, 42, -122, 72, -122, -9,
+            13, 1, 1, 11, 5, 0, 48, 116, 49, 11, 48, 9, 6, 3, 85, 4, 6, 19, 2, 67, 65, 49, 16, 48,
+            14, 6, 3, 85, 4, 8, 19, 7, 79, 110, 116, 97, 114, 105, 111, 49, 17, 48, 15, 6, 3, 85, 4,
+            7, 19, 8, 87, 97, 116, 101, 114, 108, 111, 111, 49, 17, 48, 15, 6, 3, 85, 4, 10, 19, 8,
+            67, 104, 114, 111, 109, 105, 117, 109, 49, 17, 48};
 
-    private static final byte[] EXPECTED_SIGNATURE = new byte[] {
-        48, -126, 3, -121, 48, -126, 2, 111, -96, 3, 2, 1, 2, 2, 4, 20, -104, -66, -126, 48, 13,
-        6, 9, 42, -122, 72, -122, -9, 13, 1, 1, 11, 5, 0, 48, 116, 49, 11, 48, 9, 6, 3, 85, 4,
-        6, 19, 2, 67, 65, 49, 16, 48, 14, 6, 3, 85, 4, 8, 19, 7, 79, 110, 116, 97, 114, 105,
-        111, 49, 17, 48, 15, 6, 3, 85, 4, 7, 19, 8, 87, 97, 116, 101, 114, 108, 111, 111, 49,
-        17, 48, 15, 6, 3, 85, 4, 10, 19, 8, 67, 104, 114, 111, 109, 105, 117, 109, 49, 17, 48};
+    private static final byte[] SIGNATURE_1 = new byte[] {13, 52, 51, 48, 51, 48, 51, 49, 53, 49,
+            54, 52, 52, 90, 48, 116, 49, 11, 48, 9, 6, 3, 85, 4, 6, 19, 2, 67, 65, 49, 16, 48, 14,
+            6, 3, 85, 4, 8, 19, 7, 79, 110, 116, 97, 114};
 
-    private static final byte[] SIGNATURE_1 = new byte[] {
-        13, 52, 51, 48, 51, 48, 51, 49, 53, 49, 54, 52, 52, 90, 48, 116, 49, 11, 48, 9, 6, 3,
-        85, 4, 6, 19, 2, 67, 65, 49, 16, 48, 14, 6, 3, 85, 4, 8, 19, 7, 79, 110, 116, 97, 114};
+    private static final byte[] SIGNATURE_2 = new byte[] {49, 17, 48, 15, 6, 3, 85, 4, 10, 19, 8,
+            67, 104, 114, 111, 109, 105, 117, 109, 49, 17, 48, 15, 6, 3, 85, 4, 11, 19, 8, 67, 104,
+            114, 111, 109, 105, 117, 109, 49, 26, 48, 24};
 
-    private static final byte[] SIGNATURE_2 = new byte[] {
-        49, 17, 48, 15, 6, 3, 85, 4, 10, 19, 8, 67, 104, 114, 111, 109, 105, 117, 109, 49, 17,
-        48, 15, 6, 3, 85, 4, 11, 19, 8, 67, 104, 114, 111, 109, 105, 117, 109, 49, 26, 48, 24};
+    // This is the public key used for the test files (chrome/test/data/webapks/public.der)
+    private static final byte[] PUBLIC_KEY = new byte[] {48, 89, 48, 19, 6, 7, 42, -122, 72, -50,
+            61, 2, 1, 6, 8, 42, -122, 72, -50, 61, 3, 1, 7, 3, 66, 0, 4, -67, 14, 37, -20, 103, 121,
+            124, -60, -21, 83, -114, -120, -87, -38, 26, 78, 82, 55, 44, -23, -2, 104, 115, 82, -55,
+            -104, 105, -19, -48, 89, -65, 12, -31, 16, -35, 4, -121, -70, -89, 23, 56, 115, 112, 78,
+            -65, 114, -103, 120, -88, -112, -102, -61, 72, -16, 74, 53, 50, 49, -56, -48, -90, 5,
+            -116, 78};
 
     private RobolectricPackageManager mPackageManager;
 
     @Before
     public void setUp() {
-        mPackageManager = (RobolectricPackageManager) RuntimeEnvironment
-                .application.getPackageManager();
-        WebApkValidator.initWithBrowserHostSignature(EXPECTED_SIGNATURE);
+        mPackageManager =
+                (RobolectricPackageManager) RuntimeEnvironment.application.getPackageManager();
+        WebApkValidator.init(true, EXPECTED_SIGNATURE, PUBLIC_KEY);
     }
 
     /**
@@ -76,8 +91,9 @@ public class WebApkValidatorTest {
             mPackageManager.addPackage(newPackageInfoWithBrowserSignature(
                     WEBAPK_PACKAGE_NAME, new Signature(EXPECTED_SIGNATURE)));
 
-            assertEquals(WEBAPK_PACKAGE_NAME, WebApkValidator.queryWebApkPackage(
-                    RuntimeEnvironment.application, URL_OF_WEBAPK));
+            assertEquals(WEBAPK_PACKAGE_NAME,
+                    WebApkValidator.queryWebApkPackage(
+                            RuntimeEnvironment.application, URL_OF_WEBAPK));
         } catch (URISyntaxException e) {
             Assert.fail("URI is invalid.");
         }
@@ -103,8 +119,8 @@ public class WebApkValidatorTest {
     }
 
     /**
-     * Tests {@link WebApkValidator.queryWebApkPackage()} returns null if no WebAPK handles
-     * the given URL.
+     * Tests {@link WebApkValidator.queryWebApkPackage()} returns null if no WebAPK handles the
+     * given URL.
      */
     @Test
     public void testQueryWebApkPackageReturnsNullWhenNoWebApkHandlesTheURL() {
@@ -139,8 +155,8 @@ public class WebApkValidatorTest {
     }
 
     /**
-     * Tests {@link WebApkValidator.findWebApkPackage} returns null if none of the packages for the
-     * ResolveInfos start with {@link WebApkConstants.WEBAPK_PACKAGE_PREFIX}.
+     * Tests {@link WebApkValidator.findWebApkPackage} returns null if null if the package
+     * name is invalid.
      */
     @Test
     public void testFindWebApkPackageReturnsNullForInvalidPackageName() {
@@ -163,7 +179,7 @@ public class WebApkValidatorTest {
         infos.add(newResolveInfo(WEBAPK_PACKAGE_NAME));
         Signature[] signatures = new Signature[] {new Signature(SIGNATURE_1),
                 new Signature(EXPECTED_SIGNATURE), new Signature(SIGNATURE_2)};
-        mPackageManager.addPackage(newPackageInfo(WEBAPK_PACKAGE_NAME, signatures));
+        mPackageManager.addPackage(newPackageInfo(WEBAPK_PACKAGE_NAME, signatures, null));
 
         assertNull(WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
     }
@@ -179,11 +195,58 @@ public class WebApkValidatorTest {
         infos.add(newResolveInfo(WEBAPK_PACKAGE_NAME));
         Signature signatures[] =
                 new Signature[] {new Signature(SIGNATURE_1), new Signature(SIGNATURE_2)};
-        mPackageManager.addPackage(newPackageInfo(WEBAPK_PACKAGE_NAME, signatures));
+        mPackageManager.addPackage(newPackageInfo(WEBAPK_PACKAGE_NAME, signatures, null));
 
         assertNull(WebApkValidator.findWebApkPackage(RuntimeEnvironment.application, infos));
     }
 
+    /**
+     * Tests {@link WebApkValidator#isValidWebApk()} for valid comment signed webapks.
+     */
+    @Test
+    public void testIsValidWebApkCommentSigned() {
+        String[] filenames = {"example.apk", "java-example.apk"};
+        String packageName = "com.webapk.a9c419502bb98fcb7";
+        Signature[] signature = new Signature[] {new Signature(SIGNATURE_1)};
+
+        for (String filename : filenames) {
+            mPackageManager.removePackage(packageName);
+            mPackageManager.addPackage(
+                    newPackageInfo(packageName, signature, testFilePath(filename)));
+            assertTrue(filename + " did not verify",
+                    WebApkValidator.isValidWebApk(RuntimeEnvironment.application, packageName));
+        }
+    }
+
+    /**
+     * Tests {@link WebApkValidator#isValidWebApk()} for failing comment signed webapks.
+     * These  WebAPKs were modified to fail in specific ways.
+     */
+    @Test
+    public void testIsValidWebApkCommentSignedFailures() {
+        String[] filenames = {
+                "bad-sig.apk", "bad-utf8-fname.apk", "empty.apk", "extra-len-too-large.apk",
+                "fcomment-too-large.apk", "no-cd.apk", "no-comment.apk", "no-eocd.apk",
+                "no-lfh.apk", "not-an.apk", "too-many-metainf.apk", "truncated.apk", "zeros.apk",
+                "zeros-at-end.apk",
+        };
+        String packageName = "com.webapk.a9c419502bb98fcb7";
+        Signature[] signature = new Signature[] {new Signature(SIGNATURE_1)};
+
+        for (String filename : filenames) {
+            mPackageManager.removePackage(packageName);
+            mPackageManager.addPackage(
+                    newPackageInfo(packageName, signature, testFilePath(filename)));
+            assertFalse(filename,
+                    WebApkValidator.isValidWebApk(RuntimeEnvironment.application, packageName));
+        }
+    }
+
+    // Get the full test file path.
+    private static String testFilePath(String fileName) {
+        return TestDir.getTestFilePath(TEST_DATA_DIR + fileName);
+    }
+
     private static ResolveInfo newResolveInfo(String packageName) {
         ActivityInfo activityInfo = new ActivityInfo();
         activityInfo.packageName = packageName;
@@ -192,10 +255,15 @@ public class WebApkValidatorTest {
         return resolveInfo;
     }
 
-    private static PackageInfo newPackageInfo(String packageName, Signature[] signatures) {
+    private static PackageInfo newPackageInfo(
+            String packageName, Signature[] signatures, String sourceDir) {
         PackageInfo packageInfo = new PackageInfo();
         packageInfo.packageName = packageName;
         packageInfo.signatures = signatures;
+        packageInfo.applicationInfo = new ApplicationInfo();
+        packageInfo.applicationInfo.metaData = new Bundle();
+        packageInfo.applicationInfo.metaData.putString(START_URL, "https://non-empty.com/starturl");
+        packageInfo.applicationInfo.sourceDir = sourceDir;
         return packageInfo;
     }
 
@@ -203,6 +271,6 @@ public class WebApkValidatorTest {
     // additional ones after the second) are ignored.
     private static PackageInfo newPackageInfoWithBrowserSignature(
             String packageName, Signature signature) {
-        return newPackageInfo(packageName, new Signature[] {new Signature(""), signature});
+        return newPackageInfo(packageName, new Signature[] {new Signature(""), signature}, null);
     }
 }