finished

Author: sarinali

modules/browser_object_tracker_panel.py

@@ -1,3 +1,7 @@
+from typing import List
+
+from selenium.webdriver.remote.webelement import WebElement
+
 from modules.browser_object_navigation import Navigation
 from modules.page_base import BasePage
 
@@ -8,25 +12,51 @@ class TrackerPanel(BasePage):
     """
 
     URL_TEMPLATE = ""
-    NAV = None
 
-    def wait_for_blocked_tracking_icon(self, nav: Navigation, page: BasePage):
+    def wait_for_blocked_tracking_icon(
+        self, nav: Navigation, page: BasePage
+    ) -> BasePage:
         """
         Waits for the shield icon to indicate that cookies/trackers are being blocked by continuously refresing the page
-        """
-        self.driver.set_context(self.driver.CONTEXT_CHROME)
 
-        while 1:
-            nav.get_element("refresh-button").click()
+        Remember to open the passed in page beforehand, this waits for the page to load.
 
+        Example Usage:
+        first_tracker_website.open()
+        tracker_panel.wait_for_blocked_tracking_icon(nav, first_tracker_website)
+        """
+        self.driver.set_context(self.driver.CONTEXT_CHROME)
+        try:
+            while 1:
+                nav.get_element("refresh-button").click()
+
+                self.driver.set_context(self.driver.CONTEXT_CONTENT)
+                page.wait_for_page_to_load()
+
+                self.driver.set_context(self.driver.CONTEXT_CHROME)
+                shield_icon = nav.get_element("shield-icon")
+
+                if (
+                    shield_icon.get_attribute("data-l10n-id")
+                    == "tracking-protection-icon-active-container"
+                ):
+                    return
+        finally:
             self.driver.set_context(self.driver.CONTEXT_CONTENT)
-            page.wait_for_page_to_load()
+        return self
 
-            self.driver.set_context(self.driver.CONTEXT_CHROME)
+    def verify_tracker_shield_indicator(self, nav: Navigation) -> BasePage:
+        with self.driver.context(self.driver.CONTEXT_CHROME):
             shield_icon = nav.get_element("shield-icon")
-
-            if (
+            assert (
                 shield_icon.get_attribute("data-l10n-id")
                 == "tracking-protection-icon-active-container"
-            ):
-                return
+            ), "The label detected did not correspond to the expected one: tracking-protection-icon-no-trackers-detected-container"
+
+    def open_and_return_cross_site_trackers(self) -> List[WebElement]:
+        self.get_element("tracker-cross-site-tracking").click()
+        return self.get_elements("tracking-cross-site-tracking-item")
+
+    def open_and_return_allowed_trackers(self) -> List[WebElement]:
+        self.get_element("tracker-tracking-content").click()
+        return self.get_elements("tracking-allowed-content-item")

modules/data/generic_page.components.json

@@ -21,5 +21,23 @@
         "selectorData": "mw-mmv-image",
         "strategy": "class",
         "groups": []
+    },
+
+    "simulated-tracker-block-status": {
+        "selectorData": "blacklisted-blocked",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "simulated-tracker-load-status": {
+        "selectorData": "whitelisted-loaded",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "simulated-tracker-dnt-status": {
+        "selectorData": "dnt-on",
+        "strategy": "id",
+        "groups": []
     }
 }

modules/data/navigation.components.json

@@ -224,48 +224,6 @@
         "groups": []
     },
 
