From 5a0bcaa238288ab728e97ae53d0fc6376bd79c36 Mon Sep 17 00:00:00 2001 From: jun7 Date: Tue, 22 May 2018 15:01:28 +0900 Subject: [PATCH] Separate code --- ab.c | 206 +++++++++++++++++++++++++++++++++++++++++++++ ephy-uri-tester.c | 207 ---------------------------------------------- makefile | 4 +- wyebrun.c | 4 - wyebrun.h | 2 + 5 files changed, 210 insertions(+), 213 deletions(-) create mode 100644 ab.c diff --git a/ab.c b/ab.c new file mode 100644 index 0000000..ef2ca45 --- /dev/null +++ b/ab.c @@ -0,0 +1,206 @@ +//added +#include "wyebrun.h" + +#define EXE "wyebab" + +#if DEBUG +# define D(f, ...) g_print("#"#f"\n", __VA_ARGS__); +# define DD(a) g_print("#"#a"\n"); +#else +# define D(f, ...) ; +# define DD(a) ; +#endif + +#if ISEXT + +#include +static bool first = true; +static bool check(const char *requri, const char *pageuri) +{ + char *uris = g_strconcat(requri, " ", pageuri, NULL); + char *ruri = wyebreq(EXE, uris); + g_free(uris); + + if (ruri && !*ruri) return false; + return true; +} +static gboolean reqcb(WebKitWebPage *page, WebKitURIRequest *req, + WebKitURIResponse *r, gpointer p) +{ + if (g_object_get_data(G_OBJECT(page), "adblock") == (gpointer)'n') + return false; + + const char *requri = webkit_uri_request_get_uri(req); + const char *pageuri = webkit_web_page_get_uri(page); + + if (first) + { + if (webkit_uri_request_get_http_headers(req)) + first = false; + else //no head is local data. so haven't to block + return false; + } + + if (check(requri, pageuri)) return false; + return true; +} + +static gboolean untilcb(WebKitWebPage *kp) +{ + if (g_object_get_data(G_OBJECT(kp), "adblock") != (gpointer)'n') + wyebuntil(EXE, 30); + return true; +} + +static bool apimode = false; +static void pageinit(WebKitWebExtension *ex, WebKitWebPage *kp) +{ + DD(pageinit) + + if (!apimode) + g_signal_connect(kp, "send-request", G_CALLBACK(reqcb), NULL); + + g_object_set_data(G_OBJECT(kp), "wyebcheck", check); + + untilcb(kp); + + //to catch destroy event in shared proc, set loop srcs to the pages + //make sure shared proc is not only the multi web proc but target=_blank or js + g_object_set_data_full(G_OBJECT(kp), "wyebloop", + GUINT_TO_POINTER(g_timeout_add(11 * 1000, (GSourceFunc)untilcb, kp)), + (GDestroyNotify)g_source_remove); +} + +G_MODULE_EXPORT void webkit_web_extension_initialize_with_user_data( + WebKitWebExtension *ex, const GVariant *v) +{ + bool hasarg = false; + const char *str; + if (v && g_variant_is_of_type((GVariant *)v, G_VARIANT_TYPE_STRING) && + (str = g_variant_get_string((GVariant *)v, NULL))) + { + bool enable = true; + char **args = g_strsplit(str, ";", -1); + for (char **arg = args; *arg; arg++) + { + if (g_str_has_prefix(*arg, "adblock:")) + { + enable = !strcmp(*arg + 8, "true"); + hasarg = true; + } + if (!strcmp(*arg, "wyebabapi")) + apimode = true; + } + g_strfreev(args); + if (!enable) return; + } + + if (!hasarg && *(g_getenv("DISABLE_ADBLOCK") ?: "") != '\0') + return; + + g_signal_connect(ex, "page-created", G_CALLBACK(pageinit), NULL); +} + +#else + +#include "ephy-uri-tester.h" +#include "ephy-uri-tester.c" + + + +static EphyUriTester *tester = NULL; +static GThread *initt = NULL; + +static gpointer inittcb(gpointer data) +{ + ephy_uri_tester_load(tester); + return NULL; +} + +static void monitorcb( + GFileMonitor *m, GFile *f, GFile *o, GFileMonitorEvent e, gpointer p) +{ + if (e == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || + e == G_FILE_MONITOR_EVENT_DELETED) + exit(0); +} +static void init() +{ + DD(wyebad init) + char *path = g_build_filename( + g_get_user_config_dir(), APPNAME, "easylist.txt", NULL); + + GFile *gf = g_file_new_for_path(path); + GFileMonitor *gm = g_file_monitor_file(gf, + G_FILE_MONITOR_NONE, NULL, NULL); + g_signal_connect(gm, "changed", G_CALLBACK(monitorcb), NULL); + g_object_unref(gf); + + if (g_file_test(path, G_FILE_TEST_EXISTS)) + { + filter_file = g_file_new_for_path(path); + tester = ephy_uri_tester_new("/foo/bar"); + + initt = g_thread_new("init", inittcb, NULL); + } else { + char *dir = g_path_get_dirname(path); + if (!g_file_test(dir, G_FILE_TEST_EXISTS)) + g_mkdir_with_parents(dir, 0700); + g_free(dir); + } + + g_free(path); +} + +static char *datafunc(char *req) +{ + if (initt) + { + g_thread_join(initt); + initt = NULL; + } + + //req uri + ' ' + page uri + char **args = g_strsplit(req, " ", 2); + + char *ret = !tester ? g_strdup(args[0]) : + ephy_uri_tester_rewrite_uri(tester, args[0], args[1] ?: args[0]); + + g_strfreev(args); + + return ret; +} + + +int main(int argc, char **argv) +{ + DD(This bin is compiled with DEBUG=1) + + if (argc == 1) + { + wyebclient(argv[0]); + } + else if (g_str_has_prefix(argv[1], WYEBPREFIX)) + { + init(); + wyebsvr(argc, argv, datafunc); + } + else if (!strcmp(argv[1], "-css")) + { + init(); + g_thread_join(initt); + + g_print(tester->blockcss->str); + g_print("\n\n\n\n{display:none !important}\n\n\n\n"); + //g_print(tester->blockcssprivate->str); + } + else + { + wyebuntil(argv[0], 30); + g_print("%s", wyebreq(argv[0], argv[1])); + } + + exit(0); +} + +#endif diff --git a/ephy-uri-tester.c b/ephy-uri-tester.c index cbf07db..1265629 100644 --- a/ephy-uri-tester.c +++ b/ephy-uri-tester.c @@ -903,210 +903,3 @@ ephy_uri_tester_load (EphyUriTester *tester) g_strfreev (trash); */ } - - - - -//added -#include -#include - -#include "wyebrun.h" - -#define EXE "wyebab" - -#if DEBUG -# define D(f, ...) g_print("#"#f"\n", __VA_ARGS__); -# define DD(a) g_print("#"#a"\n"); -#else -# define D(f, ...) ; -# define DD(a) ; -#endif - -#if ISEXT - -#include -static bool first = true; -static bool check(const char *requri, const char *pageuri) -{ - char *uris = g_strconcat(requri, " ", pageuri, NULL); - char *ruri = wyebreq(EXE, uris); - g_free(uris); - - if (ruri && !*ruri) return false; - return true; -} -static gboolean reqcb(WebKitWebPage *page, WebKitURIRequest *req, - WebKitURIResponse *r, gpointer p) -{ - if (g_object_get_data(G_OBJECT(page), "adblock") == (gpointer)'n') - return false; - - const char *requri = webkit_uri_request_get_uri(req); - const char *pageuri = webkit_web_page_get_uri(page); - - if (first) - { - if (webkit_uri_request_get_http_headers(req)) - first = false; - else //no head is local data. so haven't to block - return false; - } - - if (check(requri, pageuri)) return false; - return true; -} - -static gboolean untilcb(WebKitWebPage *kp) -{ - if (g_object_get_data(G_OBJECT(kp), "adblock") != (gpointer)'n') - wyebuntil(EXE, 30); - return true; -} - -static bool apimode = false; -static void pageinit(WebKitWebExtension *ex, WebKitWebPage *kp) -{ - DD(pageinit) - - if (!apimode) - g_signal_connect(kp, "send-request", G_CALLBACK(reqcb), NULL); - - g_object_set_data(G_OBJECT(kp), "wyebcheck", check); - - untilcb(kp); - - //to catch destroy event in shared proc, set loop srcs to the pages - //make sure shared proc is not only the multi web proc but target=_blank or js - g_object_set_data_full(G_OBJECT(kp), "wyebloop", - GUINT_TO_POINTER(g_timeout_add(11 * 1000, (GSourceFunc)untilcb, kp)), - (GDestroyNotify)g_source_remove); -} - -G_MODULE_EXPORT void webkit_web_extension_initialize_with_user_data( - WebKitWebExtension *ex, const GVariant *v) -{ - bool hasarg = false; - const char *str; - if (v && g_variant_is_of_type((GVariant *)v, G_VARIANT_TYPE_STRING) && - (str = g_variant_get_string((GVariant *)v, NULL))) - { - bool enable = true; - char **args = g_strsplit(str, ";", -1); - for (char **arg = args; *arg; arg++) - { - if (g_str_has_prefix(*arg, "adblock:")) - { - enable = !strcmp(*arg + 8, "true"); - hasarg = true; - } - if (!strcmp(*arg, "wyebabapi")) - apimode = true; - } - g_strfreev(args); - if (!enable) return; - } - - if (!hasarg && *(g_getenv("DISABLE_ADBLOCK") ?: "") != '\0') - return; - - g_signal_connect(ex, "page-created", G_CALLBACK(pageinit), NULL); -} - -#endif - - -static EphyUriTester *tester = NULL; -static GThread *initt = NULL; - -static gpointer inittcb(gpointer data) -{ - ephy_uri_tester_load(tester); - return NULL; -} - -static void monitorcb( - GFileMonitor *m, GFile *f, GFile *o, GFileMonitorEvent e, gpointer p) -{ - if (e == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || - e == G_FILE_MONITOR_EVENT_DELETED) - exit(0); -} -static void init() -{ - DD(wyebad init) - char *path = g_build_filename( - g_get_user_config_dir(), APPNAME, "easylist.txt", NULL); - - GFile *gf = g_file_new_for_path(path); - GFileMonitor *gm = g_file_monitor_file(gf, - G_FILE_MONITOR_NONE, NULL, NULL); - g_signal_connect(gm, "changed", G_CALLBACK(monitorcb), NULL); - g_object_unref(gf); - - if (g_file_test(path, G_FILE_TEST_EXISTS)) - { - filter_file = g_file_new_for_path(path); - tester = ephy_uri_tester_new("/foo/bar"); - - initt = g_thread_new("init", inittcb, NULL); - } else { - char *dir = g_path_get_dirname(path); - if (!g_file_test(dir, G_FILE_TEST_EXISTS)) - g_mkdir_with_parents(dir, 0700); - g_free(dir); - } - - g_free(path); -} - -static char *datafunc(char *req) -{ - if (initt) - { - g_thread_join(initt); - initt = NULL; - } - - //req uri + ' ' + page uri - char **args = g_strsplit(req, " ", 2); - - char *ret = !tester ? g_strdup(args[0]) : - ephy_uri_tester_rewrite_uri(tester, args[0], args[1] ?: args[0]); - - g_strfreev(args); - - return ret; -} - - -int main(int argc, char **argv) -{ - DD(This bin is compiled with DEBUG=1) - - if (argc == 1) - { - wyebclient(argv[0]); - } - else if (g_str_has_prefix(argv[1], WYEBPREFIX)) - { - init(); - wyebsvr(argc, argv, datafunc); - } - else if (!strcmp(argv[1], "-css")) - { - init(); - g_thread_join(initt); - - g_print(tester->blockcss->str); - g_print("\n\n\n\n{display:none !important}\n\n\n\n"); - //g_print(tester->blockcssprivate->str); - } - else - { - wyebuntil(argv[0], 30); - g_print("%s", wyebreq(argv[0], argv[1])); - } - - exit(0); -} diff --git a/makefile b/makefile index 8fada0c..6faf905 100644 --- a/makefile +++ b/makefile @@ -10,13 +10,13 @@ DDEBUG=-DDEBUG=${DEBUG} all: adblock.so wyebab librun.o testrun -adblock.so: ephy-uri-tester.c ephy-uri-tester.h librun.o makefile +adblock.so: ab.c ephy-uri-tester.c ephy-uri-tester.h librun.o makefile $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< librun.o -shared -fPIC \ `pkg-config --cflags --libs gtk+-3.0 glib-2.0 webkit2gtk-4.0` \ -DEXTENSION_DIR=\"$(EXTENSION_DIR)\" \ $(DDEBUG) $(DAPPNAME) -DISEXT -wyebab: ephy-uri-tester.c ephy-uri-tester.h librun.o makefile +wyebab: ab.c ephy-uri-tester.c ephy-uri-tester.h librun.o makefile $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< librun.o \ `pkg-config --cflags --libs glib-2.0 libsoup-2.4` \ -DEXTENSION_DIR=\"$(EXTENSION_DIR)\" \ diff --git a/wyebrun.c b/wyebrun.c index 4218837..9061402 100644 --- a/wyebrun.c +++ b/wyebrun.c @@ -18,10 +18,6 @@ along with wyebrun. If not, see . */ -#include -#include -#include - //getpid #include #include diff --git a/wyebrun.h b/wyebrun.h index 5d138fb..f907aff 100644 --- a/wyebrun.h +++ b/wyebrun.h @@ -20,6 +20,8 @@ along with wyebrun. If not, see . #ifndef _WYEBRUN_H #define _WYEBRUN_H +#include +#include #define WYEBPREFIX "-wyeb" #define WYEBDUNTIL 3