Changeset 293990 in webkit

Timestamp:

May 9, 2022 2:17:57 PM (2 years ago)

Author:

pvollan@apple.com

Message:

[macOS] HTTP traffic is not filtered in the parental controls filter
​https://bugs.webkit.org/show_bug.cgi?id=240180
<rdar://problem/92875540>

Reviewed by Alexey Proskuryakov.

Source/WebCore:

Traditionally, we have not filtered HTTP in the parental controls filter on macOS, since other parts of the system
has taken care of this. This has changed in the most recent macOS version, and WebKit should also filter HTTP in
addition to HTTPS.

• platform/cocoa/ParentalControlsContentFilter.mm:

(WebCore::canHandleResponse):

Source/WTF:

Add HAVE macro which tells us which OS versions are filtering HTTP traffic on behalf of WebKit.

• wtf/PlatformHave.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/cocoa/ParentalControlsContentFilter.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2022-05-09  Per Arne Vollan  <pvollan@apple.com>
+
+        [macOS] HTTP traffic is not filtered in the parental controls filter
+        https://bugs.webkit.org/show_bug.cgi?id=240180
+        <rdar://problem/92875540>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add HAVE macro which tells us which OS versions are filtering HTTP traffic on behalf of WebKit.
+
+        * wtf/PlatformHave.h:
+
 2022-05-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -1176 +1176 @@
 #define HAVE_UI_CONTEXT_MENU_PREVIEW_ITEM_IDENTIFIER 1
 #endif
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000)
+#define HAVE_SYSTEM_HTTP_CONTENT_FILTERING 1
+#endif

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-09  Per Arne Vollan  <pvollan@apple.com>
+
+        [macOS] HTTP traffic is not filtered in the parental controls filter
+        https://bugs.webkit.org/show_bug.cgi?id=240180
+        <rdar://problem/92875540>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Traditionally, we have not filtered HTTP in the parental controls filter on macOS, since other parts of the system
+        has taken care of this. This has changed in the most recent macOS version, and WebKit should also filter HTTP in
+        addition to HTTPS.
+
+        * platform/cocoa/ParentalControlsContentFilter.mm:
+        (WebCore::canHandleResponse):
+
 2022-05-09  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm

@@ -75 +75 @@
 static inline bool canHandleResponse(const ResourceResponse& response)
 {
+#if HAVE(SYSTEM_HTTP_CONTENT_FILTERING)
+    return response.url().protocolIs("https");
+#else
     return response.url().protocolIsInHTTPFamily();
+#endif
 }