X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;h=6bdbda6536cc2dcea6f421267ccc8a5781860959;hb=823acbeb2cc27030857f249ab7157d8562e7b7fe;hp=777d12efcda177e1ed877a615cd03938045625f0;hpb=2facce32fb6d97b52a7dc148044cae4b36a65d4c;p=PrivacyBrowserPC.git diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp index 777d12e..6bdbda6 100644 --- a/src/views/BrowserView.cpp +++ b/src/views/BrowserView.cpp @@ -21,8 +21,9 @@ #include "BrowserView.h" #include "Settings.h" #include "ui_BrowserView.h" +#include "databases/CookiesDatabase.h" +#include "databases/DomainsDatabase.h" #include "filters/MouseEventFilter.h" -#include "helpers/DomainsDatabaseHelper.h" #include "helpers/SearchEngineHelper.h" #include "helpers/UserAgentHelper.h" #include "interceptors/UrlRequestInterceptor.h" @@ -69,22 +70,45 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) // Populate the privacy web engine list. privacyWebEngineListPointer->append(currentPrivacyWebEnginePointer); - // Set the cookie filter. + // Set the local storage filter. webEngineCookieStorePointer->setCookieFilter([this](const QWebEngineCookieStore::FilterRequest &filterRequest) { - // qDebug() << "Cookie page URL: " << filterRequest.firstPartyUrl << ", Cookie URL: " << filterRequest.origin << ", Is third-party: " << filterRequest.thirdParty; + //qDebug().noquote().nospace() << "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(""))) + { + //qDebug() << "Request blocked."; + + // Return false. return false; + } + /* TODO. Waiting for a solution to . // Check each tab to see if this local storage request should be allowed. for (PrivacyWebEngine *privacyWebEnginePointer : *privacyWebEngineListPointer) { + //qDebug().noquote().nospace() << "Local storage: " << privacyWebEnginePointer->localStorageEnabled << ". WebEngine URL: " << webEngineViewPointer->url().host() << ". Request Host: " << filterRequest.firstPartyUrl.host(); + // Allow this local storage request if it comes from a tab with local storage enabled. - if (privacyWebEnginePointer->cookiesEnabled && (webEngineViewPointer->url().host() == filterRequest.firstPartyUrl.host())) + if (privacyWebEnginePointer->localStorageEnabled && (webEngineViewPointer->url().host() == filterRequest.firstPartyUrl.host())) + { + //qDebug() << "Request allowed."; + + // Return true. return true; + } } + */ + + // Allow the request if it is first party and local storage is enabled. + if (!filterRequest.thirdParty && currentPrivacyWebEnginePointer->localStorageEnabled) + { + // Return true. + return true; + } + + //qDebug() << "Request blocked."; // Block any remaining local storage requests. return false; @@ -94,6 +118,13 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent) connect(webEngineCookieStorePointer, SIGNAL(cookieAdded(QNetworkCookie)), this, SLOT(cookieAdded(QNetworkCookie))); connect(webEngineCookieStorePointer, SIGNAL(cookieRemoved(QNetworkCookie)), this, SLOT(cookieRemoved(QNetworkCookie))); + // Get a list of durable cookies. + QList *durableCookiesListPointer = CookiesDatabase::getCookies(); + + // Add the durable cookies to the store. + for (QNetworkCookie *cookiePointer : *durableCookiesListPointer) + addCookieToStore(*cookiePointer); + // Store a copy of the WebEngine default user agent. webEngineDefaultUserAgent = webEngineProfilePointer->httpUserAgent(); @@ -179,7 +210,7 @@ void BrowserView::applyApplicationSettings() searchEngineUrl = SearchEngineHelper::getSearchUrl(Settings::searchEngine()); // Emit the update search engine actions signal. - emit updateSearchEngineActions(Settings::searchEngine()); + emit updateSearchEngineActions(Settings::searchEngine(), true); } // This exists as a separate function from `applyDomainSettings()` so it can be listed as a slot and function without the need for a boolean argument. @@ -202,7 +233,7 @@ void BrowserView::applyDomainSettingsWithoutReloading(const QString &hostname) void BrowserView::applyDomainSettings(const QString &hostname, const bool reloadWebsite) { // Get the record for the hostname. - QSqlQuery domainQuery = DomainsDatabaseHelper::getDomainQuery(hostname); + QSqlQuery domainQuery = DomainsDatabase::getDomainQuery(hostname); // Check if the hostname has domain settings. if (domainQuery.isValid()) // The hostname has domain settings. @@ -211,58 +242,83 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload QSqlRecord domainRecord = domainQuery.record(); // Set the JavaScript status. - switch (domainRecord.field(DomainsDatabaseHelper::JAVASCRIPT).value().toInt()) + switch (domainRecord.field(DomainsDatabase::JAVASCRIPT).value().toInt()) { - case (DomainsDatabaseHelper::SYSTEM_DEFAULT): + // Set the default JavaScript status. + case (DomainsDatabase::SYSTEM_DEFAULT): { - // Set the default JavaScript status. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScriptEnabled()); break; } - case (DomainsDatabaseHelper::DISABLED): + // Disable JavaScript. + case (DomainsDatabase::DISABLED): { - // Disable JavaScript. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, false); break; } - case (DomainsDatabaseHelper::ENABLED): + // Enable JavaScript. + case (DomainsDatabase::ENABLED): { - // Enable JavaScript. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, true); break; } } - // Set the cookie status. TODO. - currentPrivacyWebEnginePointer->cookiesEnabled = Settings::cookiesEnabled(); + // Set the local storage status. + switch (domainRecord.field(DomainsDatabase::LOCAL_STORAGE).value().toInt()) + { + // Set the default local storage status. + case (DomainsDatabase::SYSTEM_DEFAULT): + { + currentPrivacyWebEnginePointer->localStorageEnabled = Settings::localStorageEnabled(); - // Set DOM storage. - switch (domainRecord.field(DomainsDatabaseHelper::DOM_STORAGE).value().toInt()) + break; + } + + // Disable local storage. + case (DomainsDatabase::DISABLED): + { + currentPrivacyWebEnginePointer->localStorageEnabled = false; + + break; + } + + // Enable local storage. + case (DomainsDatabase::ENABLED): + { + currentPrivacyWebEnginePointer->localStorageEnabled = true; + + break; + } + } + + // Set the DOM storage status. + switch (domainRecord.field(DomainsDatabase::DOM_STORAGE).value().toInt()) { - case (DomainsDatabaseHelper::SYSTEM_DEFAULT): + // Set the default DOM storage status. + case (DomainsDatabase::SYSTEM_DEFAULT): { - // Set the default DOM storage status. webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::domStorageEnabled()); break; } - case (DomainsDatabaseHelper::DISABLED): + // Disable DOM storage. + case (DomainsDatabase::DISABLED): { - // Disable DOM storage. webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, false); break; } - case (DomainsDatabaseHelper::ENABLED): + // Enable DOM storage. + case (DomainsDatabase::ENABLED): { - // Enable DOM storage. webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, true); break; @@ -270,13 +326,13 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload } // Set the user agent. - webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getResultingDomainSettingsUserAgent(domainRecord.field(DomainsDatabaseHelper::USER_AGENT).value().toString())); + webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getResultingDomainSettingsUserAgent(domainRecord.field(DomainsDatabase::USER_AGENT).value().toString())); // Check if a custom zoom factor is set. - if (domainRecord.field(DomainsDatabaseHelper::ZOOM_FACTOR).value().toInt()) + if (domainRecord.field(DomainsDatabase::ZOOM_FACTOR).value().toInt()) { // Store the current zoom factor. - currentZoomFactor = domainRecord.field(DomainsDatabaseHelper::CUSTOM_ZOOM_FACTOR).value().toDouble(); + currentZoomFactor = domainRecord.field(DomainsDatabase::CUSTOM_ZOOM_FACTOR).value().toDouble(); } else { @@ -288,15 +344,15 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload webEngineViewPointer->setZoomFactor(currentZoomFactor); // Apply the domain settings palette to the URL line edit. - emit updateDomainSettingsIndicator(true, domainRecord.field(DomainsDatabaseHelper::DOMAIN_NAME).value().toString()); + emit updateDomainSettingsIndicator(true, domainRecord.field(DomainsDatabase::DOMAIN_NAME).value().toString()); } else // The hostname does not have domain settings. { // Set the JavaScript status. webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScriptEnabled()); - // Set the cookie status. - currentPrivacyWebEnginePointer->cookiesEnabled = Settings::cookiesEnabled(); + // Set the local storage status. + currentPrivacyWebEnginePointer->localStorageEnabled = Settings::localStorageEnabled(); // Set DOM storage. webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::domStorageEnabled()); @@ -316,16 +372,14 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload // Emit the update actions signals. emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled)); - emit updateCookiesAction(currentPrivacyWebEnginePointer->cookiesEnabled); + emit updateLocalStorageAction(currentPrivacyWebEnginePointer->localStorageEnabled); emit updateDomStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); - emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent()); + emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent(), true); emit updateZoomFactorAction(webEngineViewPointer->zoomFactor()); // Reload the website if requested. if (reloadWebsite) - { webEngineViewPointer->reload(); - } } void BrowserView::applyOnTheFlySearchEngine(QAction *searchEngineActionPointer) @@ -338,6 +392,9 @@ void BrowserView::applyOnTheFlySearchEngine(QAction *searchEngineActionPointer) // Store the search engine string. searchEngineUrl = SearchEngineHelper::getSearchUrl(searchEngineName); + + // Update the search engine actionas. + emit updateSearchEngineActions(searchEngineName, false); } void BrowserView::applyOnTheFlyUserAgent(QAction *userAgentActionPointer) const @@ -351,6 +408,9 @@ void BrowserView::applyOnTheFlyUserAgent(QAction *userAgentActionPointer) const // Apply the user agent. webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromTranslatedName(userAgentName)); + // Update the user agent actions. + emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent(), false); + // Reload the website. webEngineViewPointer->reload(); } @@ -476,7 +536,7 @@ void BrowserView::loadUrlFromLineEdit(QString url) const void BrowserView::mouseBack() const { // Go back if possible. - if (webEngineHistoryPointer->canGoBack()) + if (webEngineViewPointer->isActiveWindow() && webEngineHistoryPointer->canGoBack()) { // Clear the URL line edit focus. emit clearUrlLineEditFocus(); @@ -489,7 +549,7 @@ void BrowserView::mouseBack() const void BrowserView::mouseForward() const { // Go forward if possible. - if (webEngineHistoryPointer->canGoForward()) + if (webEngineViewPointer->isActiveWindow() && webEngineHistoryPointer->canGoForward()) { // Clear the URL line edit focus. emit clearUrlLineEditFocus(); @@ -511,13 +571,13 @@ void BrowserView::refresh() const webEngineViewPointer->reload(); } -void BrowserView::toggleCookies() +void BrowserView::toggleDomStorage() const { - // Toggle cookies. - currentPrivacyWebEnginePointer->cookiesEnabled = !currentPrivacyWebEnginePointer->cookiesEnabled; + // Toggle DOM storage. + webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); - // Update the cookies icon. - emit updateCookiesAction(currentPrivacyWebEnginePointer->cookiesEnabled); + // Update the DOM storage action. + emit updateDomStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); // Reload the website. webEngineViewPointer->reload(); @@ -528,20 +588,20 @@ 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::toggleDomStorage() const +void BrowserView::toggleLocalStorage() { - // Toggle DOM storage. - webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + // Toggle local storeage. + currentPrivacyWebEnginePointer->localStorageEnabled = !currentPrivacyWebEnginePointer->localStorageEnabled; - // Update the DOM storage action icon. - emit updateDomStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled)); + // Update the local storage action. + emit updateLocalStorageAction(currentPrivacyWebEnginePointer->localStorageEnabled); // Reload the website. webEngineViewPointer->reload();