X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Finterceptors%2FUrlRequestInterceptor.cpp;h=634889867ad386464e5472b1d01c5ff1ccca6075;hb=refs%2Fheads%2Fmaster;hp=2b9bd053e8c0da3c31b7a3c2bb7f5d59a93cd286;hpb=bbc06827f4301381ee3882000abbba147607aa35;p=PrivacyBrowserPC.git

diff --git a/src/interceptors/UrlRequestInterceptor.cpp b/src/interceptors/UrlRequestInterceptor.cpp
index 2b9bd05..0a8c04f 100644
--- a/src/interceptors/UrlRequestInterceptor.cpp
+++ b/src/interceptors/UrlRequestInterceptor.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright © 2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2022-2024 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser PC <https://www.stoutner.com/privacy-browser-pc>.
+ * This file is part of Privacy Browser PC <https://www.stoutner.com/privacy-browser-pc/>.
  *
  * Privacy Browser PC is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,18 +19,74 @@
 
 // Application headers.
 #include "UrlRequestInterceptor.h"
+#include "GlobalVariables.h"
+#include "helpers/FilterListHelper.h"
+#include "structs/RequestStruct.h"
 
-// The default constructor.
-UrlRequestInterceptor::UrlRequestInterceptor(QObject *parentObjectPointer) : QWebEngineUrlRequestInterceptor(parentObjectPointer) {}
+// KDE Framework headers.
+#include <KLocalizedString>
+
+// Construct the class.
+UrlRequestInterceptor::UrlRequestInterceptor(PrivacyWebEngineView *privacyWebEngineViewPointer) :
+                                             QWebEngineUrlRequestInterceptor(privacyWebEngineViewPointer), privacyWebEngineViewPointer(privacyWebEngineViewPointer) {}
 
 void UrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &urlRequestInfo)
 {
+    // Clear the requests list if a main frame resource is being loaded.
+    if (urlRequestInfo.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeMainFrame)
+        emit newMainFrameResource();
+
+    // Create a requests struct.
+    RequestStruct *requestStructPointer = new RequestStruct;
+
+    // Store the basic request information.
+    requestStructPointer->navigationTypeInt = urlRequestInfo.navigationType();
+    requestStructPointer->requestMethodString = urlRequestInfo.requestMethod();
+    requestStructPointer->resourceTypeInt = urlRequestInfo.resourceType();
+    requestStructPointer->urlString = urlRequestInfo.requestUrl().toString();
+    requestStructPointer->webPageUrlString = urlRequestInfo.firstPartyUrl().toString();
+
+    // Check the filter lists.
+    bool continueProcessing = globalFilterListHelperPointer->checkFilterLists(privacyWebEngineViewPointer, urlRequestInfo, requestStructPointer);
+
+    // Further process the request if it hasn't already been handled.
+    if (continueProcessing) {
+        // Handle the request according to the resource type.
+        switch (urlRequestInfo.resourceType())
+        {
+            // A naughty HTTP ping request.
+            case QWebEngineUrlRequestInfo::ResourceTypePing:
+            {
+                // Block the HTTP ping request.
+                urlRequestInfo.block(true);
+
+                // Mark the request struct as blocked.
+                requestStructPointer->dispositionInt = FilterListHelper::BLOCKED;
+
+                // Mark the ping as blocked by the default behavior.
+                requestStructPointer->filterListTitle = i18nc("Default HTTP ping blocking", "Default blocking of all HTTP ping requests.");
+
+                // Display the HTTP Ping blocked dialog.
+                emit displayHttpPingDialog(urlRequestInfo.requestUrl().toString());
+
+                break;
+            }
+
+            default:
+            {
+                // Do nothing.
+                break;
+            }
+        }
+    }
+
     // Handle the request according to the navigation type.
     switch (urlRequestInfo.navigationType())
     {
         case QWebEngineUrlRequestInfo::NavigationTypeLink:
         case QWebEngineUrlRequestInfo::NavigationTypeTyped:
         case QWebEngineUrlRequestInfo::NavigationTypeBackForward:
+        // case QWebEngineUrlRequestInfo::NavigationTypeReload:  This can be uncommented once https://redmine.stoutner.com/issues/821 has been fixed.
         case QWebEngineUrlRequestInfo::NavigationTypeRedirect:
         {
             // Only check the hosts if the main URL is changing.
@@ -42,9 +98,7 @@ void UrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &urlReques
 
                 // Reapply the domain settings if the host is changing.
                 if (requestingHost != requestedHost)
-                {
                     emit applyDomainSettings(requestedHost);
-                }
             }
 
             break;
@@ -55,22 +109,6 @@ void UrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &urlReques
             break;
     }
 
-    // Handle the request according to the resource type.
-    switch (urlRequestInfo.resourceType())
-    {
-        // A naughty HTTP ping request.
-        case QWebEngineUrlRequestInfo::ResourceTypePing:
-        {
-            // Block HTTP ping requests.
-            urlRequestInfo.block(true);
-
-            break;
-        }
-
-        default:
-        {
-            // Do nothing.
-            break;
-        }
-    }
+    // Send the request struct to the privacy WebEngine view.
+    emit requestProcessed(requestStructPointer);
 }