Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-02-07 04:34:04 -05:00
Code Issues Projects Releases Wiki Activity

webkit2: Split resource-load-started handler into a separate function

Browse Source 
This cleans up the #ifdef/#else/#endif mess in the function for webkit
vs. webkit2 API.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2020-02-16 18:37:02 +02:00
parent 7de8bd508f
commit 02ed737eee
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/utils/browser.c
View File

@ -95,35 +95,11 @@ static void view_cb_notify_load_status(WebKitWebView *view, GParamSpec *pspec,
#endif /* USE_WEBKIT2 */ #endif /* USE_WEBKIT2 */
static void view_cb_resource_request_starting(WebKitWebView *view, static void process_request_starting_uri(struct browser_context *ctx,
#ifndef USE_WEBKIT2 const char *uri)
WebKitWebFrame *frame,
#endif /* USE_WEBKIT2 */
WebKitWebResource *res,
#ifdef USE_WEBKIT2
WebKitURIRequest *req,
#else /* USE_WEBKIT2 */
WebKitNetworkRequest *req,
WebKitNetworkResponse *resp,
#endif /* USE_WEBKIT2 */
struct browser_context *ctx)
{ {
#ifdef USE_WEBKIT2
const gchar *uri = webkit_uri_request_get_uri(req);
#else /* USE_WEBKIT2 */
const gchar *uri = webkit_network_request_get_uri(req);
#endif /* USE_WEBKIT2 */
int quit = 0; int quit = 0;
wpa_printf(MSG_DEBUG, "BROWSER:%s uri=%s", __func__, uri);
if (g_str_has_suffix(uri, "/favicon.ico")) {
#ifdef USE_WEBKIT2
webkit_uri_request_set_uri(req, "about:blank");
#else /* USE_WEBKIT2 */
webkit_network_request_set_uri(req, "about:blank");
#endif /* USE_WEBKIT2 */
}
if (g_str_has_prefix(uri, "osu://")) { if (g_str_has_prefix(uri, "osu://")) {
ctx->success = atoi(uri + 6); ctx->success = atoi(uri + 6);
quit = 1; quit = 1;
@ -147,6 +123,39 @@ static void view_cb_resource_request_starting(WebKitWebView *view,
} }
#ifdef USE_WEBKIT2
static void view_cb_resource_load_starting(WebKitWebView *view,
WebKitWebResource *res,
WebKitURIRequest *req,
struct browser_context *ctx)
{
const gchar *uri = webkit_uri_request_get_uri(req);
wpa_printf(MSG_DEBUG, "BROWSER:%s uri=%s", __func__, uri);
if (g_str_has_suffix(uri, "/favicon.ico"))
webkit_uri_request_set_uri(req, "about:blank");
process_request_starting_uri(ctx, uri);
}
#else /* USE_WEBKIT2 */
static void view_cb_resource_request_starting(WebKitWebView *view,
WebKitWebFrame *frame,
WebKitWebResource *res,
WebKitNetworkRequest *req,
WebKitNetworkResponse *resp,
struct browser_context *ctx)
{
const gchar *uri = webkit_network_request_get_uri(req);
wpa_printf(MSG_DEBUG, "BROWSER:%s uri=%s", __func__, uri);
if (g_str_has_suffix(uri, "/favicon.ico"))
webkit_network_request_set_uri(req, "about:blank");
process_request_starting_uri(ctx, uri);
}
#endif /* USE_WEBKIT2 */
static gboolean view_cb_mime_type_policy_decision( static gboolean view_cb_mime_type_policy_decision(
WebKitWebView *view, WebKitWebView *view,
#ifndef USE_WEBKIT2 #ifndef USE_WEBKIT2
@ -312,7 +321,7 @@ int hs20_web_browser(const char *url, int ignore_tls)
G_CALLBACK(view_cb_notify_estimated_load_progress), G_CALLBACK(view_cb_notify_estimated_load_progress),
&ctx); &ctx);
g_signal_connect(G_OBJECT(view), "resource-load-started", g_signal_connect(G_OBJECT(view), "resource-load-started",
G_CALLBACK(view_cb_resource_request_starting), &ctx); G_CALLBACK(view_cb_resource_load_starting), &ctx);
g_signal_connect(G_OBJECT(view), "decide-policy", g_signal_connect(G_OBJECT(view), "decide-policy",
G_CALLBACK(view_cb_mime_type_policy_decision), &ctx); G_CALLBACK(view_cb_mime_type_policy_decision), &ctx);
g_signal_connect(G_OBJECT(view), "mouse-target-changed", g_signal_connect(G_OBJECT(view), "mouse-target-changed",