-    "tracker-title": {
-        "selectorData": "protections-popup-mainView-panel-header-span",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "tracker-cross-site-tracking": {
-        "selectorData": "protections-popup-category-cookies",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "tracker-tracking-content": {
-        "selectorData": "protections-popup-category-trackers",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "tracking-social-media": {
-        "selectorData": "protections-popup-category-socialblock",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "tracking-finger-prints": {
-        "selectorData": "protections-popup-category-fingerprinters",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "tracking-crypto-miners": {
-        "selectorData": "protections-popup-category-cryptominers",
-        "strategy": "id",
-        "groups": []
-    },
-
-    "tracking-cross-site-tracking-items": {
-        "selectorData": "protections-popup-cookiesView-list-section",
-        "strategy": "class",
-        "groups": []
-    },
-
     "refresh-button": {
         "selectorData": "reload-button",
         "strategy": "id",

modules/data/tracker_panel.components.json

@@ -1,3 +1,56 @@
 {
+    "context": "chrome",
+    "tracker-title": {
+        "selectorData": "protections-popup-mainView-panel-header-span",
+        "strategy": "id",
+        "groups": []
+    },
 
+    "tracker-cross-site-tracking": {
+        "selectorData": "protections-popup-category-cookies",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "tracker-tracking-content": {
+        "selectorData": "protections-popup-category-trackers",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "tracking-social-media": {
+        "selectorData": "protections-popup-category-socialblock",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "tracking-finger-prints": {
+        "selectorData": "protections-popup-category-fingerprinters",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "tracking-crypto-miners": {
+        "selectorData": "protections-popup-category-cryptominers",
+        "strategy": "id",
+        "groups": []
+    },
+
+    "tracking-cross-site-tracking-items": {
+        "selectorData": "vbox[class='protections-popup-cookiesView-list-section']",
+        "strategy": "css",
+        "groups": []
+    },
+
+    "tracking-cross-site-tracking-item": {
+        "selectorData": "protections-popup-list-host-label",
+        "strategy": "class",
+        "groups": []
+    },
+
+    "tracking-allowed-content-item": {
+        "selectorData": "protections-popup-list-host-label",
+        "strategy": "class",
+        "groups": []
+    }
 }

modules/page_base.py

@@ -536,6 +536,7 @@ def get_all_children(
         Gets all the children of a webelement
         """
         children = None
+        print(self.context_id)
         with self.driver.context(self.context_id):
             element = self.fetch(reference, labels)
             children = element.find_elements(By.XPATH, "./*")

modules/page_object_autofill_login.py

@@ -1,5 +1,3 @@
-from selenium.webdriver import Firefox
-
 from modules.page_object_autofill import Autofill
 
 

tests/security_and_privacy/test_open_link_in_private_window.py

@@ -1,10 +1,7 @@
-import logging
-
-import pytest
 from selenium.webdriver import Firefox
 
 from modules.browser_object import ContextMenu, Navigation
-from modules.page_object import ExamplePage, GenericPage
+from modules.page_object import ExamplePage
 
 
 def test_open_link_in_private_window(driver: Firefox):

tests/security_and_privacy/test_third_party_content_blocked_private_browsing.py

@@ -1,52 +1,127 @@
-import logging
-from time import sleep
-
-import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object import Navigation, PanelUi, TabBar, TrackerPanel
+from modules.browser_object import Navigation, PanelUi, TrackerPanel
 from modules.page_object import GenericPage
 
-# @pytest.fixture()
-# def add_prefs():
-#     return [("browser.contentblocking.category", "standard")]
+ALLOWED_TRACKING_URLS = set(
+    [
+        "https://content-track-digest256.dummytracker.org",
+        "https://ads-track-digest256.dummytracker.org",
+        "https://social-track-digest256.dummytracker.org",
+        "https://analytics-track-digest256.dummytracker.org",
+    ]
+)
+BLOCKED_TRACKER_URL = "https://content-track-digest256.dummytracker.org"
+
+FIRST_TRACKER_WEBSITE = "https://senglehardt.com/test/trackingprotection/test_pages/tracking_protection.html"
+SECOND_TRACKER_WEBSITE = "https://www.itisatrap.org/firefox/its-a-tracker.html"
 
 
-def test_third_party_content_blocked_private_browsing(driver: Firefox):
+def test_third_party_content_blocked_private_browsing_cross_site(driver: Firefox):
     """
-    C446323: Ensure that third party content is blocked correctly
+    C446323.1: Ensure that third party content is blocked correctly
     """
+    # instantiate objects
     panel_ui = PanelUi(driver).open()
     nav = Navigation(driver)
     tracker_panel = TrackerPanel(driver)
-    first_tracker_website = GenericPage(
-        driver,
-        url="https://senglehardt.com/test/trackingprotection/test_pages/tracking_protection.html",
-    )
-    second_tracker_website = GenericPage(
-        driver, url="https://itisatrap.org/firefox/its-a-tracker.html"
-    )
+    tracker_website = GenericPage(driver, url=FIRST_TRACKER_WEBSITE)
 
+    # open the new window
     panel_ui.open_private_window()
     nav.switch_to_new_window()
 
-    first_tracker_website.open()
-
-    tracker_panel.wait_for_blocked_tracking_icon(nav, first_tracker_website)
+    # open the website, ensure the blocking is taking place by continuously refreshing website until indicated
+    tracker_website.open()
+    tracker_panel.wait_for_blocked_tracking_icon(nav, tracker_website)
 
-    # first_tracker_website.open()
+    # verify the indicator
     driver.set_context(driver.CONTEXT_CHROME)
+    tracker_panel.verify_tracker_shield_indicator(nav)
+    nav.open_tracker_panel()
 
-    shield_icon = nav.get_element("shield-icon")
-
-    # # this could be labelled differently in different versions
+    # verify the panel title
+    tracker_panel_title = tracker_panel.get_element("tracker-title")
     assert (
-        shield_icon.get_attribute("data-l10n-id")
-        == "tracking-protection-icon-active-container"
-    ), "The label detected did not correspond to the expected one: tracking-protection-icon-no-trackers-detected-container"
+        tracker_panel_title.get_attribute("innerHTML")
+        == "Protections for senglehardt.com"
+    )
+
+    # fetch the items in the cross site trackers
+    cross_site_trackers = tracker_panel.open_and_return_cross_site_trackers()
+
+    # ensure that the correct blocked site is listed
+    found_tracker = False
+    for item in cross_site_trackers:
+        if item.get_attribute("value") == BLOCKED_TRACKER_URL:
+            found_tracker = True
+    assert found_tracker
+
+
+def test_third_party_content_blocked_private_browsing_allowed_tracking(driver: Firefox):
+    """
+    C446323.2: Ensure that some third party content is allowed
+    """
+    # instantiate objects
+    panel_ui = PanelUi(driver).open()
+    nav = Navigation(driver)
+    tracker_panel = TrackerPanel(driver)
+    tracker_website = GenericPage(driver, url=FIRST_TRACKER_WEBSITE)
+
+    # open a private window
+    panel_ui.open_private_window()
+    nav.switch_to_new_window()
+
+    # open the website, ensure the blocking is taking place by continuously refreshing website until indicated
+    tracker_website.open()
+    tracker_panel.wait_for_blocked_tracking_icon(nav, tracker_website)
+
+    # verify the indicator
+    driver.set_context(driver.CONTEXT_CHROME)
+    tracker_panel.verify_tracker_shield_indicator(nav)
+
+    # open the panel and verify the title
     nav.open_tracker_panel()
+    tracker_panel_title = tracker_panel.get_element("tracker-title")
+    assert (
+        tracker_panel_title.get_attribute("innerHTML")
+        == "Protections for senglehardt.com"
+    )
+
+    # fetch allowed trackers
+    allowed_trackers = tracker_panel.open_and_return_allowed_trackers()
+
+    # verify the correct ones are allowed
+    for item in allowed_trackers:
+        assert item.get_attribute("value") in ALLOWED_TRACKING_URLS
+
+
+def test_third_party_content_private_browsing_tracking_statuses(driver: Firefox):
+    """
+    C446323.3: Ensure that the statuses of some third party content is loaded properly
+    """
+    # instantiate objects
+    panel_ui = PanelUi(driver).open()
+    nav = Navigation(driver)
+    tracker_panel = TrackerPanel(driver)
+    tracker_website = GenericPage(driver, url=SECOND_TRACKER_WEBSITE)
+
+    # open a private window
+    panel_ui.open_private_window()
+    nav.switch_to_new_window()
+
+    # open the tracker website
+    tracker_website.open()
+    tracker_panel.wait_for_blocked_tracking_icon(nav, tracker_website)
+
+    # verify the indicator
+    tracker_panel.verify_tracker_shield_indicator(nav)
 
-    tracker_panel_title = nav.get_element("tracker-title")
-    logging.info(tracker_panel_title.get_attribute("innerHTML"))
+    # assert all of the various statuses, ensure that the correct one is displayed
+    block_status = tracker_website.get_element("simulated-tracker-block-status")
+    load_status = tracker_website.get_element("simulated-tracker-load-status")
+    dnt_status = tracker_website.get_element("simulated-tracker-dnt-status")
 
-    nav.get_element("tracker-cross-site-tracking").click()
+    assert "hidden" not in block_status.get_attribute("class")
+    assert "hidden" not in load_status.get_attribute("class")
+    assert "hidden" not in dnt_status.get_attribute("class")

tests/tabs/test_pin_tab.py

@@ -1,5 +1,3 @@
-import logging
-
 from selenium.webdriver import Firefox
 
 from modules.browser_object import TabBar, TabContextMenu