SiteQuirks,
SpellChecking,
SpellLanguages,
- StrictSSL,
+ StrictTLS,
Style,
ZoomLevel,
ParameterLast,
WebKitWebInspector *inspector;
WebKitFindController *finder;
WebKitHitTestResult *mousepos;
- GTlsCertificateFlags tlsflags;
+ GTlsCertificateFlags tlserr;
Window xid;
- int progress, fullscreen;
+ int progress, fullscreen, https, insecure;
const char *title, *overtitle, *targeturi;
const char *needle;
struct Client *next;
typedef struct {
char *regex;
- char *style;
+ char *file;
regex_t re;
-} SiteStyle;
+} SiteSpecific;
/* Surf */
static void usage(void);
static void decidenavigation(WebKitPolicyDecision *d, Client *c);
static void decidenewwindow(WebKitPolicyDecision *d, Client *c);
static void decideresource(WebKitPolicyDecision *d, Client *c);
+static void insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e,
+ Client *c);
static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
Client *c);
static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c);
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;
void
usage(void)
{
- die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
- "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
+ die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
+ "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
"[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
}
styles[i].regex);
styles[i].regex = NULL;
}
- styles[i].style = g_strconcat(styledir, "/",
- styles[i].style, NULL);
+ styles[i].file = g_strconcat(styledir, "/",
+ styles[i].file, NULL);
}
g_free(styledir);
} else {
clients = c;
c->progress = 100;
- c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
c->view = newview(c, rc ? rc->view : NULL);
return 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
getpagestats(Client *c)
{
- pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
- c->tlsflags > 0 ? 'U' : 'T';
+ if (c->https)
+ pagestats[0] = (c->tlserr || c->insecure) ? 'U' : 'T';
+ else
+ pagestats[0] = '-';
pagestats[1] = '\0';
}
return; /* do not update */
case SpellLanguages:
return; /* do nothing */
- case StrictSSL:
+ case StrictTLS:
webkit_web_context_set_tls_errors_policy(
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)));
for (i = 0; i < LENGTH(styles); ++i) {
if (styles[i].regex &&
!regexec(&(styles[i].re), uri, 0, NULL, 0))
- return styles[i].style;
+ return styles[i].file;
}
return "";
{
int i = 0;
char tmp[64];
- const char *cmd[26], *uri;
+ const char *cmd[28], *uri;
const Arg arg = { .v = cmd };
cmd[i++] = argv0;
cmd[i++] = "-c";
cmd[i++] = cookiefile;
}
+ if (stylefile && g_strcmp0(stylefile, "")) {
+ cmd[i++] = "-C";
+ cmd[i++] = stylefile;
+ }
cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
if (embed && !noembed) {
cmd[i++] = "-e";
cmd[i++] = scriptfile;
}
cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
- if (stylefile && g_strcmp0(stylefile, "")) {
- cmd[i++] = "-t";
- cmd[i++] = stylefile;
- }
+ cmd[i++] = curconfig[StrictTLS].val.b ? "-T" : "-t";
if (fulluseragent && g_strcmp0(fulluseragent, "")) {
cmd[i++] = "-u";
cmd[i++] = fulluseragent;
* or one for each view */
webkit_web_context_set_process_model(context,
WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
- /* ssl */
+ /* TLS */
webkit_web_context_set_tls_errors_policy(context,
- curconfig[StrictSSL].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
+ curconfig[StrictTLS].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
WEBKIT_TLS_ERRORS_POLICY_IGNORE);
/* disk cache */
webkit_web_context_set_cache_model(context,
G_CALLBACK(createview), c);
g_signal_connect(G_OBJECT(v), "decide-policy",
G_CALLBACK(decidepolicy), c);
+ g_signal_connect(G_OBJECT(v), "insecure-content-detected",
+ G_CALLBACK(insecurecontent), c);
g_signal_connect(G_OBJECT(v), "load-changed",
G_CALLBACK(loadchanged), c);
g_signal_connect(G_OBJECT(v), "mouse-target-changed",
gtk_window_set_role(GTK_WINDOW(w), wmstr);
g_free(wmstr);
- gtk_window_set_default_size(GTK_WINDOW(w), 800, 600);
+ gtk_window_set_default_size(GTK_WINDOW(w), winsize[0], winsize[1]);
}
g_signal_connect(G_OBJECT(w), "destroy",
curconfig = defconfig;
setatom(c, AtomUri, title);
c->title = title;
- c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+ c->https = c->insecure = 0;
seturiparameters(c, geturi(c));
break;
case WEBKIT_LOAD_REDIRECTED:
seturiparameters(c, geturi(c));
break;
case WEBKIT_LOAD_COMMITTED:
- if (!webkit_web_view_get_tls_info(c->view, NULL,
- &(c->tlsflags)))
- c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
-
+ c->https = webkit_web_view_get_tls_info(c->view, NULL,
+ &c->tlserr);
break;
case WEBKIT_LOAD_FINISHED:
/* Disabled until we write some WebKitWebExtension for
}
}
+void
+insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, Client *c)
+{
+ c->insecure = 1;
+}
+
void
downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
{
case 'c':
cookiefile = EARGF(usage());
break;
+ case 'C':
+ stylefile = EARGF(usage());
+ break;
case 'd':
defconfig CSETB(DiskCache, 0);
break;
defconfig CSETB(JavaScript, 1);
break;
case 't':
- stylefile = EARGF(usage());
+ defconfig CSETB(StrictTLS, 0);
+ break;
+ case 'T':
+ defconfig CSETB(StrictTLS, 1);
break;
case 'u':
fulluseragent = EARGF(usage());
break;
case 'v':
- die("surf-"VERSION", ©2009-2015 surf engineers, "
+ die("surf-"VERSION", ©2009-2017 surf engineers, "
"see LICENSE for details\n");
case 'x':
showxid = 1;