X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;h=440c694ab02a7ca130bfc58dbeb85ba9fa2a1b8b;hp=07ce5f5d897039339513fa075e6ed401d3d67906;hb=588db73b94af7b596b0e532f4557aa8b6c41f5c3;hpb=8933c941521c591a962034ecf3486c9143bf1f80 diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp index 07ce5f5..440c694 100644 --- a/src/views/BrowserView.cpp +++ b/src/views/BrowserView.cpp @@ -34,8 +34,12 @@ // Initialize the public static variables. QString BrowserView::webEngineDefaultUserAgent = QStringLiteral(""); +// Construct the class. BrowserView::BrowserView(QWidget *parent) : QWidget(parent) { + // Initialize the variables. + privacyWebEngineListPointer = new QList; + // Instantiate the browser view UI. Ui::BrowserView browserViewUi; @@ -59,8 +63,36 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) webEngineSettingsPointer = webEngineViewPointer->settings(); webEngineCookieStorePointer = webEngineProfilePointer->cookieStore(); - // Store a copy of each cookie when it is added. + // Initialize the current privacy web engine pointer. + currentPrivacyWebEnginePointer = new PrivacyWebEngine(webEngineViewPointer); + + // Populate the privacy web engine list. + privacyWebEngineListPointer->append(currentPrivacyWebEnginePointer); + + // Set the local storage filter. + webEngineCookieStorePointer->setCookieFilter([this](const QWebEngineCookieStore::FilterRequest &filterRequest) + { + // qDebug() << "Page URL: " << filterRequest.firstPartyUrl << ", Local storage URL: " << filterRequest.origin << ", Is third-party: " << filterRequest.thirdParty; + + // Block all third party local storage requests, including the sneaky ones that don't register a first party URL. + if (filterRequest.thirdParty || (filterRequest.firstPartyUrl == QStringLiteral(""))) + return false; + + // Check each tab to see if this local storage request should be allowed. + for (PrivacyWebEngine *privacyWebEnginePointer : *privacyWebEngineListPointer) + { + // Allow this local storage request if it comes from a tab with local storage enabled. + if (privacyWebEnginePointer->localStorageEnabled && (webEngineViewPointer->url().host() == filterRequest.firstPartyUrl.host())) + return true; + } + + // Block any remaining local storage requests. + return false; + }); + + // Process cookie changes. connect(webEngineCookieStorePointer, SIGNAL(cookieAdded(QNetworkCookie)), this, SLOT(cookieAdded(QNetworkCookie))); + connect(webEngineCookieStorePointer, SIGNAL(cookieRemoved(QNetworkCookie)), this, SLOT(cookieRemoved(QNetworkCookie))); // Store a copy of the WebEngine default user agent. webEngineDefaultUserAgent = webEngineProfilePointer->httpUserAgent(); @@ -120,6 +152,26 @@ BrowserView::~BrowserView() webEnginePagePointer->deleteLater(); } +void BrowserView::addCookieToStore(QNetworkCookie &cookie) const +{ + // Create a url. + QUrl url; + + // Check to see if the domain does not start with a `.` because Qt makes this harder than it should be. + if (!cookie.domain().startsWith(QStringLiteral("."))) + { + // Populate the URL. + url.setHost(cookie.domain()); + url.setScheme(QStringLiteral("https")); + + // Clear the domain from the cookie. + cookie.setDomain(QStringLiteral("")); + } + + // Add the cookie to the store. + webEngineCookieStorePointer->setCookie(cookie, url); +} + void BrowserView::applyApplicationSettings() { // Set the search engine URL. @@ -160,53 +212,81 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload // Set the JavaScript status. switch (domainRecord.field(DomainsDatabaseHelper::JAVASCRIPT).value().toInt()) { + // Set the default JavaScript status. case (DomainsDatabaseHelper::SYSTEM_DEFAULT): { - // Set the default JavaScript status. - webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScript()); + webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScriptEnabled()); break; } + // Disable JavaScript. case (DomainsDatabaseHelper::DISABLED): { - // Disable JavaScript. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, false); break; } + // Enable JavaScript. case (DomainsDatabaseHelper::ENABLED): { - // Enable JavaScript. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, true); break; } } - // Set local storage. + // Set the local storage status. switch (domainRecord.field(DomainsDatabaseHelper::LOCAL_STORAGE).value().toInt()) { + // Set the default local storage status. + case (DomainsDatabaseHelper::SYSTEM_DEFAULT): + { + currentPrivacyWebEnginePointer->localStorageEnabled = Settings::localStorageEnabled(); + + break; + } + + // Disable local storage. + case (DomainsDatabaseHelper::DISABLED): + { + currentPrivacyWebEnginePointer->localStorageEnabled = false; + + break; + } + + // Enable local storage. + case (DomainsDatabaseHelper::ENABLED): + { + currentPrivacyWebEnginePointer->localStorageEnabled = true; + + break; + } + } + + // Set the DOM storage status. + switch (domainRecord.field(DomainsDatabaseHelper::DOM_STORAGE).value().toInt()) + { + // Set the default DOM storage status. case (DomainsDatabaseHelper::SYSTEM_DEFAULT): { - // Set the default local storage status. - webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::localStorage()); + webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::domStorageEnabled()); break; } + // Disable DOM storage. case (DomainsDatabaseHelper::DISABLED): { - // Disable local storage. webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, false); break; } + // Enable DOM storage. case (DomainsDatabaseHelper::ENABLED): { - // Enable local storage. webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, true); break; @@ -237,10 +317,13 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload else // The hostname does not have domain settings. { // Set the JavaScript status. - webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScript()); + webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScriptEnabled()); - // Set local storage. - webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::localStorage()); + // Set the local storage status. + currentPrivacyWebEnginePointer->localStorageEnabled = Settings::localStorageEnabled(); + + // Set DOM storage. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::domStorageEnabled()); // Set the user agent. webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent())); @@ -257,7 +340,8 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload // Emit the update actions signals. emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)); - emit updateLocalStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + emit updateLocalStorageAction(currentPrivacyWebEnginePointer->localStorageEnabled); + emit updateDomStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent()); emit updateZoomFactorAction(webEngineViewPointer->zoomFactor()); @@ -317,12 +401,24 @@ void BrowserView::cookieAdded(const QNetworkCookie &cookie) const emit addCookie(cookie); } +void BrowserView::cookieRemoved(const QNetworkCookie &cookie) const +{ + // Remove the cookie from the cookie list. + emit removeCookie(cookie); +} + void BrowserView::deleteAllCookies() const { // Delete all the cookies. webEngineCookieStorePointer->deleteAllCookies(); } +void BrowserView::deleteCookieFromStore(const QNetworkCookie &cookie) const +{ + // Delete the cookie. + webEngineCookieStorePointer->deleteCookie(cookie); +} + void BrowserView::forward() const { // Go forward. @@ -439,25 +535,37 @@ void BrowserView::refresh() const webEngineViewPointer->reload(); } +void BrowserView::toggleDomStorage() const +{ + // Toggle DOM storage. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + + // Update the DOM storage action. + emit updateDomStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + + // Reload the website. + webEngineViewPointer->reload(); +} + void BrowserView::toggleJavaScript() const { // Toggle JavaScript. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)); - // Update the JavaScript icon. + // Update the JavaScript action. emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)); // Reload the website. webEngineViewPointer->reload(); } -void BrowserView::toggleLocalStorage() const +void BrowserView::toggleLocalStorage() { - // Toggle local storage. - webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + // Toggle local storeage. + currentPrivacyWebEnginePointer->localStorageEnabled = !currentPrivacyWebEnginePointer->localStorageEnabled; - // Update the local storage icon. - emit updateLocalStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + // Update the local storage action. + emit updateLocalStorageAction(currentPrivacyWebEnginePointer->localStorageEnabled); // Reload the website. webEngineViewPointer->reload();