X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=fb104e93ba982d449200f9e70b0650cad43f801b;hp=40f514f16f3f24e890be1104bed25947fc452b13;hb=93a3e4cda031d226549430e89b8119ce5c1ad7b3;hpb=1dc3cd513a75570cc2fc33a86d4af565ecf9255e diff --git a/surf.c b/surf.c index 40f514f..fb104e9 100644 --- a/surf.c +++ b/surf.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -64,12 +65,14 @@ typedef enum { Certificate, CookiePolicies, DiskCache, + DefaultCharset, DNSPrefetch, FontSize, FrameFlattening, Geolocation, HideBackground, Inspector, + Java, JavaScript, KioskMode, LoadImages, @@ -106,9 +109,10 @@ typedef struct Client { WebKitWebInspector *inspector; WebKitFindController *finder; WebKitHitTestResult *mousepos; + GTlsCertificate *cert, *failedcert; GTlsCertificateFlags tlserr; Window xid; - int progress, fullscreen, https, insecure; + int progress, fullscreen, https, insecure, errorpage; const char *title, *overtitle, *targeturi; const char *needle; struct Client *next; @@ -216,6 +220,7 @@ static void destroywin(GtkWidget* w, Client *c); static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d); static void reload(Client *c, const Arg *a); static void print(Client *c, const Arg *a); +static void showcert(Client *c, const Arg *a); static void clipboard(Client *c, const Arg *a); static void zoom(Client *c, const Arg *a); static void scroll(Client *c, const Arg *a); @@ -233,7 +238,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[11]; +static char togglestats[12]; static char pagestats[2]; static Atom atoms[AtomLast]; static Window embed; @@ -253,9 +258,9 @@ char *argv0; void usage(void) { - die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] " - "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] " - "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0)); + die("usage: surf [-bBdDfFgGiIkKmMnNpPsStTvwxX]\n" + "[-a cookiepolicies ] [-c cookiefile] [-C stylefile] [-e xid]\n" + "[-r scriptfile] [-u useragent] [-z zoomlevel] [uri]\n"); } void @@ -587,8 +592,9 @@ 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] = curconfig[StrictTLS].val.b ? 'T' : 't'; - togglestats[10] = '\0'; + togglestats[9] = curconfig[Certificate].val.b ? 'X' : 'x'; + togglestats[10] = curconfig[StrictTLS].val.b ? 'T' : 't'; + togglestats[11] = '\0'; } void @@ -632,18 +638,32 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy p) void seturiparameters(Client *c, const char *uri) { + Parameter *newconfig = NULL; int i; for (i = 0; i < LENGTH(uriparams); ++i) { if (uriparams[i].uri && !regexec(&(uriparams[i].re), uri, 0, NULL, 0)) { - curconfig = uriparams[i].config; + newconfig = uriparams[i].config; break; } } - for (i = 0; i < ParameterLast; ++i) - setparameter(c, 0, i, &curconfig[i].val); + if (!newconfig) + newconfig = defconfig; + if (newconfig == curconfig) + return; + + for (i = 0; i < ParameterLast; ++i) { + if (defconfig[i].force) + continue; + if (newconfig[i].force) + setparameter(c, 0, i, &newconfig[i].val); + else if (curconfig[i].force) + setparameter(c, 0, i, &defconfig[i].val); + } + + curconfig = newconfig; } void @@ -677,6 +697,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) WEBKIT_CACHE_MODEL_WEB_BROWSER : WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER); return; /* do not update */ + case DefaultCharset: + webkit_settings_set_default_charset(s, a->v); + return; /* do not update */ case DNSPrefetch: webkit_settings_set_enable_dns_prefetching(s, a->b); return; /* do not update */ @@ -696,6 +719,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) case Inspector: webkit_settings_set_enable_developer_extras(s, a->b); return; /* do not update */ + case Java: + webkit_settings_set_enable_java(s, a->b); + return; /* do not update */ case JavaScript: webkit_settings_set_enable_javascript(s, a->b); break; @@ -788,14 +814,16 @@ setcert(Client *c, const char *uri) return; } - uri = strstr(uri, "://") + sizeof("://") - 1; - host = strndup(uri, strstr(uri, "/") - uri); + if ((uri = strstr(uri, "https://"))) { + uri += sizeof("https://") - 1; + host = g_strndup(uri, strchr(uri, '/') - uri); + webkit_web_context_allow_tls_certificate_for_host( + webkit_web_view_get_context(c->view), cert, host); + g_free(host); + } - webkit_web_context_allow_tls_certificate_for_host( - webkit_web_view_get_context(c->view), cert, host); g_object_unref(cert); - free(host); } const char * @@ -878,7 +906,7 @@ newwindow(Client *c, const Arg *a, int noembed) { int i = 0; char tmp[64]; - const char *cmd[28], *uri; + const char *cmd[29], *uri; const Arg arg = { .v = cmd }; cmd[i++] = argv0; @@ -917,7 +945,8 @@ newwindow(Client *c, const Arg *a, int noembed) cmd[i++] = fulluseragent; } if (showxid) - cmd[i++] = "-x"; + cmd[i++] = "-w"; + cmd[i++] = curconfig[Certificate].val.b ? "-X" : "-x" ; /* do not keep zoom level */ cmd[i++] = "--"; if ((uri = a->v)) @@ -987,6 +1016,7 @@ newview(Client *c, WebKitWebView *rv) } else { settings = webkit_settings_new_with_settings( "auto-load-images", curconfig[LoadImages].val.b, + "default-charset", curconfig[DefaultCharset].val.v, "default-font-size", curconfig[FontSize].val.i, "enable-caret-browsing", curconfig[CaretBrowsing].val.b, "enable-developer-extras", curconfig[Inspector].val.b, @@ -994,13 +1024,14 @@ newview(Client *c, WebKitWebView *rv) "enable-frame-flattening", curconfig[FrameFlattening].val.b, "enable-html5-database", curconfig[DiskCache].val.b, "enable-html5-local-storage", curconfig[DiskCache].val.b, + "enable-java", curconfig[Java].val.b, "enable-javascript", curconfig[JavaScript].val.b, "enable-plugins", curconfig[Plugins].val.b, "enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas].val.b, "enable-site-specific-quirks", curconfig[SiteQuirks].val.b, "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.b, NULL); -/* For mor interesting settings, have a look at +/* For more interesting settings, have a look at * http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */ if (strcmp(fulluseragent, "")) { @@ -1294,7 +1325,9 @@ loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert, GString *errmsg = g_string_new(NULL); gchar *html, *pem; + c->failedcert = g_object_ref(cert); c->tlserr = err; + c->errorpage = 1; if (err & G_TLS_CERTIFICATE_UNKNOWN_CA) g_string_append(errmsg, @@ -1322,7 +1355,9 @@ loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert, g_object_get(cert, "certificate-pem", &pem, NULL); html = g_strdup_printf("

Could not validate TLS for “%s”
%s

" - "

%s

", uri, errmsg->str, pem); + "

You can inspect the following certificate " + "with Ctrl-t (default keybinding).

" + "

%s

", uri, errmsg->str, pem); g_free(pem); g_string_free(errmsg, TRUE); @@ -1339,11 +1374,14 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c) switch (e) { case WEBKIT_LOAD_STARTED: - curconfig = defconfig; setatom(c, AtomUri, title); c->title = title; c->https = c->insecure = 0; seturiparameters(c, geturi(c)); + if (c->errorpage) + c->errorpage = 0; + else + g_clear_object(&c->failedcert); break; case WEBKIT_LOAD_REDIRECTED: setatom(c, AtomUri, title); @@ -1351,7 +1389,7 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c) seturiparameters(c, geturi(c)); break; case WEBKIT_LOAD_COMMITTED: - c->https = webkit_web_view_get_tls_info(c->view, NULL, + c->https = webkit_web_view_get_tls_info(c->view, &c->cert, &c->tlserr); break; case WEBKIT_LOAD_FINISHED: @@ -1604,6 +1642,30 @@ print(Client *c, const Arg *a) GTK_WINDOW(c->win)); } +void +showcert(Client *c, const Arg *a) +{ + GTlsCertificate *cert = c->failedcert ? c->failedcert : c->cert; + GcrCertificate *gcrt; + GByteArray *crt; + GtkWidget *win; + GcrCertificateWidget *wcert; + + if (!cert) + return; + + g_object_get(cert, "certificate", &crt, NULL); + gcrt = gcr_simple_certificate_new(crt->data, crt->len); + g_byte_array_unref(crt); + + win = gtk_window_new(GTK_WINDOW_TOPLEVEL); + wcert = gcr_certificate_widget_new(gcrt); + g_object_unref(gcrt); + + gtk_container_add(GTK_CONTAINER(win), GTK_WIDGET(wcert)); + gtk_widget_show_all(win); +} + void clipboard(Client *c, const Arg *a) { @@ -1862,11 +1924,16 @@ main(int argc, char *argv[]) fulluseragent = EARGF(usage()); break; case 'v': - die("surf-"VERSION", ©2009-2017 surf engineers, " - "see LICENSE for details\n"); - case 'x': + die("surf-"VERSION", see LICENSE for © details\n"); + case 'w': showxid = 1; break; + case 'x': + defconfig CSETB(Certificate, 0); + break; + case 'X': + defconfig CSETB(Certificate, 1); + break; case 'z': defconfig CSETF(ZoomLevel, strtof(EARGF(usage()), NULL)); break;