Attachment 342522 Details for Bug 186557 – Patch

[patch] Patch

bug-186557-20180612105404.patch (text/plain), 3.58 KB, created by Zan Dobersek on 2018-06-12 01:54:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2018-06-12 01:54:05 PDT

Size: 3.58 KB

patch

obsolete

>Subversion Revision: 232746
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index fcbeb49779acf72b5ece040595b3a9ccb6962b98..322d7b82ffb2ad517ee5c1518b8ca9577dad9650 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-06-12  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        [GTK] Ignore TLS errors when running WPT suite
>+        https://bugs.webkit.org/show_bug.cgi?id=186557
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        As with layout tests, temporary certificates are used for HTTPS
>+        connections when running WPT test suite. These errors should be ignored
>+        by passing --ignore-tls-errors=true to the browser executable.
>+
>+        In GTK's MiniBrowser the --ignore-tls-errors option is added, and the
>+        webkit_web_context_set_tls_errors_policy() function is used to enforce
>+        ignoring the TLS errors when that option is enabled.
>+
>+        * MiniBrowser/gtk/main.c:
>+        (main):
>+        * Scripts/webkitpy/webdriver_tests/webdriver_driver_gtk.py:
>+        (WebDriverGtk.browser_args):
>+
> 2018-06-12  Zan Dobersek  <zdobersek@igalia.com>
> 
>         Add run-web-platform-tests script
>diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c
>index 9b3a6775684ed1964e6566fb301f5ac7270b22e3..58701fc842ce595d2684762a4a13eb186489a490 100644
>--- a/Tools/MiniBrowser/gtk/main.c
>+++ b/Tools/MiniBrowser/gtk/main.c
>@@ -45,6 +45,7 @@ static char *geometry;
> static gboolean privateMode;
> static gboolean automationMode;
> static gboolean fullScreen;
>+static gboolean ignoreTLSErrors;
> static const char *cookiesFile;
> static const char *cookiesPolicy;
> static const char *proxy;
>@@ -108,6 +109,7 @@ static const GOptionEntry commandLineOptions[] =
>     { "cookies-policy", 0, 0, G_OPTION_ARG_STRING, &cookiesPolicy, "Cookies accept policy (always, never, no-third-party). Default: no-third-party", "POLICY" },
>     { "proxy", 0, 0, G_OPTION_ARG_STRING, &proxy, "Set proxy", "PROXY" },
>     { "ignore-host", 0, 0, G_OPTION_ARG_STRING_ARRAY, &ignoreHosts, "Set proxy ignore hosts", "HOSTS" },
>+    { "ignore-tls-errors", 0, 0, G_OPTION_ARG_NONE, &ignoreTLSErrors, "Ignore TLS errors", NULL },
>     { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URLâ¦]" },
>     { 0, 0, 0, 0, 0, 0, 0 }
> };
>@@ -535,6 +537,9 @@ int main(int argc, char *argv[])
>     webkit_web_context_set_automation_allowed(webContext, automationMode);
>     g_signal_connect(webContext, "automation-started", G_CALLBACK(automationStartedCallback), NULL);
> 
>+    if (ignoreTLSErrors)
>+        webkit_web_context_set_tls_errors_policy(webContext, WEBKIT_TLS_ERRORS_POLICY_IGNORE);
>+
>     BrowserWindow *mainWindow = BROWSER_WINDOW(browser_window_new(NULL, webContext));
>     if (fullScreen)
>         gtk_window_fullscreen(GTK_WINDOW(mainWindow));
>diff --git a/Tools/Scripts/webkitpy/webdriver_tests/webdriver_driver_gtk.py b/Tools/Scripts/webkitpy/webdriver_tests/webdriver_driver_gtk.py
>index ef4f38579f2f0fabca630b0134d4199f00f92076..281c2298ec9c0b554122bf09b05d52e2bffe7d78 100644
>--- a/Tools/Scripts/webkitpy/webdriver_tests/webdriver_driver_gtk.py
>+++ b/Tools/Scripts/webkitpy/webdriver_tests/webdriver_driver_gtk.py
>@@ -38,7 +38,8 @@ class WebDriverGtk(WebDriver):
>         return self._port._build_path('bin', 'MiniBrowser')
> 
>     def browser_args(self):
>-        return ['--automation', '--javascript-can-open-windows-automatically=true', '--enable-xss-auditor=false']
>+        return ['--automation', '--javascript-can-open-windows-automatically=true',
>+            '--enable-xss-auditor=false', '--ignore-tls-errors=true']
> 
>     def capabilities(self):
>         return {'webkitgtk:browserOptions': {

Actions: View | Formatted Diff | Diff

Attachments on bug 186557: 342522 | 342728