From 27cec484084f37e01cadcdf7ea92c64de71e0b34 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Wed, 19 Apr 2017 18:35:16 +0200 Subject: Add a flag and toggle keybinding for strict TLS --- config.def.h | 1 + surf.1 | 11 ++++++++++- surf.c | 7 ++++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/config.def.h b/config.def.h index 32cda3c..dce76f8 100644 --- a/config.def.h +++ b/config.def.h @@ -153,6 +153,7 @@ static Key keys[] = { { MODKEY|GDK_SHIFT_MASK, GDK_KEY_i, toggle, { .i = LoadImages } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_v, toggle, { .i = Plugins } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_b, toggle, { .i = ScrollBars } }, + { MODKEY|GDK_SHIFT_MASK, GDK_KEY_t, toggle, { .i = StrictTLS } }, { MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, toggle, { .i = Style } }, }; diff --git a/surf.1 b/surf.1 index 370dcee..0f02357 100644 --- a/surf.1 +++ b/surf.1 @@ -3,7 +3,7 @@ surf \- simple webkit-based browser .SH SYNOPSIS .B surf -.RB [-bBdDfFgGiIkKmMnNpPsSvx] +.RB [-bBdDfFgGiIkKmMnNpPsStTvx] .RB [-a\ cookiepolicies] .RB [-c\ cookiefile] .RB [-C\ stylefile] @@ -107,6 +107,12 @@ Disable Javascript .B \-S Enable Javascript .TP +.B \-t +Disable strict TLS check +.TP +.B \-T +Enable strict TLS check +.TP .B \-u useragent Specify the .I useragent @@ -217,6 +223,9 @@ Open the Web Inspector (Developer Tools) window for the current page. .B Ctrl\-Shift\-s Toggle script execution. This will reload the page. .TP +.B Ctrl\-Shift\-t +Toggle strict TLS check. This will reload the page. +.TP .B Ctrl\-Shift\-v Toggle the enabling of plugins on that surf instance. This will reload the page. diff --git a/surf.c b/surf.c index 8daa1e1..e08bfe5 100644 --- a/surf.c +++ b/surf.c @@ -226,7 +226,7 @@ static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h); static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h); static char winid[64]; -static char togglestats[10]; +static char togglestats[11]; static char pagestats[2]; static Atom atoms[AtomLast]; static Window embed; @@ -569,7 +569,8 @@ gettogglestats(Client *c) togglestats[6] = curconfig[Plugins].val.b ? 'V' : 'v'; togglestats[7] = curconfig[Style].val.b ? 'M' : 'm'; togglestats[8] = curconfig[FrameFlattening].val.b ? 'F' : 'f'; - togglestats[9] = '\0'; + togglestats[9] = curconfig[StrictTLS].val.b ? 'T' : 't'; + togglestats[10] = '\0'; } void @@ -715,7 +716,7 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) webkit_web_view_get_context(c->view), a->b ? WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE); - return; /* do not update */ + break; case Style: if (a->b) setstyle(c, getstyle(geturi(c))); -- cgit v1.2.3