/*
- * 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
// Application headers.
#include "PrivacyWebEngineView.h"
#include "Settings.h"
+#include "ui_HttpAuthenticationDialog.h"
#include "databases/CookiesDatabase.h"
#include "databases/DomainsDatabase.h"
+#include "dialogs/HttpAuthenticationDialog.h"
+#include "helpers/FilterListHelper.h"
#include "interceptors/UrlRequestInterceptor.h"
#include "windows/BrowserWindow.h"
#include <QMenu>
// Construct the class.
-PrivacyWebEngineView::PrivacyWebEngineView() : QWebEngineView(nullptr)
+PrivacyWebEngineView::PrivacyWebEngineView(QWidget *parentWidgetPointer) : QWebEngineView(parentWidgetPointer)
{
// Create an off-the-record profile (the default when no profile name is specified).
webEngineProfilePointer = new QWebEngineProfile(QLatin1String(""));
webEngineSettingsPointer = webEnginePagePointer->settings();
// Instantiate the URL request interceptor.
- UrlRequestInterceptor *urlRequestInterceptorPointer = new UrlRequestInterceptor();
+ UrlRequestInterceptor *urlRequestInterceptorPointer = new UrlRequestInterceptor(this);
// Set the URL request interceptor.
webEngineProfilePointer->setUrlRequestInterceptor(urlRequestInterceptorPointer);
- // Reapply the domain settings when the host changes.
+ // Connect the URL request interceptor signals.
connect(urlRequestInterceptorPointer, SIGNAL(applyDomainSettings(const QString&)), this, SLOT(applyDomainSettingsWithoutReloading(const QString&)));
-
- // Display HTTP Ping blocked dialogs.
+ connect(urlRequestInterceptorPointer, SIGNAL(newMainFrameResource()), this, SLOT(clearRequestsList()));
connect(urlRequestInterceptorPointer, SIGNAL(displayHttpPingDialog(const QString&)), this, SLOT(displayHttpPingDialog(const QString&)));
+ connect(urlRequestInterceptorPointer, SIGNAL(requestProcessed(RequestStruct*)), this, SLOT(storeRequest(RequestStruct*)));
+
+ // Handle HTTP authentication requests.
+ connect(webEnginePagePointer, SIGNAL(authenticationRequired(const QUrl&, QAuthenticator*)), this, SLOT(handleAuthenticationRequest(const QUrl&, QAuthenticator*)));
}
void PrivacyWebEngineView::addCookieToList(const QNetworkCookie &cookie) const
CookiesDatabase::updateCookie(cookie);
// Update the cookies action.
- emit updateCookiesAction(cookieListPointer->size());
+ emit numberOfCookiesChanged(cookieListPointer->size());
}
void PrivacyWebEngineView::applyDomainSettingsWithoutReloading(const QString &hostname)
if (domainQuery.value(DomainsDatabase::ZOOM_FACTOR).toInt())
{
// Store the current zoom factor.
- setZoomFactor(domainQuery.value(DomainsDatabase::CUSTOM_ZOOM_FACTOR).toDouble());
+ defaultZoomFactor = domainQuery.value(DomainsDatabase::CUSTOM_ZOOM_FACTOR).toDouble();
}
else
{
- // Reset the current zoom factor.
- setZoomFactor(Settings::zoomFactor());
+ // Store the current zoom factor.
+ defaultZoomFactor = Settings::zoomFactor();
}
}
else // The hostname does not have domain settings.
// Set the user agent.
webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent()));
- // Set the zoom factor.
- setZoomFactor(Settings::zoomFactor());
+ // Store the zoom factor.
+ defaultZoomFactor = Settings::zoomFactor();
}
+ // Set the current zoom factor.
+ setZoomFactor(defaultZoomFactor);
+
// Reload the website if requested.
if (reloadWebsite)
reload();
+ // Reset the HTTP authentication dialog counter.
+ httpAuthenticationDialogsDisplayed = 0;
+
// Update the UI.
emit updateUi(this);
}
+void PrivacyWebEngineView::clearRequestsList()
+{
+ // Reset the number of blocked requests.
+ blockedRequests = 0;
+
+ // Clear the requests list.
+ requestsListPointer->clear();
+
+ // Update the blocked requests action.
+ emit(requestBlocked(blockedRequests));
+}
+
void PrivacyWebEngineView::contextMenuEvent(QContextMenuEvent *contextMenuEvent) {
// Get a handle for the
QWebEnginePage *webEnginePagePointer = page();
{
case QWebEnginePage::WebBrowserTab:
{
- // Create the new tab and return the privacy WebEngine view pointer. `true` removes the focus from the blank URL line edit.
+ // Create the new tab and return the privacy WebEngine view pointer. `true` removes the focus from the blank URL line edit. `true` adds the new tab adjacent to the current tab.
// The new privacy WebEngine view pointer is returned so it can be populated with the link from the context menu.
- return browserWindowPointer->tabWidgetPointer->addTab(true);
+ return browserWindowPointer->tabWidgetPointer->addTab(true, true);
}
case QWebEnginePage::WebBrowserWindow:
case QWebEnginePage::WebBrowserBackgroundTab:
{
- // Create the new tab and return the privacy WebEngine view pointer. `false` does not clear the URL line edit. `true` creates a background tab.
+ // Create the new tab and return the privacy WebEngine view pointer. `false` does not clear the URL line edit. `true` adds the new tab adjacent to the current tab.
+ // `true` creates a background tab.
// The new privacy WebEngine view pointer is returned so it can be populated with the link from the context menu.
- return browserWindowPointer->tabWidgetPointer->addTab(false, true);
+ return browserWindowPointer->tabWidgetPointer->addTab(false, true, true);
}
default:
emit displayHttpPingBlockedDialog(httpPingUrl);
}
+void PrivacyWebEngineView::handleAuthenticationRequest(const QUrl &requestUrl, QAuthenticator *authenticatorPointer)
+{
+ // Only display the HTTP authentication dialog if it hasn't already been displayed three times for this URL.
+ if (httpAuthenticationDialogsDisplayed < 3) {
+ // Increment the HTTP authentication dialog display counter.
+ ++httpAuthenticationDialogsDisplayed;
+
+ // Instantiate an HTTP authentication dialog.
+ HttpAuthenticationDialog *httpAuthenticationDialogPointer = new HttpAuthenticationDialog(parentWidget(), requestUrl, authenticatorPointer);
+
+ // Display the dialog. This must be `exec()` instead of `show()` so that the website doesn't proceed before populating the authentication pointer.
+ httpAuthenticationDialogPointer->exec();
+ }
+}
+
void PrivacyWebEngineView::removeCookieFromList(const QNetworkCookie &cookie) const
{
//qDebug() << "Remove cookie: " << cookie.toRawForm();
cookieListPointer->remove(cookie);
// Update the cookies action.
- emit updateCookiesAction(cookieListPointer->size());
+ emit numberOfCookiesChanged(cookieListPointer->size());
+}
+
+void PrivacyWebEngineView::storeRequest(RequestStruct *requestStructPointer)
+{
+ // Store the request struct in the list.
+ requestsListPointer->append(requestStructPointer);
+
+ // Track blocked requests.
+ if (requestStructPointer->dispositionInt == FilterListHelper::BLOCKED)
+ {
+ // Update the blocked requests counter.
+ ++blockedRequests;
+
+ // Update the blocked requests action.
+ emit(requestBlocked(blockedRequests));
+ }
}
projects / PrivacyBrowserPC.git / blobdiff