From 9a8659a7d97184708529ea3d1fc49b923de97424 Mon Sep 17 00:00:00 2001 From: Diamond Creeper Date: Tue, 16 Apr 2024 20:16:08 +1200 Subject: [PATCH] Update Added a new page in new tab "Online Shopping". Added the ability to pull the filtering lists from diamondcreeper.org web filtering. Added malicious domain blocking. Fixed the tiktok DRM site block. Added some more links in new tab page. --- WebBrowser/RequestHandler.cs | 57 +- WebBrowser/frmBrowser.cs | 2 +- WebBrowser/index.html | 56754 +++++++++++++++++---------------- 3 files changed, 28435 insertions(+), 28378 deletions(-) diff --git a/WebBrowser/RequestHandler.cs b/WebBrowser/RequestHandler.cs index c50044f..19d9a94 100644 --- a/WebBrowser/RequestHandler.cs +++ b/WebBrowser/RequestHandler.cs @@ -8,21 +8,21 @@ using Bunifu.UI.WinForms; using CefSharp; using CefSharp.WinForms; - namespace XeroBrowser { public class RequestHandler : CefSharp.Handler.RequestHandler { - // Define arrays with domain names only - private readonly string[] blockedDrms = { "netflix.com", "www.netflix.com", "disneyplus.com", "twitch.tv", "tiktok.com" }; + private readonly string[] blockedDrms = { "netflix.com", "www.netflix.com", "disneyplus.com", "twitch.tv", "tiktok.com", "www.tiktok.com" }; private readonly string[] incompatibleExtSites = { "chrome.google.com", "addons.mozilla.org", "chromewebstore.google.com" }; - private string[] adDomains; + private string[] adDomains = Array.Empty(); + private string[] maliciousDomains = Array.Empty(); + public RequestHandler() { - // Fetch the blocked domains asynchronously when the RequestHandler is instantiated FetchAdDomainsAsync().ContinueWith(t => adDomains = t.Result); + FetchMaliciousDomainsAsync().ContinueWith(t => maliciousDomains = t.Result); } public async Task FetchAdDomainsAsync() @@ -39,7 +39,7 @@ namespace XeroBrowser if (response.IsSuccessStatusCode) { string content = await response.Content.ReadAsStringAsync(); - string[] adsDomains = content.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries); + adDomains = content.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries); } } } @@ -51,14 +51,31 @@ namespace XeroBrowser return adDomains; } - protected override bool GetAuthCredentials(IWebBrowser chromiumWebBrowser, IBrowser browser, string originUrl, bool isProxy, string host, int port, string realm, string scheme, IAuthCallback callback) - { - throw new NotImplementedException(); - } - protected override IResourceRequestHandler GetResourceRequestHandler(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling) + public async Task FetchMaliciousDomainsAsync() { - return null; + string[] maliciousDomains = Array.Empty(); + + try + { + using (HttpClient client = new HttpClient()) + { + string url = "https://diamondcreeper.org/web-filtering/lists/malicious.txt"; + HttpResponseMessage response = await client.GetAsync(url); + + if (response.IsSuccessStatusCode) + { + string content = await response.Content.ReadAsStringAsync(); + maliciousDomains = content.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries); + } + } + } + catch (Exception ex) + { + MessageBox.Show($"Error fetching malicious domains: {ex.Message}"); + } + + return maliciousDomains; } protected override bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect) @@ -70,25 +87,27 @@ namespace XeroBrowser { // Cancel the navigation or sub-request chromiumWebBrowser.LoadHtml("

Error!

The requested site requires a DRM (Digital Rights Management) which Xero Browser does not support!

"); - - // Clear the txtSearchOrUrl text box - //txtSearchOrUrl.Text = string.Empty; + return true; } else if (incompatibleExtSites.Contains(domain)) { // Cancel the navigation or sub-request chromiumWebBrowser.LoadHtml("

Error!

Browser extensions are not supported!

"); - - // Clear the txtSearchOrUrl text box - //txtSearchOrUrl.Text = string.Empty; + return true; } else if (adDomains.Contains(domain)) { chromiumWebBrowser.LoadHtml("

Ads are blocked!

Ads are blocked in xero browser

"); return true; } + else if (maliciousDomains.Contains(domain)) + { + chromiumWebBrowser.LoadHtml("

Visiting a dangerous website has been prevented!

Navigation to the malicious website designed to infect your computer, reduce its performance, break the system or cause other harm has been blocked.\r\n\r\nYou were protected from visiting this website. You can close this window with no risk.

"); + return true; + } return false; } + } -} \ No newline at end of file +} diff --git a/WebBrowser/frmBrowser.cs b/WebBrowser/frmBrowser.cs index ef67592..1a41734 100644 --- a/WebBrowser/frmBrowser.cs +++ b/WebBrowser/frmBrowser.cs @@ -198,7 +198,7 @@ namespace XeroBrowser } else { - chromiumWebBrowser1.Load("https://www.duckduckgo.com/?q=" + txtSearchOrUrl.Text.Trim().Replace(" ", "+") + "&kp=1&va=k&t=hz&ia=web"); + chromiumWebBrowser1.Load("https://www.duckduckgo.com/?q=" + txtSearchOrUrl.Text.Trim().Replace(" ", "+")); } } } diff --git a/WebBrowser/index.html b/WebBrowser/index.html index db6bfde..0ac9fd0 100644 --- a/WebBrowser/index.html +++ b/WebBrowser/index.html @@ -1,7 +1,7 @@ - + New Tab @@ -11,2824 +11,4896 @@ - - + + - + - - - + document.addEventListener('contextmenu', event => event.preventDefault()); + +
-
+
-
-
-

Xero Browser

-
-

New

-

Tab

-
-
-
+
+
+

+ Xero Browser
+

+
+

New

+

Tab

+
+
+
-
-
-
-
- -
Search Engines
- - -
Social Media
- - -
Entertainment
- - -
Work/Education
- - -
Gaming
- +
+
+
+
+ +
Search Engines
+ + +
Social Media
+ + +
Entertainment
+ + +
Work/Education
+ + +
Gaming
+ + +
Online Shopping
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+  Youtube +  Twitch +  TikTok + Netflix +
+
+

Note: Some services may not work with Xero Browser because the browser dosen't support DRM (Digital rights management) yet.

+ What is DRM? +
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-  Youtube -  Twitch -  TikTok - Netflix -
-
-

Note: Some services may not work with Xero Browser because the browser dosen't support DRM (Digital rights management) yet.

- What is DRM? -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-



-
-
-
-
Notice!
-
Xero Browser is in beta stages right now, so expect lots of bugs.
-
-
-
- - +
+
+
+
+
Notice!
+
Xero Browser is in beta stages right now, so expect lots of bugs.
+
+
+
+ + + + \ No newline at end of file