X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=0f8b9c9174fdf122a058cd3652507796ea076a38;hp=29b9edef0f287035c0f4ca7486e5b2d7cf76ed19;hb=723ff26c3618cf4db1ae34688509cbcdfed1412f;hpb=c64c368d86a4319e43b7ff3d73a4afe0f4e8adf0 diff --git a/surf.c b/surf.c index 29b9ede..0f8b9c9 100644 --- a/surf.c +++ b/surf.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -22,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -31,18 +33,6 @@ #define LENGTH(x) (sizeof(x) / sizeof(x[0])) #define CLEANMASK(mask) (mask & (MODKEY|GDK_SHIFT_MASK)) -#define SETB(p, s) [p] = { { .b = s }, } -#define SETI(p, s) [p] = { { .i = s }, } -#define SETV(p, s) [p] = { { .v = s }, } -#define SETF(p, s) [p] = { { .f = s }, } -#define FSETB(p, s) [p] = { { .b = s }, 1 } -#define FSETI(p, s) [p] = { { .i = s }, 1 } -#define FSETV(p, s) [p] = { { .v = s }, 1 } -#define FSETF(p, s) [p] = { { .f = s }, 1 } -#define CSETB(p, s) [p] = (Parameter){ { .b = s }, 1 } -#define CSETI(p, s) [p] = (Parameter){ { .i = s }, 1 } -#define CSETV(p, s) [p] = (Parameter){ { .v = s }, 1 } -#define CSETF(p, s) [p] = (Parameter){ { .f = s }, 1 } enum { AtomFind, AtomGo, AtomUri, AtomLast }; @@ -59,15 +49,21 @@ enum { typedef enum { AcceleratedCanvas, + AccessMicrophone, + AccessWebcam, CaretBrowsing, + Certificate, CookiePolicies, DiskCache, + DefaultCharset, DNSPrefetch, + FileURLsCrossAccess, FontSize, FrameFlattening, Geolocation, HideBackground, Inspector, + Java, JavaScript, KioskMode, LoadImages, @@ -78,16 +74,16 @@ typedef enum { ScrollBars, ShowIndicators, SiteQuirks, + SmoothScrolling, SpellChecking, SpellLanguages, - StrictSSL, + StrictTLS, Style, ZoomLevel, - ParameterLast, + ParameterLast } ParamName; typedef union { - int b; int i; float f; const void *v; @@ -95,7 +91,7 @@ typedef union { typedef struct { Arg val; - int force; + int prio; } Parameter; typedef struct Client { @@ -104,9 +100,10 @@ typedef struct Client { WebKitWebInspector *inspector; WebKitFindController *finder; WebKitHitTestResult *mousepos; - GTlsCertificateFlags tlsflags; + GTlsCertificate *cert, *failedcert; + GTlsCertificateFlags tlserr; Window xid; - int progress, fullscreen; + int progress, fullscreen, https, insecure, errorpage; const char *title, *overtitle, *targeturi; const char *needle; struct Client *next; @@ -136,9 +133,9 @@ typedef struct { typedef struct { char *regex; - char *style; + char *file; regex_t re; -} SiteStyle; +} SiteSpecific; /* Surf */ static void usage(void); @@ -160,10 +157,12 @@ static void gettogglestats(Client *c); static void getpagestats(Client *c); static WebKitCookieAcceptPolicy cookiepolicy_get(void); static char cookiepolicy_set(const WebKitCookieAcceptPolicy p); -static void seturiparameters(Client *c, const char *uri); +static void seturiparameters(Client *c, const char *uri, ParamName *params); static void setparameter(Client *c, int refresh, ParamName p, const Arg *a); +static const char *getcert(const char *uri); +static void setcert(Client *c, const char *file); static const char *getstyle(const char *uri); -static void setstyle(Client *c, const char *stylefile); +static void setstyle(Client *c, const char *file); static void runscript(Client *c); static void evalscript(Client *c, const char *jsstr, ...); static void updatewinid(Client *c); @@ -175,6 +174,7 @@ static void cleanup(void); /* GTK/WebKit */ static WebKitWebView *newview(Client *c, WebKitWebView *rv); +static void initwebextensions(WebKitWebContext *wc, Client *c); static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c); static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c); @@ -183,6 +183,9 @@ static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c); static void showview(WebKitWebView *v, Client *c); static GtkWidget *createwindow(Client *c); +static gboolean loadfailedtls(WebKitWebView *v, gchar *uri, + GTlsCertificate *cert, + GTlsCertificateFlags err, Client *c); static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c); static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c); static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c); @@ -195,6 +198,8 @@ static gboolean decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d, 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); @@ -206,6 +211,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); @@ -223,7 +229,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[12]; static char pagestats[2]; static Atom atoms[AtomLast]; static Window embed; @@ -235,17 +241,62 @@ static GdkDevice *gdkkb; static char *stylefile; static const char *useragent; static Parameter *curconfig; +static int modparams[ParameterLast]; char *argv0; +static ParamName loadtransient[] = { + Certificate, + CookiePolicies, + DiskCache, + DNSPrefetch, + FileURLsCrossAccess, + JavaScript, + LoadImages, + PreferredLanguages, + ShowIndicators, + StrictTLS, + ParameterLast +}; + +static ParamName loadcommitted[] = { + AcceleratedCanvas, +// AccessMicrophone, +// AccessWebcam, + CaretBrowsing, + DefaultCharset, + FontSize, + FrameFlattening, + Geolocation, + HideBackground, + Inspector, + Java, +// KioskMode, + MediaManualPlay, + Plugins, + RunInFullscreen, + ScrollBars, + SiteQuirks, + SmoothScrolling, + SpellChecking, + SpellLanguages, + Style, + ZoomLevel, + ParameterLast +}; + +static ParamName loadfinished[] = { + ParameterLast +}; + /* configuration, allows nested code to access above variables */ #include "config.h" void usage(void) { - die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] " - "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] " - "[-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 @@ -270,37 +321,51 @@ setup(void) if (signal(SIGHUP, sighup) == SIG_ERR) die("Can't install SIGHUP handler"); - gtk_init(NULL, NULL); - - gdpy = gdk_display_get_default(); - dpy = GDK_DISPLAY_XDISPLAY(gdpy); - - curconfig = defconfig; + if (!(dpy = XOpenDisplay(NULL))) + die("Can't open default display"); /* atoms */ atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False); atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False); atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False); + gtk_init(NULL, NULL); + + gdpy = gdk_display_get_default(); + + curconfig = defconfig; + /* dirs and files */ cookiefile = buildfile(cookiefile); scriptfile = buildfile(scriptfile); cachedir = buildpath(cachedir); + certdir = buildpath(certdir); gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy)); + for (i = 0; i < LENGTH(certs); ++i) { + if (!regcomp(&(certs[i].re), certs[i].regex, REG_EXTENDED)) { + certs[i].file = g_strconcat(certdir, "/", certs[i].file, + NULL); + } else { + fprintf(stderr, "Could not compile regex: %s\n", + certs[i].regex); + certs[i].regex = NULL; + } + } + if (!stylefile) { styledir = buildpath(styledir); for (i = 0; i < LENGTH(styles); ++i) { - if (regcomp(&(styles[i].re), styles[i].regex, + if (!regcomp(&(styles[i].re), styles[i].regex, REG_EXTENDED)) { - fprintf(stderr, - "Could not compile regex: %s\n", + styles[i].file = g_strconcat(styledir, "/", + styles[i].file, NULL); + } else { + fprintf(stderr, "Could not compile regex: %s\n", styles[i].regex); styles[i].regex = NULL; } - styles[i].style = g_strconcat(styledir, "/", - styles[i].style, NULL); } g_free(styledir); } else { @@ -308,20 +373,18 @@ setup(void) } for (i = 0; i < LENGTH(uriparams); ++i) { - if (!regcomp(&(uriparams[i].re), uriparams[i].uri, + if (regcomp(&(uriparams[i].re), uriparams[i].uri, REG_EXTENDED)) { - /* copy default parameters if they are not already set - * or if they are forced */ - for (j = 0; j < ParameterLast; ++j) { - if (!uriparams[i].config[j].force || - defconfig[j].force) - uriparams[i].config[j] = defconfig[j]; - } - } else { - fprintf(stderr, - "Could not compile regex: %s\n", + fprintf(stderr, "Could not compile regex: %s\n", uriparams[i].uri); uriparams[i].uri = NULL; + continue; + } + + /* copy default parameters with higher priority */ + for (j = 0; j < ParameterLast; ++j) { + if (defconfig[j].prio >= uriparams[i].config[j].prio) + uriparams[i].config[j] = defconfig[j]; } } } @@ -338,7 +401,7 @@ sigchld(int unused) void sighup(int unused) { - Arg a = { .b = 0 }; + Arg a = { .i = 0 }; Client *c; for (c = clients; c; c = c->next) @@ -449,7 +512,6 @@ newclient(Client *rc) clients = c; c->progress = 100; - c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; c->view = newview(c, rc ? rc->view : NULL); return c; @@ -502,10 +564,10 @@ geturi(Client *c) void setatom(Client *c, int a, const char *v) { - XSync(dpy, False); XChangeProperty(dpy, c->xid, atoms[a], XA_STRING, 8, PropModeReplace, (unsigned char *)v, strlen(v) + 1); + XSync(dpy, False); } const char * @@ -517,6 +579,7 @@ getatom(Client *c, int a) unsigned long ldummy; unsigned char *p = NULL; + XSync(dpy, False); XGetWindowProperty(dpy, c->xid, atoms[a], 0L, BUFSIZ, False, XA_STRING, &adummy, &idummy, &ldummy, &ldummy, &p); if (p) @@ -535,7 +598,7 @@ updatetitle(Client *c) const char *name = c->overtitle ? c->overtitle : c->title ? c->title : ""; - if (curconfig[ShowIndicators].val.b) { + if (curconfig[ShowIndicators].val.i) { gettogglestats(c); getpagestats(c); @@ -557,22 +620,26 @@ void gettogglestats(Client *c) { togglestats[0] = cookiepolicy_set(cookiepolicy_get()); - togglestats[1] = curconfig[CaretBrowsing].val.b ? 'C' : 'c'; - togglestats[2] = curconfig[Geolocation].val.b ? 'G' : 'g'; - togglestats[3] = curconfig[DiskCache].val.b ? 'D' : 'd'; - togglestats[4] = curconfig[LoadImages].val.b ? 'I' : 'i'; - togglestats[5] = curconfig[JavaScript].val.b ? 'S' : 's'; - 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[1] = curconfig[CaretBrowsing].val.i ? 'C' : 'c'; + togglestats[2] = curconfig[Geolocation].val.i ? 'G' : 'g'; + togglestats[3] = curconfig[DiskCache].val.i ? 'D' : 'd'; + togglestats[4] = curconfig[LoadImages].val.i ? 'I' : 'i'; + togglestats[5] = curconfig[JavaScript].val.i ? 'S' : 's'; + togglestats[6] = curconfig[Plugins].val.i ? 'V' : 'v'; + togglestats[7] = curconfig[Style].val.i ? 'M' : 'm'; + togglestats[8] = curconfig[FrameFlattening].val.i ? 'F' : 'f'; + togglestats[9] = curconfig[Certificate].val.i ? 'X' : 'x'; + togglestats[10] = curconfig[StrictTLS].val.i ? 'T' : 't'; + togglestats[11] = '\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'; } @@ -605,20 +672,33 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy p) } void -seturiparameters(Client *c, const char *uri) +seturiparameters(Client *c, const char *uri, ParamName *params) { - int i; + Parameter *config, *uriconfig = NULL; + int i, p; for (i = 0; i < LENGTH(uriparams); ++i) { if (uriparams[i].uri && !regexec(&(uriparams[i].re), uri, 0, NULL, 0)) { - curconfig = uriparams[i].config; + uriconfig = uriparams[i].config; break; } } - for (i = 0; i < ParameterLast; ++i) - setparameter(c, 0, i, &curconfig[i].val); + curconfig = uriconfig ? uriconfig : defconfig; + + for (i = 0; (p = params[i]) != ParameterLast; ++i) { + switch(p) { + default: /* FALLTHROUGH */ + if (!(defconfig[p].prio < curconfig[p].prio || + defconfig[p].prio < modparams[p])) + continue; + case Certificate: + case CookiePolicies: + case Style: + setparameter(c, 0, p, &curconfig[p].val); + } + } } void @@ -627,14 +707,24 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) GdkRGBA bgcolor = { 0 }; WebKitSettings *s = webkit_web_view_get_settings(c->view); + modparams[p] = curconfig[p].prio; + switch (p) { case AcceleratedCanvas: - webkit_settings_set_enable_accelerated_2d_canvas(s, a->b); + webkit_settings_set_enable_accelerated_2d_canvas(s, a->i); break; + case AccessMicrophone: + return; /* do nothing */ + case AccessWebcam: + return; /* do nothing */ case CaretBrowsing: - webkit_settings_set_enable_caret_browsing(s, a->b); + webkit_settings_set_enable_caret_browsing(s, a->i); refresh = 0; break; + case Certificate: + if (a->i) + setcert(c, geturi(c)); + return; /* do not update */ case CookiePolicies: webkit_cookie_manager_set_accept_policy( webkit_web_context_get_cookie_manager( @@ -644,42 +734,52 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) break; case DiskCache: webkit_web_context_set_cache_model( - webkit_web_view_get_context(c->view), a->b ? + webkit_web_view_get_context(c->view), a->i ? 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); + webkit_settings_set_enable_dns_prefetching(s, a->i); + return; /* do not update */ + case FileURLsCrossAccess: + webkit_settings_set_allow_file_access_from_file_urls(s, a->i); + webkit_settings_set_allow_universal_access_from_file_urls(s, a->i); return; /* do not update */ case FontSize: webkit_settings_set_default_font_size(s, a->i); return; /* do not update */ case FrameFlattening: - webkit_settings_set_enable_frame_flattening(s, a->b); + webkit_settings_set_enable_frame_flattening(s, a->i); break; case Geolocation: refresh = 0; break; case HideBackground: - if (a->b) + if (a->i) webkit_web_view_set_background_color(c->view, &bgcolor); return; /* do not update */ case Inspector: - webkit_settings_set_enable_developer_extras(s, a->b); + webkit_settings_set_enable_developer_extras(s, a->i); + return; /* do not update */ + case Java: + webkit_settings_set_enable_java(s, a->i); return; /* do not update */ case JavaScript: - webkit_settings_set_enable_javascript(s, a->b); + webkit_settings_set_enable_javascript(s, a->i); break; case KioskMode: return; /* do nothing */ case LoadImages: - webkit_settings_set_auto_load_images(s, a->b); + webkit_settings_set_auto_load_images(s, a->i); break; case MediaManualPlay: - webkit_settings_set_media_playback_requires_user_gesture(s, a->b); + webkit_settings_set_media_playback_requires_user_gesture(s, a->i); break; case Plugins: - webkit_settings_set_enable_plugins(s, a->b); + webkit_settings_set_enable_plugins(s, a->i); break; case PreferredLanguages: return; /* do nothing */ @@ -695,27 +795,29 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) return; /* do not update */ case ShowIndicators: break; + case SmoothScrolling: + webkit_settings_set_enable_smooth_scrolling(s, a->i); + return; /* do not update */ case SiteQuirks: - webkit_settings_set_enable_site_specific_quirks(s, a->b); + webkit_settings_set_enable_site_specific_quirks(s, a->i); break; case SpellChecking: webkit_web_context_set_spell_checking_enabled( - webkit_web_view_get_context(c->view), a->b); + webkit_web_view_get_context(c->view), a->i); 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_web_view_get_context(c->view), a->i ? WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE); - return; /* do not update */ + break; case Style: - if (a->b) + webkit_user_content_manager_remove_all_style_sheets( + webkit_web_view_get_user_content_manager(c->view)); + if (a->i) setstyle(c, getstyle(geturi(c))); - else - webkit_user_content_manager_remove_all_style_sheets( - webkit_web_view_get_user_content_manager(c->view)); refresh = 0; break; case ZoomLevel: @@ -730,6 +832,47 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) reload(c, a); } +const char * +getcert(const char *uri) +{ + int i; + + for (i = 0; i < LENGTH(certs); ++i) { + if (certs[i].regex && + !regexec(&(certs[i].re), uri, 0, NULL, 0)) + return certs[i].file; + } + + return NULL; +} + +void +setcert(Client *c, const char *uri) +{ + const char *file = getcert(uri); + char *host; + GTlsCertificate *cert; + + if (!file) + return; + + if (!(cert = g_tls_certificate_new_from_file(file, NULL))) { + fprintf(stderr, "Could not read certificate file: %s\n", file); + return; + } + + 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); + } + + g_object_unref(cert); + +} + const char * getstyle(const char *uri) { @@ -741,19 +884,19 @@ getstyle(const char *uri) 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 ""; } void -setstyle(Client *c, const char *stylefile) +setstyle(Client *c, const char *file) { gchar *style; - if (!g_file_get_contents(stylefile, &style, NULL, NULL)) { - fprintf(stderr, "Could not read style file: %s\n", stylefile); + if (!g_file_get_contents(file, &style, NULL, NULL)) { + fprintf(stderr, "Could not read style file: %s\n", file); return; } @@ -810,45 +953,47 @@ newwindow(Client *c, const Arg *a, int noembed) { int i = 0; char tmp[64]; - const char *cmd[26], *uri; + const char *cmd[29], *uri; const Arg arg = { .v = cmd }; cmd[i++] = argv0; cmd[i++] = "-a"; cmd[i++] = curconfig[CookiePolicies].val.v; - cmd[i++] = curconfig[ScrollBars].val.b ? "-B" : "-b"; + cmd[i++] = curconfig[ScrollBars].val.i ? "-B" : "-b"; if (cookiefile && g_strcmp0(cookiefile, "")) { cmd[i++] = "-c"; cmd[i++] = cookiefile; } - cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d"; + if (stylefile && g_strcmp0(stylefile, "")) { + cmd[i++] = "-C"; + cmd[i++] = stylefile; + } + cmd[i++] = curconfig[DiskCache].val.i ? "-D" : "-d"; if (embed && !noembed) { cmd[i++] = "-e"; snprintf(tmp, LENGTH(tmp), "%lu", embed); cmd[i++] = tmp; } - cmd[i++] = curconfig[RunInFullscreen].val.b ? "-F" : "-f" ; - cmd[i++] = curconfig[Geolocation].val.b ? "-G" : "-g" ; - cmd[i++] = curconfig[LoadImages].val.b ? "-I" : "-i" ; - cmd[i++] = curconfig[KioskMode].val.b ? "-K" : "-k" ; - cmd[i++] = curconfig[Style].val.b ? "-M" : "-m" ; - cmd[i++] = curconfig[Inspector].val.b ? "-N" : "-n" ; - cmd[i++] = curconfig[Plugins].val.b ? "-P" : "-p" ; + cmd[i++] = curconfig[RunInFullscreen].val.i ? "-F" : "-f" ; + cmd[i++] = curconfig[Geolocation].val.i ? "-G" : "-g" ; + cmd[i++] = curconfig[LoadImages].val.i ? "-I" : "-i" ; + cmd[i++] = curconfig[KioskMode].val.i ? "-K" : "-k" ; + cmd[i++] = curconfig[Style].val.i ? "-M" : "-m" ; + cmd[i++] = curconfig[Inspector].val.i ? "-N" : "-n" ; + cmd[i++] = curconfig[Plugins].val.i ? "-P" : "-p" ; if (scriptfile && g_strcmp0(scriptfile, "")) { cmd[i++] = "-r"; 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[JavaScript].val.i ? "-S" : "-s"; + cmd[i++] = curconfig[StrictTLS].val.i ? "-T" : "-t"; if (fulluseragent && g_strcmp0(fulluseragent, "")) { cmd[i++] = "-u"; cmd[i++] = fulluseragent; } if (showxid) - cmd[i++] = "-x"; + cmd[i++] = "-w"; + cmd[i++] = curconfig[Certificate].val.i ? "-X" : "-x" ; /* do not keep zoom level */ cmd[i++] = "--"; if ((uri = a->v)) @@ -900,6 +1045,7 @@ cleanup(void) g_free(scriptfile); g_free(stylefile); g_free(cachedir); + XCloseDisplay(dpy); } WebKitWebView * @@ -916,21 +1062,26 @@ newview(Client *c, WebKitWebView *rv) webkit_web_view_new_with_related_view(rv)); } else { settings = webkit_settings_new_with_settings( - "auto-load-images", curconfig[LoadImages].val.b, - "default-font-size", curconfig[FontSize].val.f, - "enable-caret-browsing", curconfig[CaretBrowsing].val.b, - "enable-developer-extras", curconfig[Inspector].val.b, - "enable-dns-prefetching", curconfig[DNSPrefetch].val.b, - "enable-frame-flattening", curconfig[FrameFlattening].val.b, - "enable-html5-database", curconfig[DiskCache].val.b, - "enable-html5-local-storage", curconfig[DiskCache].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, + "allow-file-access-from-file-urls", curconfig[FileURLsCrossAccess].val.i, + "allow-universal-access-from-file-urls", curconfig[FileURLsCrossAccess].val.i, + "auto-load-images", curconfig[LoadImages].val.i, + "default-charset", curconfig[DefaultCharset].val.v, + "default-font-size", curconfig[FontSize].val.i, + "enable-caret-browsing", curconfig[CaretBrowsing].val.i, + "enable-developer-extras", curconfig[Inspector].val.i, + "enable-dns-prefetching", curconfig[DNSPrefetch].val.i, + "enable-frame-flattening", curconfig[FrameFlattening].val.i, + "enable-html5-database", curconfig[DiskCache].val.i, + "enable-html5-local-storage", curconfig[DiskCache].val.i, + "enable-java", curconfig[Java].val.i, + "enable-javascript", curconfig[JavaScript].val.i, + "enable-plugins", curconfig[Plugins].val.i, + "enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas].val.i, + "enable-site-specific-quirks", curconfig[SiteQuirks].val.i, + "enable-smooth-scrolling", curconfig[SmoothScrolling].val.i, + "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.i, 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, "")) { @@ -953,13 +1104,13 @@ newview(Client *c, WebKitWebView *rv) * 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.i ? WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE); /* disk cache */ webkit_web_context_set_cache_model(context, - curconfig[DiskCache].val.b ? WEBKIT_CACHE_MODEL_WEB_BROWSER : + curconfig[DiskCache].val.i ? WEBKIT_CACHE_MODEL_WEB_BROWSER : WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER); /* Currently only works with text file to be compatible with curl */ @@ -976,10 +1127,12 @@ newview(Client *c, WebKitWebView *rv) webkit_web_context_set_spell_checking_languages(context, curconfig[SpellLanguages].val.v); webkit_web_context_set_spell_checking_enabled(context, - curconfig[SpellChecking].val.b); + curconfig[SpellChecking].val.i); g_signal_connect(G_OBJECT(context), "download-started", G_CALLBACK(downloadstarted), c); + g_signal_connect(G_OBJECT(context), "initialize-web-extensions", + G_CALLBACK(initwebextensions), c); v = g_object_new(WEBKIT_TYPE_WEB_VIEW, "settings", settings, @@ -1000,6 +1153,10 @@ newview(Client *c, WebKitWebView *rv) 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-failed-with-tls-errors", + G_CALLBACK(loadfailedtls), c); g_signal_connect(G_OBJECT(v), "load-changed", G_CALLBACK(loadchanged), c); g_signal_connect(G_OBJECT(v), "mouse-target-changed", @@ -1012,6 +1169,12 @@ newview(Client *c, WebKitWebView *rv) return v; } +void +initwebextensions(WebKitWebContext *wc, Client *c) +{ + webkit_web_context_set_web_extensions_directory(wc, WEBEXTDIR); +} + GtkWidget * createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c) { @@ -1097,7 +1260,7 @@ winevent(GtkWidget *w, GdkEvent *e, Client *c) updatetitle(c); break; case GDK_KEY_PRESS: - if (!curconfig[KioskMode].val.b) { + if (!curconfig[KioskMode].val.i) { for (i = 0; i < LENGTH(keys); ++i) { if (gdk_keyval_to_lower(e->key.keyval) == keys[i].keyval && @@ -1149,15 +1312,15 @@ showview(WebKitWebView *v, Client *c) puts(winid); } - if (curconfig[HideBackground].val.b) + if (curconfig[HideBackground].val.i) webkit_web_view_set_background_color(c->view, &bgcolor); - if (!curconfig[KioskMode].val.b) { + if (!curconfig[KioskMode].val.i) { gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK); gdk_window_add_filter(gwin, processx, c); } - if (curconfig[RunInFullscreen].val.b) + if (curconfig[RunInFullscreen].val.i) togglefullscreen(c, NULL); if (curconfig[ZoomLevel].val.f != 1.0) @@ -1188,7 +1351,7 @@ createwindow(Client *c) 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", @@ -1205,31 +1368,83 @@ createwindow(Client *c) return w; } +gboolean +loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert, + GTlsCertificateFlags err, Client *c) +{ + 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, + "The signing certificate authority is not known.
"); + if (err & G_TLS_CERTIFICATE_BAD_IDENTITY) + g_string_append(errmsg, + "The certificate does not match the expected identity " + "of the site that it was retrieved from.
"); + if (err & G_TLS_CERTIFICATE_NOT_ACTIVATED) + g_string_append(errmsg, + "The certificate's activation time " + "is still in the future.
"); + if (err & G_TLS_CERTIFICATE_EXPIRED) + g_string_append(errmsg, "The certificate has expired.
"); + if (err & G_TLS_CERTIFICATE_REVOKED) + g_string_append(errmsg, + "The certificate has been revoked according to " + "the GTlsConnection's certificate revocation list.
"); + if (err & G_TLS_CERTIFICATE_INSECURE) + g_string_append(errmsg, + "The certificate's algorithm is considered insecure.
"); + if (err & G_TLS_CERTIFICATE_GENERIC_ERROR) + g_string_append(errmsg, + "Some error occurred validating the certificate.
"); + + g_object_get(cert, "certificate-pem", &pem, NULL); + html = g_strdup_printf("

