Release build 8.4.0 [ci release]

Author: mgurgel

CHANGELOG.txt

@@ -1,5 +1 @@
-- Workflow actions update (#325)
-- Malicious site protection - Copy review  (#319)
-- Updated to actions/upload-artifact@v4 (#324)
-- Revert "Updated to actions/upload-artifact@v4"
-- Updated to actions/upload-artifact@v4
+- Malicious website protection - Android support (#300)

build/app/public/js/base.js

@@ -14009,7 +14009,7 @@
     tab: Object.assign(
       {},
       trackerBlockingData || {},
-      { maliciousSiteStatus: maliciousSiteStatus ?? false },
+      { maliciousSiteStatus: maliciousSiteStatus === void 0 ? null : maliciousSiteStatus },
       {
         isPendingUpdates,
         parentEntity,
@@ -14322,6 +14322,7 @@
     onChangeConsentManaged: () => onChangeConsentManaged2,
     onChangeFeatureSettings: () => onChangeFeatureSettings,
     onChangeLocale: () => onChangeLocale2,
+    onChangeMaliciousSiteStatus: () => onChangeMaliciousSiteStatus2,
     onChangeProtectionStatus: () => onChangeProtectionStatus2,
     onChangeRequestData: () => onChangeRequestData2,
     setup: () => setup4
@@ -14340,12 +14341,14 @@
   var isPendingUpdates2;
   var parentEntity2;
   var cookiePromptManagementStatus2 = {};
+  var maliciousSiteStatus2;
   var locale2;
   var featureSettings;
   var combineSources2 = () => ({
     tab: Object.assign(
       {},
       trackerBlockingData2 || {},
+      { maliciousSiteStatus: maliciousSiteStatus2 === void 0 ? null : maliciousSiteStatus2 },
       {
         isPendingUpdates: isPendingUpdates2,
         parentEntity: parentEntity2,
@@ -14362,7 +14365,8 @@
     const isIsProtectedSet = typeof protections2 !== "undefined";
     const isTrackerBlockingDataSet = typeof trackerBlockingData2 === "object";
     const isLocaleSet = typeof locale2 === "string";
-    if (!isLocaleSet || !isUpgradedHttpsSet || !isIsProtectedSet || !isTrackerBlockingDataSet) {
+    const isMaliciousSiteSet = maliciousSiteStatus2 && maliciousSiteStatus2.kind !== void 0;
+    if (!isLocaleSet || !isUpgradedHttpsSet || !isIsProtectedSet || !isTrackerBlockingDataSet || !isMaliciousSiteSet) {
       return;
     }
     getBackgroundTabDataPromises2.forEach((resolve) => resolve(combineSources2()));
@@ -14402,6 +14406,16 @@
     locale2 = parsed.data.locale;
     channel3?.send("updateTabData", { via: "onChangeLocale" });
   }
+  function onChangeMaliciousSiteStatus2(payload) {
+    const parsed = maliciousSiteStatusSchema.safeParse(payload);
+    if (!parsed.success) {
+      console.error("could not parse incoming data from onChangeMaliciousSiteStatus");
+      console.error(parsed.error);
+      return;
+    }
+    maliciousSiteStatus2 = parsed.data;
+    resolveInitialRender2();
+  }
   function onChangeFeatureSettings(payload) {
     const parsed = remoteFeatureSettingsSchema.safeParse(payload);
     if (!parsed.success) {
@@ -14633,6 +14647,7 @@
     };
     window.onChangeProtectionStatus = onChangeProtectionStatus2;
     window.onChangeLocale = onChangeLocale2;
+    window.onChangeMaliciousSiteStatus = onChangeMaliciousSiteStatus2;
     window.onChangeRequestData = onChangeRequestData2;
     window.onChangeConsentManaged = onChangeConsentManaged2;
     window.onChangeFeatureSettings = onChangeFeatureSettings;
@@ -15031,7 +15046,7 @@
       initialScreen: screen,
       opener,
       supportsInvalidCertsImplicitly: platform2.name !== "browser" && platform2.name !== "windows",
-      supportsMaliciousSiteWarning: platform2.name === "macos" || platform2.name === "ios",
+      supportsMaliciousSiteWarning: platform2.name === "macos" || platform2.name === "ios" || platform2.name === "android",
       includeToggleOnBreakageForm,
       randomisedCategories
     });

integration-tests/android.spec-int.js

@@ -53,6 +53,56 @@ test.describe('Protections toggle', () => {
     toggleFlows((page) => DashboardPage.android(page));
 });
 
+test.describe('phishing & malware protection', () => {
+    test('phishing warning', { tag: '@screenshots' }, async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.android(page);
+        await dash.addState([testDataStates.phishing]);
+        await dash.screenshot('phishing-warning.png');
+        await dash.hasPhishingIcon();
+        await dash.hasPhishingHeadingText();
+        await dash.hasPhishingWarningText();
+        await dash.hasPhishingStatusText();
+        await dash.connectionLinkDoesntShow();
+    });
+
+    test('malware warning', { tag: '@screenshots' }, async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.android(page);
+        await dash.addState([testDataStates.malware]);
+        await dash.screenshot('malware-warning.png');
+        await dash.hasMalwareIcon();
+        await dash.hasMalwareHeadingText();
+        await dash.hasMalwareWarningText();
+        await dash.hasMalwareStatusText();
+        await dash.connectionLinkDoesntShow();
+    });
+
+    test('shows report as safe link', async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.android(page);
+        await dash.addState([testDataStates.malware]);
+        await dash.clickReportAsSafeLink();
+        await dash.mocks.calledForReportAsSafeLink('https://privacy-test-pages.site/security/badware/malware.html');
+    });
+
+    test('shows malware help page link', async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.android(page);
+        await dash.addState([testDataStates.malware]);
+        await dash.clickMalwareHelpPageLink();
+        await dash.mocks.calledForHelpPagesLink();
+    });
+
+    test('shows phishing help page link', async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.android(page);
+        await dash.addState([testDataStates.phishing]);
+        await dash.clickPhishingHelpPageLink();
+        await dash.mocks.calledForHelpPagesLink();
+    });
+});
+
 test.describe('breakage form', () => {
     test('sends message when breakage form is triggered from primary screen', async ({ page }) => {
         /** @type {DashboardPage} */

integration-tests/android.spec-int.js-snapshots/malware-warning-android-darwin.png

@@ -10,6 +10,7 @@
 import {
     cookiePromptManagementStatusSchema,
     localeSettingsSchema,
+    maliciousSiteStatusSchema,
     protectionsStatusSchema,
     remoteFeatureSettingsSchema,
     requestDataSchema,
@@ -48,6 +49,9 @@ let isPendingUpdates;
 let parentEntity;
 const cookiePromptManagementStatus = {};
 
+/** @type {import('../../../schema/__generated__/schema.types').MaliciousSiteStatus} */
+let maliciousSiteStatus;
+
 /** @type {string | undefined} */
 let locale;
 
@@ -58,6 +62,7 @@ const combineSources = () => ({
     tab: Object.assign(
         {},
         trackerBlockingData || {},
+        { maliciousSiteStatus: maliciousSiteStatus === undefined ? null : maliciousSiteStatus },
         {
             isPendingUpdates,
             parentEntity,
@@ -75,7 +80,8 @@ const resolveInitialRender = function () {
     const isIsProtectedSet = typeof protections !== 'undefined';
     const isTrackerBlockingDataSet = typeof trackerBlockingData === 'object';
     const isLocaleSet = typeof locale === 'string';
-    if (!isLocaleSet || !isUpgradedHttpsSet || !isIsProtectedSet || !isTrackerBlockingDataSet) {
+    const isMaliciousSiteSet = maliciousSiteStatus && maliciousSiteStatus.kind !== undefined;
+    if (!isLocaleSet || !isUpgradedHttpsSet || !isIsProtectedSet || !isTrackerBlockingDataSet || !isMaliciousSiteSet) {
         return;
     }
 
@@ -179,6 +185,28 @@ export function onChangeLocale(payload) {
     channel?.send('updateTabData', { via: 'onChangeLocale' });
 }
 
+/**
+ * {@inheritDoc common.onChangeMaliciousSiteStatus}
+ * @type {import("./common.js").onChangeMaliciousSiteStatus}
+ * @group macOS -> JavaScript Interface
+ * @example
+ *
+ * ```kotlin
+ * // kotlin
+ * webView.evaluateJavascript("javascript:onChangeMaliciousSiteStatus(${maliciousSiteStatusJsonString});", null)
+ * ```
+ */
+export function onChangeMaliciousSiteStatus(payload) {
+    const parsed = maliciousSiteStatusSchema.safeParse(payload);
+    if (!parsed.success) {
+        console.error('could not parse incoming data from onChangeMaliciousSiteStatus');
+        console.error(parsed.error);
+        return;
+    }
+    maliciousSiteStatus = parsed.data;
+    resolveInitialRender();
+}
+
 /**
  * {@inheritDoc common.onChangeFeatureSettings}
  * @type {import("./common.js").onChangeFeatureSettings}
@@ -493,6 +521,7 @@ export function setup(debug) {
     };
     window.onChangeProtectionStatus = onChangeProtectionStatus;
     window.onChangeLocale = onChangeLocale;
+    window.onChangeMaliciousSiteStatus = onChangeMaliciousSiteStatus;
     window.onChangeRequestData = onChangeRequestData;
     window.onChangeConsentManaged = onChangeConsentManaged;
     window.onChangeFeatureSettings = onChangeFeatureSettings;

integration-tests/android.spec-int.js-snapshots/phishing-warning-android-darwin.png

@@ -73,7 +73,7 @@ const combineSources = () => ({
     tab: Object.assign(
         {},
         trackerBlockingData || {},
-        { maliciousSiteStatus: maliciousSiteStatus ?? false },
+        { maliciousSiteStatus: maliciousSiteStatus === undefined ? null : maliciousSiteStatus },
         {
             isPendingUpdates,
             parentEntity,

shared/js/browser/android-communication.js

@@ -50,7 +50,7 @@ export async function mockDataProvider(params) {
     window.onChangeLocale?.(state.localeSettings);
     window.onChangeRequestData(state.url, { requests: state.requests || [] });
 
-    if (platform?.name === 'macos' || platform?.name === 'ios') {
+    if (platform?.name === 'macos' || platform?.name === 'ios' || platform?.name === 'android') {
         window.onChangeMaliciousSiteStatus?.(state.maliciousSiteStatus);
     }
 }

shared/js/browser/macos-communication.js

@@ -56,7 +56,7 @@ export function createPlatformFeatures(platform) {
         initialScreen: screen,
         opener,
         supportsInvalidCertsImplicitly: platform.name !== 'browser' && platform.name !== 'windows',
-        supportsMaliciousSiteWarning: platform.name === 'macos' || platform.name === 'ios',
+        supportsMaliciousSiteWarning: platform.name === 'macos' || platform.name === 'ios' || platform.name === 'android',
         includeToggleOnBreakageForm,
         randomisedCategories,
     });