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

diff --git a/src/interceptors/UrlRequestInterceptor.cpp b/src/interceptors/UrlRequestInterceptor.cpp
index 5f9a8cc..3b47e7e 100644
--- a/src/interceptors/UrlRequestInterceptor.cpp
+++ b/src/interceptors/UrlRequestInterceptor.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright 2022-2023 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,6 +19,9 @@
 
 // Application headers.
 #include "UrlRequestInterceptor.h"
+#include "GlobalVariables.h"
+#include "helpers/FilterListHelper.h"
+#include "structs/RequestStruct.h"
 
 // KDE Framework headers.
 #include <KLocalizedString>
@@ -28,54 +31,79 @@ UrlRequestInterceptor::UrlRequestInterceptor(QObject *parentObjectPointer) : QWe
 
 void UrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &urlRequestInfo)
 {
-    // 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);
+    // Clear the requests list if a main frame resource is being loaded.
+    if (urlRequestInfo.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeMainFrame)
+        emit newMainFrameResource();
 
-            // Display the HTTP Ping blocked dialog.
-            emit displayHttpPingDialog(urlRequestInfo.requestUrl().toString());
+    // Create a requests struct.
+    RequestStruct *requestStructPointer = new RequestStruct;
 
-            break;
-        }
+    // Store the basic request information.
+    requestStructPointer->navigationTypeInt = urlRequestInfo.navigationType();
+    requestStructPointer->requestMethodString = urlRequestInfo.requestMethod();
+    requestStructPointer->resourceTypeInt = urlRequestInfo.resourceType();
+    requestStructPointer->urlString = urlRequestInfo.requestUrl().toString();
 
-        default:
+    // Check the filter lists.
+    bool requestNotHandled = globalFilterListHelperPointer->checkFilterLists(urlRequestInfo, requestStructPointer);
+
+    // Further process the request if it hasn't already been handled.
+    if (requestNotHandled) {
+        // Handle the request according to the resource type.
+        switch (urlRequestInfo.resourceType())
         {
-            // Do nothing.
-            break;
+            // 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;
+
+                // 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:
+        // Handle the request according to the navigation type.
+        switch (urlRequestInfo.navigationType())
         {
-            // Only check the hosts if the main URL is changing.
-            if (urlRequestInfo.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeMainFrame)
+            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:
             {
-                // Get the hosts.
-                QString requestingHost = urlRequestInfo.initiator().host();
-                QString requestedHost = urlRequestInfo.requestUrl().host();
+                // Only check the hosts if the main URL is changing.
+                if (urlRequestInfo.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeMainFrame)
+                {
+                    // Get the hosts.
+                    QString requestingHost = urlRequestInfo.initiator().host();
+                    QString requestedHost = urlRequestInfo.requestUrl().host();
 
-                // Reapply the domain settings if the host is changing.
-                if (requestingHost != requestedHost)
-                    emit applyDomainSettings(requestedHost);
+                    // Reapply the domain settings if the host is changing.
+                    if (requestingHost != requestedHost)
+                        emit applyDomainSettings(requestedHost);
+                }
+
+                break;
             }
 
-            break;
+            default:
+                // Do nothing.
+                break;
         }
-
-        default:
-            // Do nothing.
-            break;
     }
+
+    // Send the request struct to the privacy WebEngine view.
+    emit requestProcessed(requestStructPointer);
 }