Changeset 150938 in webkit

Timestamp:

May 29, 2013 5:10:59 PM (11 years ago)

Author:

andersca@apple.com

Message:

WebKit should expose HSTS APIs to determine whether a host is in the HSTS cache and to reset HSTS policies
​https://bugs.webkit.org/show_bug.cgi?id=117010
<rdar://problem/13689666>

Reviewed by Tim Horton.

• UIProcess/API/C/mac/WKContextPrivateMac.h:
• UIProcess/API/C/mac/WKContextPrivateMac.mm:
• UIProcess/API/C/mac/WKPagePrivateMac.cpp:
• UIProcess/API/C/mac/WKPagePrivateMac.h:
• UIProcess/WebContext.h:

(WebContext):

• UIProcess/mac/WebContextMac.mm:

(WebKit):
(WebKit::privateBrowsingSession):
(WebKit::WebContext::isURLKnownHSTSHost):
(WebKit::WebContext::resetHSTSHosts):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/mac/WKContextPrivateMac.h (modified) (1 diff)
• UIProcess/API/C/mac/WKContextPrivateMac.mm (modified) (1 diff)
• UIProcess/API/C/mac/WKPagePrivateMac.cpp (modified) (2 diffs)
• UIProcess/API/C/mac/WKPagePrivateMac.h (modified) (1 diff)
• UIProcess/WebContext.h (modified) (1 diff)
• UIProcess/mac/WebContextMac.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-29  Anders Carlsson  <andersca@apple.com>
+
+        WebKit should expose HSTS APIs to determine whether a host is in the HSTS cache and to reset HSTS policies
+        https://bugs.webkit.org/show_bug.cgi?id=117010
+        <rdar://problem/13689666>
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/C/mac/WKContextPrivateMac.h:
+        * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+        * UIProcess/API/C/mac/WKPagePrivateMac.cpp:
+        * UIProcess/API/C/mac/WKPagePrivateMac.h:
+        * UIProcess/WebContext.h:
+        (WebContext):
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit):
+        (WebKit::privateBrowsingSession):
+        (WebKit::WebContext::isURLKnownHSTSHost):
+        (WebKit::WebContext::resetHSTSHosts):
+
 2013-05-29  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h

@@ -43 +43 @@
 WK_EXPORT void WKContextGetInfoForInstalledPlugIns(WKContextRef context, WKContextGetInfoForInstalledPlugInsBlock block);
 
+WK_EXPORT void WKContextResetHSTSHosts(WKContextRef context);
 
 /* DEPRECATED -  Please use constants from WKPluginInformation instead. */

trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm

@@ -88 +88 @@
 }
 
+void WKContextResetHSTSHosts(WKContextRef context)
+{
+    return toImpl(context)->resetHSTSHosts();
+}
+
 
 /* DEPRECATED -  Please use constants from WKPluginInformation instead. */

trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp

@@ -28 +28 @@
 
 #include "WKAPICast.h"
+#include "WebContext.h"
+#include "WebPageGroup.h"
 #include "WebPageProxy.h"
+#include "WebPreferences.h"
 
 using namespace WebKit;
@@ -36 +39 @@
     return toImpl(pageRef)->processIdentifier();
 }
+
+bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url)
+{
+    WebPageProxy* webPageProxy = toImpl(page);
+    bool privateBrowsingEnabled = webPageProxy->pageGroup()->preferences()->privateBrowsingEnabled();
+
+    return webPageProxy->process()->context()->isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
+}

trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h

@@ -34 +34 @@
 
 WK_EXPORT pid_t WKPageGetProcessIdentifier(WKPageRef page);
+WK_EXPORT bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url);
 
 #ifdef __cplusplus

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -298 +298 @@
     void processDidCachePage(WebProcessProxy*);
 
+    bool isURLKnownHSTSHost(const String& urlString, bool privateBrowsingEnabled) const;
+    void resetHSTSHosts();
+
 private:
     WebContext(ProcessModel, const String& injectedBundlePath);

trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

@@ -47 +47 @@
 #endif
 
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+
+#if __has_include(<CFNetwork/CFURLProtocolPriv.h>)
+#include <CFNetwork/CFURLProtocolPriv.h>
+#else
+extern "C" Boolean _CFNetworkIsKnownHSTSHostWithSession(CFURLRef url, CFURLStorageSessionRef session);
+extern "C" void _CFNetworkResetHSTSHostsWithSession(CFURLStorageSessionRef session);
+#endif
+
+#endif
+
 using namespace WebCore;
 
@@ -561 +573 @@
 }
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+static CFURLStorageSessionRef privateBrowsingSession()
+{
+    static CFURLStorageSessionRef session;
+    static dispatch_once_t once;
+    dispatch_once(&once, ^{
+        NSString *identifier = [NSString stringWithFormat:@"%@.PrivateBrowsing", [[NSBundle mainBundle] bundleIdentifier]];
+
+        session = WKCreatePrivateStorageSession((CFStringRef)identifier);
+    });
+
+    return session;
+}
+#endif
+
+bool WebContext::isURLKnownHSTSHost(const String& urlString, bool privateBrowsingEnabled) const
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    RetainPtr<CFURLRef> url = KURL(KURL(), urlString).createCFURL();
+
+    return _CFNetworkIsKnownHSTSHostWithSession(url.get(), privateBrowsingEnabled ? privateBrowsingSession() : nullptr);
+#else
+    return false;
+#endif
+}
+
+void WebContext::resetHSTSHosts()
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    _CFNetworkResetHSTSHostsWithSession(nullptr);
+    _CFNetworkResetHSTSHostsWithSession(privateBrowsingSession());
+#endif
+}
+
 } // namespace WebKit