Attachment 342728 Details for Bug 186557 – Patch

[patch] Patch

bug-186557-20180614104236.patch (text/plain), 4.30 KB, created by Zan Dobersek on 2018-06-14 01:42:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2018-06-14 01:42:37 PDT

Size: 4.30 KB

patch

obsolete

>Subversion Revision: 232827
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 2708476459870b3f61b250ccf4d0b2cf87e1bc2e..4c2467c580702ca9e74c02718b661bb66b7bdcec 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-06-14  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        [GTK][WPE] MiniBrowsers should be able to ignore TLS errors
>+        https://bugs.webkit.org/show_bug.cgi?id=186557
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add the --ignore-tls-errors flags to the GTK and WPE MiniBrowsers.
>+        Enabling the flag enforces ignoring of TLS errors that occur during
>+        load. This is primarily useful for loading test cases from the wpt or
>+        run-webkit-httpd servers where testing-purpose certificates are used.
>+
>+        * MiniBrowser/gtk/main.c:
>+        (main):
>+        * MiniBrowser/wpe/main.cpp:
>+        (main):
>+
> 2018-06-11  Carlos Alberto Lopez Perez  <clopez@igalia.com>
> 
>         [GTK] Add a script to upload the data generated with run-benchmark to a browserperfdash server and use it on the gtk perf bot
>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/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp
>index 26adc30d8b12f70de79cec0e00f1d989fdde5f5f..1cac7e7f2b685d76c769826ae9e9f90a3ef63f6d 100644
>--- a/Tools/MiniBrowser/wpe/main.cpp
>+++ b/Tools/MiniBrowser/wpe/main.cpp
>@@ -36,6 +36,7 @@ static const char** ignoreHosts;
> static gboolean headlessMode;
> static gboolean privateMode;
> static gboolean automationMode;
>+static gboolean ignoreTLSErrors;
> static const char* cookiesFile;
> static const char* cookiesPolicy;
> static const char* proxy;
>@@ -49,6 +50,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, nullptr, "[URL]" },
>     { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
> };
>@@ -180,6 +182,9 @@ int main(int argc, char *argv[])
>     webkit_web_context_set_automation_allowed(webContext, automationMode);
>     g_signal_connect(webContext, "automation-started", G_CALLBACK(automationStartedCallback), webView);
> 
>+    if (ignoreTLSErrors)
>+        webkit_web_context_set_tls_errors_policy(webContext, WEBKIT_TLS_ERRORS_POLICY_IGNORE);
>+
>     if (uriArguments)
>         webkit_web_view_load_uri(webView, uriArguments[0]);
>     else if (!automationMode)

Flags:

cgarcia: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186557: 342522 | 342728