[WIP] Malicious website protection - Windows support

integration-tests/Mocks.js

@@ -404,7 +404,24 @@ export class Mocks {
             expect(calls).toMatchObject([['privacyDashboardOpenUrlInNewTab', { url }]]);
             return;
         }
-        throw new Error('unreachable. mockCalledForAboutLink must be handled');
+        if (this.platform.name === 'windows') {
+            const calls = await this.outgoing({
+                names: ['OpenInNewTab'],
+            });
+            expect(calls).toMatchObject([
+                [
+                    'OpenInNewTab',
+                    {
+                        Feature: 'PrivacyDashboard',
+                        Name: 'OpenInNewTab',
+                        Data: {},
+                    },
+                ],
+            ]);
+            return;
+        }
+
+        throw new Error('unreachable. mockCalledForOpenURLInNewTab must be handled');
     }
 
     async calledForInitialExtensionMessage() {
@@ -572,7 +589,7 @@ export class Mocks {
             ]);
             return;
         }
-        throw new Error('unreachable. mockCalledForAboutLink must be handled');
+        throw new Error('unreachable. mockCalledForToggleAllowList must be handled');
     }
 
     async calledForSearch(term) {

integration-tests/windows.spec-int.js

@@ -321,6 +321,48 @@ test.describe('cookie prompt management', () => {
     });
 });
 
+test.describe('phishing & malware protection', () => {
+    test('phishing warning', { tag: '@screenshots' }, async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.windows(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.windows(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.windows(page);
+        await dash.addState([testDataStates.malware]);
+        await dash.clickReportAsSafeLink();
+        await dash.mocks.calledForReportAsSafeLink('https://privacy-test-pages.site/security/badware/malware.html');
+    });
+
+    test('shows help page link', async ({ page }) => {
+        /** @type {DashboardPage} */
+        const dash = await DashboardPage.windows(page);
+        await dash.addState([testDataStates.malware]);
+        await dash.clickHelpPageLink();
+        await dash.mocks.calledForHelpPagesLink();
+    });
+});
+
 test.describe('windows screenshots', { tag: '@screenshots' }, () => {
     const states = [
         { name: 'ad-attribution', state: testDataStates['ad-attribution'] },

schema/windows-view-model.json

@@ -30,7 +30,10 @@
             "type": "boolean"
         },
         "localeSettings": {
-            "$ref": "locale.json"
+            "$ref": "./locale.json"
+        },
+        "maliciousSiteStatus": {
+            "$ref": "./malicious-site.json"
         }
     }
 }

shared/js/browser/macos-communication.js

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

shared/js/browser/utils/communication-mocks.mjs

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

shared/js/browser/windows-communication.js

@@ -69,13 +69,17 @@ let protections;
 let isPendingUpdates;
 let parentEntity;
 
+/** @type {import('../../../schema/__generated__/schema.types').MaliciousSiteStatus | undefined} */
+let maliciousSiteStatus;
+
 /** @type {string | undefined} */
 let locale;
 
 const combineSources = () => ({
     tab: Object.assign(
         {},
         trackerBlockingData || {},
+        { maliciousSiteStatus: maliciousSiteStatus ?? null },
         {
             isPendingUpdates,
             parentEntity,
@@ -90,7 +94,8 @@ const resolveInitialRender = function () {
     const isUpgradedHttpsSet = typeof upgradedHttps === 'boolean';
     const isIsProtectedSet = typeof protections !== 'undefined';
     const isTrackerBlockingDataSet = typeof trackerBlockingData === 'object';
-    if (!isUpgradedHttpsSet || !isIsProtectedSet || !isTrackerBlockingDataSet) {
+    const isMaliciousSiteSet = maliciousSiteStatus && maliciousSiteStatus.kind !== undefined;
+    if (!isUpgradedHttpsSet || !isIsProtectedSet || !isTrackerBlockingDataSet || !isMaliciousSiteSet) {
         return;
     }
 
@@ -119,6 +124,7 @@ function handleViewModelUpdate(viewModel) {
     certificateData = viewModel.certificates || [];
     protections = viewModel.protections;
     locale = viewModel.localeSettings?.locale;
+    maliciousSiteStatus = viewModel.maliciousSiteStatus;
 
     trackerBlockingData = createTabData(viewModel.tabUrl, upgradedHttps, viewModel.protections, viewModel.rawRequestData);
     trackerBlockingData.cookiePromptManagementStatus = viewModel.cookiePromptManagementStatus;

shared/js/ui/platform-features.mjs

@@ -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 === 'windows',
         includeToggleOnBreakageForm,
         randomisedCategories,
     });

shared/js/ui/views/tests/generate-data.mjs

@@ -334,6 +334,7 @@ export class MockData {
                 cookiePromptManagementStatus: this.cookiePromptManagementStatus,
                 isInvalidCert: this.isInvalidCert,
                 localeSettings: this.localeSettings,
+                maliciousSiteStatus: this.maliciousSiteStatus || { kind: null },
             },
         };
     }