Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-18 07:27:34 UTC (rev 220904)
@@ -1,3 +1,17 @@
+2017-08-18 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r220854.
+ https://bugs.webkit.org/show_bug.cgi?id=175716
+
+ I'm not sure we really need this (Requested by KaL on
+ #webkit).
+
+ Reverted changeset:
+
+ "[GTK][WPE] Add NTLM authentication enabled API"
+ https://bugs.webkit.org/show_bug.cgi?id=122952
+ http://trac.webkit.org/changeset/220854
+
2017-08-17 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] Add NTLM authentication enabled API
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2017-08-18 07:27:34 UTC (rev 220904)
@@ -46,7 +46,6 @@
namespace WebCore {
static bool gIgnoreTLSErrors;
-static bool gInitialNTLMAuthenticationEnabled;
static CString gInitialAcceptLanguages;
static SoupNetworkProxySettings gProxySettings;
static GType gCustomProtocolRequestType;
@@ -147,9 +146,6 @@
if (!gInitialAcceptLanguages.isNull())
setAcceptLanguages(gInitialAcceptLanguages);
- if (gInitialNTLMAuthenticationEnabled)
- soup_session_add_feature_by_type(m_soupSession.get(), SOUP_TYPE_AUTH_NTLM);
-
#if SOUP_CHECK_VERSION(2, 53, 92)
if (soup_auth_negotiate_supported()) {
g_object_set(m_soupSession.get(),
@@ -327,19 +323,6 @@
clientCertificates().add(host, HostTLSCertificateSet()).iterator->value.add(certificateInfo.certificate());
}
-void SoupNetworkSession::setInitialNTLMAuthenticationEnabled(bool enabled)
-{
- gInitialNTLMAuthenticationEnabled = enabled;
-}
-
-void SoupNetworkSession::setNTLMAuthenticationEnabled(bool enabled)
-{
- if (enabled)
- soup_session_add_feature_by_type(m_soupSession.get(), SOUP_TYPE_AUTH_NTLM);
- else
- soup_session_remove_feature_by_type(m_soupSession.get(), SOUP_TYPE_AUTH_NTLM);
-}
-
} // namespace WebCore
#endif
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/network/soup/SoupNetworkSession.h (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2017-08-18 07:27:34 UTC (rev 220904)
@@ -70,9 +70,6 @@
static void setCustomProtocolRequestType(GType);
void setupCustomProtocols();
- static void setInitialNTLMAuthenticationEnabled(bool);
- void setNTLMAuthenticationEnabled(bool);
-
private:
void setupLogger();
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-08-18 07:27:34 UTC (rev 220904)
@@ -1,3 +1,17 @@
+2017-08-18 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r220854.
+ https://bugs.webkit.org/show_bug.cgi?id=175716
+
+ I'm not sure we really need this (Requested by KaL on
+ #webkit).
+
+ Reverted changeset:
+
+ "[GTK][WPE] Add NTLM authentication enabled API"
+ https://bugs.webkit.org/show_bug.cgi?id=122952
+ http://trac.webkit.org/changeset/220854
+
2017-08-17 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] Add NTLM authentication enabled API
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcess.h (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcess.h 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcess.h 2017-08-18 07:27:34 UTC (rev 220904)
@@ -210,7 +210,6 @@
void setIgnoreTLSErrors(bool);
void userPreferredLanguagesChanged(const Vector<String>&);
void setNetworkProxySettings(const WebCore::SoupNetworkProxySettings&);
- void setNTLMAuthenticationEnabled(bool);
#endif
// Platform Helpers
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2017-08-18 07:27:34 UTC (rev 220904)
@@ -31,7 +31,6 @@
SetIgnoreTLSErrors(bool ignoreTLSErrors)
UserPreferredLanguagesChanged(Vector<String> languages)
SetNetworkProxySettings(struct WebCore::SoupNetworkProxySettings settings)
- SetNTLMAuthenticationEnabled(bool enabled)
#endif
ClearCachedCredentials()
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2017-08-18 07:27:34 UTC (rev 220904)
@@ -90,7 +90,6 @@
encoder << cookiePersistentStorageType;
encoder.encodeEnum(cookieAcceptPolicy);
encoder << ignoreTLSErrors;
- encoder << ntlmAuthenticationEnabled;
encoder << languages;
encoder << proxySettings;
#endif
@@ -189,8 +188,6 @@
return false;
if (!decoder.decode(result.ignoreTLSErrors))
return false;
- if (!decoder.decode(result.ntlmAuthenticationEnabled))
- return false;
if (!decoder.decode(result.languages))
return false;
if (!decoder.decode(result.proxySettings))
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2017-08-18 07:27:34 UTC (rev 220904)
@@ -102,7 +102,6 @@
uint32_t cookiePersistentStorageType { 0 };
HTTPCookieAcceptPolicy cookieAcceptPolicy { HTTPCookieAcceptPolicyAlways };
bool ignoreTLSErrors { false };
- bool ntlmAuthenticationEnabled { false };
Vector<String> languages;
WebCore::SoupNetworkProxySettings proxySettings;
#endif
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2017-08-18 07:27:34 UTC (rev 220904)
@@ -132,7 +132,6 @@
userPreferredLanguagesChanged(parameters.languages);
setIgnoreTLSErrors(parameters.ignoreTLSErrors);
- setNTLMAuthenticationEnabled(parameters.ntlmAuthenticationEnabled);
}
void NetworkProcess::platformSetURLCacheSize(unsigned, uint64_t)
@@ -149,15 +148,6 @@
SoupNetworkSession::allowSpecificHTTPSCertificateForHost(certificateInfo, host);
}
-void NetworkProcess::setNTLMAuthenticationEnabled(bool enabled)
-{
- SoupNetworkSession::setInitialNTLMAuthenticationEnabled(enabled);
- NetworkStorageSession::forEach([enabled](const NetworkStorageSession& session) {
- if (auto* soupSession = session.soupNetworkSession())
- soupSession->setNTLMAuthenticationEnabled(enabled);
- });
-}
-
void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
{
if (cachesToClear == InMemoryResourceCachesOnly)
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2017-08-18 07:27:34 UTC (rev 220904)
@@ -1546,41 +1546,6 @@
context->priv->notificationProvider->setNotificationPermissions(WTFMove(map));
}
-/**
- * webkit_web_context_get_ntlm_authentication_enabled:
- * @context: a #WebKitWebContext
- *
- * Get whether NTLM authentication is currently enabled. By default, the feature
- * is disabled, and you need to call webkit_web_context_set_ntlm_authentication_enabled()
- * to enable it.
- *
- * Returns: %TRUE if NTLM authentication is enabled, or %FALSE otherwise.
- *
- * Since: 2.18
- */
-gboolean webkit_web_context_get_ntlm_authentication_enabled(WebKitWebContext* context)
-{
- g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), FALSE);
-
- return context->priv->processPool->ntlmAuthenticationEnabled();
-}
-
-/**
- * webkit_web_context_set_ntlm_authentication_enabled:
- * @context: a #WebKitWebContext
- * @enabled: Value to be set
- *
- * Enable or disable NTLM authentication.
- *
- * Since: 2.18
- */
-void webkit_web_context_set_ntlm_authentication_enabled(WebKitWebContext* context, gboolean enabled)
-{
- g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
-
- return context->priv->processPool->setNTLMAuthenticationEnabled(enabled);
-}
-
void webkitWebContextInitializeNotificationPermissions(WebKitWebContext* context)
{
g_signal_emit(context, signals[INITIALIZE_NOTIFICATION_PERMISSIONS], 0);
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebContext.h (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebContext.h 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/WebKitWebContext.h 2017-08-18 07:27:34 UTC (rev 220904)
@@ -306,13 +306,6 @@
GList *allowed_origins,
GList *disallowed_origins);
-WEBKIT_API gboolean
-webkit_web_context_get_ntlm_authentication_enabled (WebKitWebContext *context);
-
-WEBKIT_API void
-webkit_web_context_set_ntlm_authentication_enabled (WebKitWebContext *context,
- gboolean enabled);
-
G_END_DECLS
#endif
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2017-08-18 07:27:34 UTC (rev 220904)
@@ -66,8 +66,6 @@
webkit_web_context_get_process_model
webkit_web_context_set_process_model
webkit_web_context_initialize_notification_permissions
-webkit_web_context_get_ntlm_authentication_enabled
-webkit_web_context_set_ntlm_authentication_enabled
<SUBSECTION URI Scheme>
WebKitURISchemeRequestCallback
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h 2017-08-18 07:27:34 UTC (rev 220904)
@@ -306,13 +306,6 @@
GList *allowed_origins,
GList *disallowed_origins);
-WEBKIT_API gboolean
-webkit_web_context_get_ntlm_authentication_enabled (WebKitWebContext *context);
-
-WEBKIT_API void
-webkit_web_context_set_ntlm_authentication_enabled (WebKitWebContext *context,
- gboolean enabled);
-
G_END_DECLS
#endif
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/WebProcessPool.h (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/WebProcessPool.h 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/WebProcessPool.h 2017-08-18 07:27:34 UTC (rev 220904)
@@ -226,12 +226,8 @@
void stopMemorySampler();
#if USE(SOUP)
- void setIgnoreTLSErrors(bool);
- bool ignoreTLSErrors() const { return m_ignoreTLSErrors; }
void setInitialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy) { m_initialHTTPCookieAcceptPolicy = policy; }
void setNetworkProxySettings(const WebCore::SoupNetworkProxySettings&);
- void setNTLMAuthenticationEnabled(bool);
- bool ntlmAuthenticationEnabled() const { return m_ntlmAuthenticationEnabled; }
#endif
void setEnhancedAccessibility(bool);
@@ -330,6 +326,11 @@
static void willStartUsingPrivateBrowsing();
static void willStopUsingPrivateBrowsing();
+#if USE(SOUP)
+ void setIgnoreTLSErrors(bool);
+ bool ignoreTLSErrors() const { return m_ignoreTLSErrors; }
+#endif
+
static void setInvalidMessageCallback(void (*)(WKStringRef));
static void didReceiveInvalidMessage(const IPC::StringReference& messageReceiverName, const IPC::StringReference& messageName);
@@ -526,8 +527,6 @@
#if USE(SOUP)
HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy { HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain };
WebCore::SoupNetworkProxySettings m_networkProxySettings;
- bool m_ignoreTLSErrors { true };
- bool m_ntlmAuthenticationEnabled { false };
#endif
HashSet<String, ASCIICaseInsensitiveHash> m_urlSchemesRegisteredForCustomProtocols;
@@ -556,6 +555,10 @@
HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
+#if USE(SOUP)
+ bool m_ignoreTLSErrors { true };
+#endif
+
bool m_memoryCacheDisabled;
bool m_resourceLoadStatisticsEnabled { false };
bool m_javaScriptConfigurationFileEnabled { false };
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp 2017-08-18 07:27:34 UTC (rev 220904)
@@ -61,14 +61,4 @@
m_networkProcess->send(Messages::NetworkProcess::SetNetworkProxySettings(m_networkProxySettings), 0);
}
-void WebProcessPool::setNTLMAuthenticationEnabled(bool enabled)
-{
- if (m_ntlmAuthenticationEnabled == enabled)
- return;
-
- m_ntlmAuthenticationEnabled = enabled;
- if (m_networkProcess)
- m_networkProcess->send(Messages::NetworkProcess::SetNTLMAuthenticationEnabled(m_ntlmAuthenticationEnabled), 0);
}
-
-}
Modified: releases/WebKitGTK/webkit-2.18/Tools/ChangeLog (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Tools/ChangeLog 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Tools/ChangeLog 2017-08-18 07:27:34 UTC (rev 220904)
@@ -1,3 +1,17 @@
+2017-08-18 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r220854.
+ https://bugs.webkit.org/show_bug.cgi?id=175716
+
+ I'm not sure we really need this (Requested by KaL on
+ #webkit).
+
+ Reverted changeset:
+
+ "[GTK][WPE] Add NTLM authentication enabled API"
+ https://bugs.webkit.org/show_bug.cgi?id=122952
+ http://trac.webkit.org/changeset/220854
+
2017-08-17 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] Add NTLM authentication enabled API
Modified: releases/WebKitGTK/webkit-2.18/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp (220903 => 220904)
--- releases/WebKitGTK/webkit-2.18/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp 2017-08-18 07:22:13 UTC (rev 220903)
+++ releases/WebKitGTK/webkit-2.18/Tools/TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp 2017-08-18 07:27:34 UTC (rev 220904)
@@ -252,16 +252,6 @@
g_assert_cmpstr(webkit_web_view_get_title(test->m_webView), ==, authExpectedSuccessTitle);
}
-static void testWebViewAuthenticationNTLM(AuthenticationTest* test, gconstpointer)
-{
- // NTML is disabled by default.
- g_assert(!webkit_web_context_get_ntlm_authentication_enabled(test->m_webContext.get()));
- webkit_web_context_set_ntlm_authentication_enabled(test->m_webContext.get(), TRUE);
- g_assert(webkit_web_context_get_ntlm_authentication_enabled(test->m_webContext.get()));
-
- // FIXME: can we test NTLM authentication?
-}
-
class Tunnel {
public:
Tunnel(SoupServer* server, SoupMessage* message)
@@ -428,7 +418,6 @@
AuthenticationTest::add("WebKitWebView", "authentication-no-credential", testWebViewAuthenticationNoCredential);
AuthenticationTest::add("WebKitWebView", "authentication-storage", testWebViewAuthenticationStorage);
AuthenticationTest::add("WebKitWebView", "authentication-empty-realm", testWebViewAuthenticationEmptyRealm);
- AuthenticationTest::add("WebKitWebView", "authentication-ntlm", testWebViewAuthenticationNTLM);
ProxyAuthenticationTest::add("WebKitWebView", "authentication-proxy", testWebViewAuthenticationProxy);
ProxyAuthenticationTest::add("WebKitWebView", "authentication-proxy-https", testWebViewAuthenticationProxyHTTPS);
}