Could not validate TLS for “%s”
%s

" + "

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

" + "

%s

", uri, errmsg->str, pem); + g_free(pem); + g_string_free(errmsg, TRUE); + + webkit_web_view_load_alternate_html(c->view, html, uri, NULL); + g_free(html); + + return TRUE; +} + void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c) { - const char *title = geturi(c); + const char *uri = geturi(c); switch (e) { case WEBKIT_LOAD_STARTED: - curconfig = defconfig; - setatom(c, AtomUri, title); - c->title = title; - c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1; - seturiparameters(c, geturi(c)); + setatom(c, AtomUri, uri); + c->title = uri; + c->https = c->insecure = 0; + seturiparameters(c, uri, loadtransient); + if (c->errorpage) + c->errorpage = 0; + else + g_clear_object(&c->failedcert); break; case WEBKIT_LOAD_REDIRECTED: - setatom(c, AtomUri, title); - c->title = title; - seturiparameters(c, geturi(c)); + setatom(c, AtomUri, uri); + c->title = uri; + seturiparameters(c, uri, loadtransient); 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; - + seturiparameters(c, uri, loadcommitted); + c->https = webkit_web_view_get_tls_info(c->view, &c->cert, + &c->tlserr); break; case WEBKIT_LOAD_FINISHED: + seturiparameters(c, uri, loadfinished); /* Disabled until we write some WebKitWebExtension for * manipulating the DOM directly. evalscript(c, "document.documentElement.style.overflow = '%s'", @@ -1281,15 +1496,27 @@ mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers, gboolean permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c) { + ParamName param = ParameterLast; + if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) { - if (curconfig[Geolocation].val.b) - webkit_permission_request_allow(r); - else - webkit_permission_request_deny(r); - return TRUE; + param = Geolocation; + } else if (WEBKIT_IS_USER_MEDIA_PERMISSION_REQUEST(r)) { + if (webkit_user_media_permission_is_for_audio_device( + WEBKIT_USER_MEDIA_PERMISSION_REQUEST(r))) + param = AccessMicrophone; + else if (webkit_user_media_permission_is_for_video_device( + WEBKIT_USER_MEDIA_PERMISSION_REQUEST(r))) + param = AccessWebcam; + } else { + return FALSE; } - return FALSE; + if (curconfig[param].val.i) + webkit_permission_request_allow(r); + else + webkit_permission_request_deny(r); + + return TRUE; } gboolean @@ -1414,6 +1641,12 @@ decideresource(WebKitPolicyDecision *d, Client *c) } } +void +insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, Client *c) +{ + c->insecure = 1; +} + void downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c) { @@ -1460,7 +1693,7 @@ pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) void reload(Client *c, const Arg *a) { - if (a->b) + if (a->i) webkit_web_view_reload_bypass_cache(c->view); else webkit_web_view_reload(c->view); @@ -1473,10 +1706,34 @@ 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) { - if (a->b) { /* load clipboard uri */ + if (a->i) { /* load clipboard uri */ gtk_clipboard_request_text(gtk_clipboard_get( GDK_SELECTION_PRIMARY), pasteuri, c); @@ -1554,7 +1811,7 @@ stop(Client *c, const Arg *a) void toggle(Client *c, const Arg *a) { - curconfig[a->i].val.b ^= 1; + curconfig[a->i].val.i ^= 1; setparameter(c, 1, (ParamName)a->i, &curconfig[a->i].val); } @@ -1582,7 +1839,7 @@ toggleinspector(Client *c, const Arg *a) { if (webkit_web_inspector_is_attached(c->inspector)) webkit_web_inspector_close(c->inspector); - else if (curconfig[Inspector].val.b) + else if (curconfig[Inspector].val.i) webkit_web_inspector_show(c->inspector); } @@ -1624,7 +1881,7 @@ clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h) Arg arg; arg.v = webkit_hit_test_result_get_link_uri(h); - newwindow(c, &arg, a->b); + newwindow(c, &arg, a->i); } void @@ -1647,91 +1904,128 @@ main(int argc, char *argv[]) /* command line args */ ARGBEGIN { case 'a': - defconfig CSETV(CookiePolicies, EARGF(usage())); + defconfig[CookiePolicies].val.v = EARGF(usage()); + defconfig[CookiePolicies].prio = 2; break; case 'b': - defconfig CSETB(ScrollBars, 0); + defconfig[ScrollBars].val.i = 0; + defconfig[ScrollBars].prio = 2; break; case 'B': - defconfig CSETB(ScrollBars, 1); + defconfig[ScrollBars].val.i = 1; + defconfig[ScrollBars].prio = 2; break; case 'c': cookiefile = EARGF(usage()); break; + case 'C': + stylefile = EARGF(usage()); + break; case 'd': - defconfig CSETB(DiskCache, 0); + defconfig[DiskCache].val.i = 0; + defconfig[DiskCache].prio = 2; break; case 'D': - defconfig CSETB(DiskCache, 1); + defconfig[DiskCache].val.i = 1; + defconfig[DiskCache].prio = 2; break; case 'e': embed = strtol(EARGF(usage()), NULL, 0); break; case 'f': - defconfig CSETB(RunInFullscreen, 0); + defconfig[RunInFullscreen].val.i = 0; + defconfig[RunInFullscreen].prio = 2; break; case 'F': - defconfig CSETB(RunInFullscreen, 1); + defconfig[RunInFullscreen].val.i = 1; + defconfig[RunInFullscreen].prio = 2; break; case 'g': - defconfig CSETB(Geolocation, 0); + defconfig[Geolocation].val.i = 0; + defconfig[Geolocation].prio = 2; break; case 'G': - defconfig CSETB(Geolocation, 1); + defconfig[Geolocation].val.i = 1; + defconfig[Geolocation].prio = 2; break; case 'i': - defconfig CSETB(LoadImages, 0); + defconfig[LoadImages].val.i = 0; + defconfig[LoadImages].prio = 2; break; case 'I': - defconfig CSETB(LoadImages, 1); + defconfig[LoadImages].val.i = 1; + defconfig[LoadImages].prio = 2; break; case 'k': - defconfig CSETB(KioskMode, 0); + defconfig[KioskMode].val.i = 0; + defconfig[KioskMode].prio = 2; break; case 'K': - defconfig CSETB(KioskMode, 1); + defconfig[KioskMode].val.i = 1; + defconfig[KioskMode].prio = 2; break; case 'm': - defconfig CSETB(Style, 0); + defconfig[Style].val.i = 0; + defconfig[Style].prio = 2; break; case 'M': - defconfig CSETB(Style, 1); + defconfig[Style].val.i = 1; + defconfig[Style].prio = 2; break; case 'n': - defconfig CSETB(Inspector, 0); + defconfig[Inspector].val.i = 0; + defconfig[Inspector].prio = 2; break; case 'N': - defconfig CSETB(Inspector, 1); + defconfig[Inspector].val.i = 1; + defconfig[Inspector].prio = 2; break; case 'p': - defconfig CSETB(Plugins, 0); + defconfig[Plugins].val.i = 0; + defconfig[Plugins].prio = 2; break; case 'P': - defconfig CSETB(Plugins, 1); + defconfig[Plugins].val.i = 1; + defconfig[Plugins].prio = 2; break; case 'r': scriptfile = EARGF(usage()); break; case 's': - defconfig CSETB(JavaScript, 0); + defconfig[JavaScript].val.i = 0; + defconfig[JavaScript].prio = 2; break; case 'S': - defconfig CSETB(JavaScript, 1); + defconfig[JavaScript].val.i = 1; + defconfig[JavaScript].prio = 2; break; case 't': - stylefile = EARGF(usage()); + defconfig[StrictTLS].val.i = 0; + defconfig[StrictTLS].prio = 2; + break; + case 'T': + defconfig[StrictTLS].val.i = 1; + defconfig[StrictTLS].prio = 2; break; case 'u': fulluseragent = EARGF(usage()); break; case 'v': - die("surf-"VERSION", ©2009-2015 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[Certificate].val.i = 0; + defconfig[Certificate].prio = 2; + break; + case 'X': + defconfig[Certificate].val.i = 1; + defconfig[Certificate].prio = 2; + break; case 'z': - defconfig CSETF(ZoomLevel, strtof(EARGF(usage()), NULL)); + defconfig[ZoomLevel].val.f = strtof(EARGF(usage()), NULL); + defconfig[ZoomLevel].prio = 2; break; default: usage();