Diff
Modified: trunk/Source/WebKit/ChangeLog (255957 => 255958)
--- trunk/Source/WebKit/ChangeLog 2020-02-06 16:49:04 UTC (rev 255957)
+++ trunk/Source/WebKit/ChangeLog 2020-02-06 17:03:03 UTC (rev 255958)
@@ -1,3 +1,26 @@
+2020-02-06 Alex Christensen <[email protected]>
+
+ Remove unused SPI WKWebViewConfiguration._treatsSHA1SignedCertificatesAsInsecure
+ https://bugs.webkit.org/show_bug.cgi?id=207314
+
+ Reviewed by Youenn Fablet.
+
+ The transition period is over. SHA1 certificates are insecure.
+
+ * UIProcess/API/APIPageConfiguration.cpp:
+ (API::PageConfiguration::copy const):
+ * UIProcess/API/APIPageConfiguration.h:
+ (API::PageConfiguration::treatsSHA1SignedCertificatesAsInsecure): Deleted.
+ (API::PageConfiguration::setTreatsSHA1SignedCertificatesAsInsecure): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration _treatsSHA1SignedCertificatesAsInsecure]): Deleted.
+ (-[WKWebViewConfiguration _setTreatsSHA1SignedCertificatesAsInsecure:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::didCommitLoadForFrame):
+ * UIProcess/WebPageProxy.h:
+
2020-02-06 Chris Dumez <[email protected]>
[IPC hardening] Update WebPasteboardProxy methods to validate their parameters
Modified: trunk/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp (255957 => 255958)
--- trunk/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp 2020-02-06 16:49:04 UTC (rev 255957)
+++ trunk/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp 2020-02-06 17:03:03 UTC (rev 255958)
@@ -72,7 +72,6 @@
copy->m_relatedPage = this->m_relatedPage;
copy->m_visitedLinkStore = this->m_visitedLinkStore;
copy->m_websiteDataStore = this->m_websiteDataStore;
- copy->m_treatsSHA1SignedCertificatesAsInsecure = this->m_treatsSHA1SignedCertificatesAsInsecure;
#if PLATFORM(IOS_FAMILY)
copy->m_alwaysRunsAtForegroundPriority = this->m_alwaysRunsAtForegroundPriority;
copy->m_canShowWhileLocked = this->m_canShowWhileLocked;
Modified: trunk/Source/WebKit/UIProcess/API/APIPageConfiguration.h (255957 => 255958)
--- trunk/Source/WebKit/UIProcess/API/APIPageConfiguration.h 2020-02-06 16:49:04 UTC (rev 255957)
+++ trunk/Source/WebKit/UIProcess/API/APIPageConfiguration.h 2020-02-06 17:03:03 UTC (rev 255958)
@@ -91,9 +91,6 @@
WebsitePolicies* defaultWebsitePolicies() const;
void setDefaultWebsitePolicies(WebsitePolicies*);
- bool treatsSHA1SignedCertificatesAsInsecure() { return m_treatsSHA1SignedCertificatesAsInsecure; }
- void setTreatsSHA1SignedCertificatesAsInsecure(bool treatsSHA1SignedCertificatesAsInsecure) { m_treatsSHA1SignedCertificatesAsInsecure = treatsSHA1SignedCertificatesAsInsecure; }
-
#if PLATFORM(IOS_FAMILY)
bool alwaysRunsAtForegroundPriority() { return m_alwaysRunsAtForegroundPriority; }
void setAlwaysRunsAtForegroundPriority(bool alwaysRunsAtForegroundPriority) { m_alwaysRunsAtForegroundPriority = alwaysRunsAtForegroundPriority; }
@@ -155,7 +152,6 @@
RefPtr<WebKit::WebsiteDataStore> m_websiteDataStore;
RefPtr<WebsitePolicies> m_defaultWebsitePolicies;
- bool m_treatsSHA1SignedCertificatesAsInsecure { true };
#if PLATFORM(IOS_FAMILY)
bool m_alwaysRunsAtForegroundPriority { false };
bool m_canShowWhileLocked { false };
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (255957 => 255958)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2020-02-06 16:49:04 UTC (rev 255957)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2020-02-06 17:03:03 UTC (rev 255958)
@@ -621,16 +621,6 @@
_groupIdentifier = groupIdentifier;
}
-- (BOOL)_treatsSHA1SignedCertificatesAsInsecure
-{
- return _pageConfiguration->treatsSHA1SignedCertificatesAsInsecure();
-}
-
-- (void)_setTreatsSHA1SignedCertificatesAsInsecure:(BOOL)insecure
-{
- _pageConfiguration->setTreatsSHA1SignedCertificatesAsInsecure(insecure);
-}
-
- (BOOL)_respectsImageOrientation
{
return _respectsImageOrientation;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (255957 => 255958)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2020-02-06 16:49:04 UTC (rev 255957)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2020-02-06 17:03:03 UTC (rev 255958)
@@ -57,8 +57,6 @@
@property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;
-@property (nonatomic, setter=_setTreatsSHA1SignedCertificatesAsInsecure:) BOOL _treatsSHA1SignedCertificatesAsInsecure WK_API_AVAILABLE(ios(9_0));
-
@property (nonatomic, setter=_setRespectsImageOrientation:) BOOL _respectsImageOrientation WK_API_AVAILABLE(macos(10.12), ios(10.0));
@property (nonatomic, setter=_setPrintsBackgrounds:) BOOL _printsBackgrounds WK_API_AVAILABLE(macos(10.12), ios(10.0));
@property (nonatomic, setter=_setIncrementalRenderingSuppressionTimeout:) NSTimeInterval _incrementalRenderingSuppressionTimeout WK_API_AVAILABLE(macos(10.12), ios(10.0));
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (255957 => 255958)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-02-06 16:49:04 UTC (rev 255957)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-02-06 17:03:03 UTC (rev 255958)
@@ -441,7 +441,6 @@
, m_websiteDataStore(*m_configuration->websiteDataStore())
, m_userAgent(standardUserAgent())
, m_overrideContentSecurityPolicy { m_configuration->overrideContentSecurityPolicy() }
- , m_treatsSHA1CertificatesAsInsecure(m_configuration->treatsSHA1SignedCertificatesAsInsecure())
#if ENABLE(FULLSCREEN_API)
, m_fullscreenClient(makeUnique<API::FullscreenClient>())
#endif
@@ -4522,7 +4521,7 @@
auto transaction = m_pageLoadState.transaction();
Ref<WebCertificateInfo> webCertificateInfo = WebCertificateInfo::create(certificateInfo);
- bool markPageInsecure = hasInsecureContent ? hasInsecureContent.value() == HasInsecureContent::Yes : m_treatsSHA1CertificatesAsInsecure && certificateInfo.containsNonRootSHA1SignedCertificate();
+ bool markPageInsecure = hasInsecureContent ? hasInsecureContent.value() == HasInsecureContent::Yes : certificateInfo.containsNonRootSHA1SignedCertificate();
if (frame->isMainFrame()) {
m_pageLoadState.didCommitLoad(transaction, webCertificateInfo, markPageInsecure, usedLegacyTLS);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (255957 => 255958)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2020-02-06 16:49:04 UTC (rev 255957)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2020-02-06 17:03:03 UTC (rev 255958)
@@ -2292,8 +2292,6 @@
String m_customTextEncodingName;
String m_overrideContentSecurityPolicy;
- bool m_treatsSHA1CertificatesAsInsecure { true };
-
RefPtr<WebInspectorProxy> m_inspector;
#if ENABLE(FULLSCREEN_API)
