From: Alan Knowles Date: Thu, 8 Oct 2020 08:38:57 +0000 (+0800) Subject: optional javascript for screenshots X-Git-Url: http://git.roojs.org/?p=app.webkitpdf;a=commitdiff_plain;h=6d2f96c1d01f452707f50a7928525745e5c3407b optional javascript for screenshots --- diff --git a/BrowserWindow.bjs b/BrowserWindow.bjs index 62a1cbb..ccfb659 100644 --- a/BrowserWindow.bjs +++ b/BrowserWindow.bjs @@ -26,7 +26,7 @@ { "id" : "view", "string cookie_file" : "", - "* init" : "\n\n{\n\t\tthis.load_try = 0;\n\n#if GTK3\n\t\t this.el.load_changed.connect( (ev ) => {\n \t\tif (ev != WebKit.LoadEvent.FINISHED) {\n\t\t \t\treturn;\t \n \t\t }\n \t\t \n this.printit(); \n\t \n \n });\n \n\t\t\tthis.el.resource_load_started.connect( (resource, request) => {\n\t\t\t\tprint(\"Adding referrer header %s\\n\" , request.get_uri());\n\t\t\t\t\n\t\t\t\tif (request.get_http_headers() != null) {\n\t \t\t\t\trequest.get_http_headers().remove(\"Referer\");\t\t\n\t \t\t\t\trequest.get_http_headers().append(\"Referer\", request.get_uri());\n\t\t\t\t}\n });\n var settings = this.el.get_settings();\n\t\t\tsettings.set_user_agent( \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36\" );\n\t\t\tsettings.hardware_acceleration_policy = WebKit.HardwareAccelerationPolicy.NEVER;\n\t\t\tsettings.enable_accelerated_2d_canvas = false;\n\t\t\t\n\t\t\tWebKit.WebContext.get_default().set_tls_errors_policy(\tWebKit.TLSErrorsPolicy.IGNORE );\n \n#else\n //listeners\n // this.el.resource_request_starting.connect( (p0, webres, netreq ) => {\n // print(\"resource req. started %s\\n\", netreq.uri);\n \n // });\n \n this.el.load_finished.connect( ( ) => {\n \t\t\n \t\t\n this.printit(); \n \n });\n WebKit.get_default_session().request_started.connect((message, socket) => {\n \t Soup.URI uri = message.get_uri();\n\t\t\t\n\t\t\t\tvar host = uri.get_host ();\n\n\t\t\t\tprint(\"Adding header http://%s/\\n\", host);\n\t\t\t\tmessage.request_headers.remove(\"Referer\");\t\t\t\t\n\t\t\t\tmessage.request_headers.append(\"Referer\", \"http://\"+host+\"/\");\n\t\t\t\t\n \n });\n var sess = WebKit.get_default_session();\n\t\t\tsess.user_agent= \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36\";\n\t\t\tsess.ssl_strict = false;\n \n#endif\n}\n\t \tthis.cookie_file = \"\";\n\t\tif (webkitpdf.opt_cookies != null) {\n\t\t\tprint(\"setting cookie %s\\n\",webkitpdf.opt_cookies);\n\n\t\t\tvar uri = new Soup.URI (webkitpdf.opt_url);\n\t\t\t\n\t\t\tstring[] cookies = webkitpdf.opt_cookies.split (\"=\", 2);\n\n\t\t\tif(cookies.length > 1 ) {\n\t\t\t\t\t \n\t\t\t#if GTK3\t\n\t\t\t\tvar context = WebKit.WebContext.get_default();\t \n\t\t\t\tvar cookie_manager = context.get_cookie_manager();\n\t\t\t\tcookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER);\n\t\t\t\tstring scheme = uri.get_scheme ();\n\t\t\t\n\t\t\t\ttry { \n\t\t\t\t FileIOStream iostream;\t\t \n\t\t\t\t File file = File.new_tmp (\"cookie-XXXXXX.txt\", out iostream);\n\t\t\t\t this.cookie_file = file.get_path (); \n\t\t\t\t print(\"cookie tmp file name: %s\\n\", file.get_path ());\n\t\t \t \n\t\t\t\t OutputStream ostream = iostream.output_stream;\n\t\t\t\t DataOutputStream dostream = new DataOutputStream (ostream);\t\t\t\t\t \n\t\t\t\t dostream.put_string (\"%s\\tTRUE\\t/\\t%s\\t2147483647\\t%s\\t%s\".printf(uri.get_host(),scheme == \"http\" ? \"FALSE\" : \"TRUE\",cookies[0],cookies[1]));\t\t \n\t\t\t\t cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT);\t\t \n\t\t\t\t} catch (Error e) {\n\t\t\t\t stdout.printf (\"Error: %s\\n\", e.message);\n\t\t\t\t} \t\t\n\t\t\t#else\n\t\t\t\t\tvar cookie_jar = new Soup.CookieJar();\t\t\n\t\t\t\tvar cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), \"/\", -1);\n\t\t\t\tif(uri.get_scheme() ==\"https\") {\n\t\t\t\t cookie.set_secure(true); \n\t\t\t\t}\t \n\t\t\t\tcookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER);\t\t\t\t \n\t\t\t\tcookie_jar.add_cookie(cookie);\t\t\t \n\t\t\t\tWebKit.get_default_session().add_feature(cookie_jar);\n\t\t\t#endif\n\t\t\t\t\t \t\t\t \t\t\t \n\t\t\t}\n\n\t\t} \n // init method", + "* init" : "\n\n{\n\t\tthis.load_try = 0;\n\n#if GTK3\n\t\t this.el.load_changed.connect( (ev ) => {\n \t\tif (ev != WebKit.LoadEvent.FINISHED) {\n\t\t \t\treturn;\t \n \t\t }\n \t\t \n this.printit(); \n\t \n \n });\n \n\t\t\tthis.el.resource_load_started.connect( (resource, request) => {\n\t\t\t//\tprint(\"Adding referrer header %s\\n\" , request.get_uri());\n\t\t\t\t\n\t\t\t\tif (request.get_http_headers() != null) {\n\t \t\t\t\trequest.get_http_headers().remove(\"Referer\");\t\t\n\t \t\t\t\trequest.get_http_headers().append(\"Referer\", request.get_uri());\n\t\t\t\t}\n });\n var settings = this.el.get_settings();\n\t\t\tsettings.set_user_agent( \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36\" );\n\t\t\tsettings.hardware_acceleration_policy = WebKit.HardwareAccelerationPolicy.NEVER;\n\t\t\tsettings.enable_accelerated_2d_canvas = false;\n\t\t\tif (webkitpdf.opt_disable_javascript) { \n\t \t\t\tsettings.enable_javascript = false;\n \t\t\t}\n\n\t\t\tWebKit.WebContext.get_default().set_tls_errors_policy(\tWebKit.TLSErrorsPolicy.IGNORE );\n \n#else\n //listeners\n // this.el.resource_request_starting.connect( (p0, webres, netreq ) => {\n // print(\"resource req. started %s\\n\", netreq.uri);\n \n // });\n \n this.el.load_finished.connect( ( ) => {\n \t\t \n this.printit(); \n \n });\n WebKit.get_default_session().request_started.connect((message, socket) => {\n \t Soup.URI uri = message.get_uri();\n\t\t\t\n\t\t\t\tvar host = uri.get_host ();\n\t\t\t\tif (host.contains(\"google-analytics\") || host.contains(\"googlesyndication\") || host.contains(\"facebook\") ) {\n\t\t\t\t\tprint(\"DISCONNECTING: %s\\n\", host);\n\t\t\t\t\tsocket.disconnect();\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tprint(\"Adding header: %s\\n\", uri.to_string(false));\n\t\t\t\tmessage.request_headers.remove(\"Referer\");\t\t\t\t\n\t\t\t\tmessage.request_headers.append(\"Referer\", \"http://\"+host+\"/\");\n\t\t\t\t\n \n });\n var sess = WebKit.get_default_session();\n\t\t\tsess.user_agent= \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36\";\n\t\t\tsess.ssl_strict = false;\n\t\t\t\n var settings = this.el.get_settings();\n \n\t\t\tsettings.enable_webgl = false;\n\t\t\tsettings.enable_plugins = false;\n\t\t\tsettings.enable_java_applet = false;\n\t\t\tif (webkitpdf.opt_disable_javascript) { \n\t \t\t\tsettings.enable_scripts = false;\n \t\t\t}\n\t\t\t\n\t\t\t\n\t\t\tthis.el.console_message.connect((msg, line, sid) => {\n\t\t\t\tprint(\"CONSOLE: %s:%d %s\\n\", sid, line, msg);\n\t\t\t\treturn false;\n\t\t\t});\n\t\t\tthis.el.create_web_view.connect((frame) => {\n\t\t\t\tprint(\"WEBFRAME:%s\\n\", frame.uri);\n \t\t\t\treturn new WebKit.WebView();\n\t\t\t});\n \n#endif\n}\n\t \tthis.cookie_file = \"\";\n\t\tif (webkitpdf.opt_cookies != null) {\n\t\t\tprint(\"setting cookie %s\\n\",webkitpdf.opt_cookies);\n\n\t\t\tvar uri = new Soup.URI (webkitpdf.opt_url);\n\t\t\t\n\t\t\tstring[] cookies = webkitpdf.opt_cookies.split (\"=\", 2);\n\n\t\t\tif(cookies.length > 1 ) {\n\t\t\t\t\t \n\t\t\t#if GTK3\t\n\t\t\t\tvar context = WebKit.WebContext.get_default();\t \n\t\t\t\tvar cookie_manager = context.get_cookie_manager();\n\t\t\t\tcookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER);\n\t\t\t\tstring scheme = uri.get_scheme ();\n\t\t\t\n\t\t\t\ttry { \n\t\t\t\t FileIOStream iostream;\t\t \n\t\t\t\t File file = File.new_tmp (\"cookie-XXXXXX.txt\", out iostream);\n\t\t\t\t this.cookie_file = file.get_path (); \n\t\t\t\t print(\"cookie tmp file name: %s\\n\", file.get_path ());\n\t\t \t \n\t\t\t\t OutputStream ostream = iostream.output_stream;\n\t\t\t\t DataOutputStream dostream = new DataOutputStream (ostream);\t\t\t\t\t \n\t\t\t\t dostream.put_string (\"%s\\tTRUE\\t/\\t%s\\t2147483647\\t%s\\t%s\".printf(uri.get_host(),scheme == \"http\" ? \"FALSE\" : \"TRUE\",cookies[0],cookies[1]));\t\t \n\t\t\t\t cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT);\t\t \n\t\t\t\t} catch (Error e) {\n\t\t\t\t stdout.printf (\"Error: %s\\n\", e.message);\n\t\t\t\t} \t\t\n\t\t\t#else\n\t\t\t\tvar cookie_jar = new Soup.CookieJar();\t\t\n\t\t\t\tvar cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), \"/\", -1);\n\t\t\t\tif(uri.get_scheme() ==\"https\") {\n\t\t\t\t cookie.set_secure(true); \n\t\t\t\t}\t \n\t\t\t\tcookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER);\t\t\t\t \n\t\t\t\tcookie_jar.add_cookie(cookie);\t\t\t \n\t\t\t\tWebKit.get_default_session().add_feature(cookie_jar);\n\t\t\t#endif\n\t\t\t\t\t \t\t\t \t\t\t \n\t\t\t}\n\n\t\t} \n // init method", "| void printit" : "() {\n print(\"load_finsihed\\n\");\n \n if (this.print_started) {\n print(\"load_finsihed - already printing..%d %s\\n\", this.load_try, this.el.uri);\n \n \n \n \n return;\n }\n \n \n this.print_started = true; // flag to stop double call.\n \n \n\t// inject any javascript if needed..\n\tif (webkitpdf.opt_inject_js != null) {\n\t\n\t\tprint(\"injecting javascript files \\n\");\n\t\tforeach(var inject_js in webkitpdf.opt_inject_js) {\n\t\tprint(\"inject? %s\\n\", inject_js);\n\t\t\tstring str;\n\t\t\ttry {\n\t\t\t\tFileUtils.get_contents( inject_js, out str);\n\t\t\t} catch(FileError e) {\n\t\t\t\tprint(\"Failed to inject %s\\n\", inject_js);\n\t\t\t\tcontinue;\n\t\t\t}\n#if GTK3\n\t\t\tGLib.MainLoop mainloop = new GLib.MainLoop();\n\t\t\tthis.el.run_javascript.begin(str, null, (obj,res) => {\n\t\t\t\tmainloop.quit();\n\t\t\t});\n\t\t\tmainloop.run();\n\t\t\t\n#else \t\t\t\n\t\t\tthis.el.execute_script(str);\n#endif\n\t\t}\n\t}\n\t \n\tprint(\"calling print in %d seconds\\n\", (int)webkitpdf.opt_delay);\n\tif (webkitpdf.opt_target_pdf != null) {\n\t\tGLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n\t\t\tprint(\"delay done URL: %s\\n\", this.el.uri);\n\t\t\n\t\t\t \n\t\t\tthis.printpdf();\n\t\t\t return false;\n\t\t}, GLib.Priority.DEFAULT);\n\t\treturn;\n\t}\n\t\t\n\n#if GTK3\n\tGLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n\t\t\tprint(\"delay done URL: %s\\n\", this.el.uri);\n\t\t\tthis.printpng();\t\n\t\t\treturn false;\n\t\t}, GLib.Priority.DEFAULT);\n\t\treturn;\n#else\n\t\t\n GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n \n\t\t\n\t\t// ----------------- JPEG \n\t\t// resize the window...\n\t\t// window.document.documentElement.scrollHeight\n\t\tvar scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height;\n\t\tprint(\"Scroll height %d\\n\", scroll_height);\n\t\tif (scroll_height> 1024 || webkitpdf.opt_width > 0 || webkitpdf.opt_height > 0 ) {\n\t\t\tvar w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200;\n\t\t\tvar h = int.min(scroll_height, 6000);\n\t\t\t_this.scrolled_window.el.set_size_request( w, h); \n\t\t\t_this.el.resize (w+50, h+50);\n\t\t\tprint(\"Resize to %d, %d\\n\", w,h);\n\t\t GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { \n\t\t\t\tthis.printpng();\n\t\t\t\treturn false;\n\t\t\t }, GLib.Priority.DEFAULT);\n \t\t return false;\n\t\t}\n\t\tthis.printpng();\t\t\n\t\treturn false;\n\t }, GLib.Priority.DEFAULT);\n\n\n#endif \n \n}\n", "* pack" : "add", "xtype" : "WebView", diff --git a/BrowserWindow.vala b/BrowserWindow.vala index 4bd8e99..55f24b6 100644 --- a/BrowserWindow.vala +++ b/BrowserWindow.vala @@ -148,7 +148,7 @@ public class BrowserWindow : Object }); this.el.resource_load_started.connect( (resource, request) => { - print("Adding referrer header %s\n" , request.get_uri()); + // print("Adding referrer header %s\n" , request.get_uri()); if (request.get_http_headers() != null) { request.get_http_headers().remove("Referer"); @@ -159,7 +159,10 @@ public class BrowserWindow : Object settings.set_user_agent( "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36" ); settings.hardware_acceleration_policy = WebKit.HardwareAccelerationPolicy.NEVER; settings.enable_accelerated_2d_canvas = false; - + if (webkitpdf.opt_disable_javascript) { + settings.enable_javascript = false; + } + WebKit.WebContext.get_default().set_tls_errors_policy( WebKit.TLSErrorsPolicy.IGNORE ); #else @@ -170,8 +173,7 @@ public class BrowserWindow : Object // }); this.el.load_finished.connect( ( ) => { - - + this.printit(); }); @@ -179,8 +181,13 @@ public class BrowserWindow : Object Soup.URI uri = message.get_uri(); var host = uri.get_host (); + if (host.contains("google-analytics") || host.contains("googlesyndication") || host.contains("facebook") ) { + print("DISCONNECTING: %s\n", host); + socket.disconnect(); + return; + } - print("Adding header http://%s/\n", host); + print("Adding header: %s\n", uri.to_string(false)); message.request_headers.remove("Referer"); message.request_headers.append("Referer", "http://"+host+"/"); @@ -189,6 +196,25 @@ public class BrowserWindow : Object var sess = WebKit.get_default_session(); sess.user_agent= "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36"; sess.ssl_strict = false; + + var settings = this.el.get_settings(); + + settings.enable_webgl = false; + settings.enable_plugins = false; + settings.enable_java_applet = false; + if (webkitpdf.opt_disable_javascript) { + settings.enable_scripts = false; + } + + + this.el.console_message.connect((msg, line, sid) => { + print("CONSOLE: %s:%d %s\n", sid, line, msg); + return false; + }); + this.el.create_web_view.connect((frame) => { + print("WEBFRAME:%s\n", frame.uri); + return new WebKit.WebView(); + }); #endif } @@ -222,7 +248,7 @@ public class BrowserWindow : Object stdout.printf ("Error: %s\n", e.message); } #else - var cookie_jar = new Soup.CookieJar(); + var cookie_jar = new Soup.CookieJar(); var cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1); if(uri.get_scheme() =="https") { cookie.set_secure(true); diff --git a/webkitpdf.vala b/webkitpdf.vala index e9ececc..c5941e6 100644 --- a/webkitpdf.vala +++ b/webkitpdf.vala @@ -3,7 +3,7 @@ sudo valac --vapidir=. --thread webkitpdf.vala BrowserWindow.vala --vapidir=./vapi \ --pkg glib-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 -o /usr/bin/webkitpdf --target-glib=2.32 - sudo valac -D GTK3 --vapidir=. --thread webkitpdf.vala BrowserWindow.vala --vapidir=./vapi \ + sudo valac -D GTK3 webkitpdf.vala BrowserWindow.vala --vapidir=./vapi \ --pkg glib-2.0 --pkg webkit2gtk-4.0 --pkg gtk+-3.0 --pkg gio-2.0 -o /usr/bin/webkitpdf2 --target-glib=2.32 @@ -11,6 +11,7 @@ */ public class webkitpdf { + public static bool opt_disable_javascript = false; public static string? opt_url = null; public static uint opt_delay = 0; public static int opt_width = 0; @@ -31,6 +32,7 @@ public class webkitpdf { { "inject", 0, 0, OptionArg.STRING_ARRAY, ref opt_inject_js, "Inject Javascript file(s)", null }, { "pdf", 0, 0, OptionArg.STRING, ref opt_target_pdf, "File to write (PDF)", null }, { "cookies", 0, 0, OptionArg.STRING, ref opt_cookies, "Inject Cookie string", null }, + { "disable-javascript", 0, 0, OptionArg.NONE, ref opt_disable_javascript, "Disable Javascript..", null }, { null } }; public static int main(string[] args)