#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"
// Initialize the public static variables.
QString BrowserView::webEngineDefaultUserAgent = QStringLiteral("");
+// Construct the class.
BrowserView::BrowserView(QWidget *parent) : QWidget(parent)
{
+ // Initialize the variables.
+ privacyWebEngineListPointer = new QList<PrivacyWebEngine*>;
+
// Instantiate the browser view UI.
Ui::BrowserView browserViewUi;
// Set the WebEngine page.
webEngineViewPointer->setPage(webEnginePagePointer);
+ // Handle full screen requests.
+ connect(webEnginePagePointer, SIGNAL(fullScreenRequested(QWebEngineFullScreenRequest)), this, SLOT(fullScreenRequested(QWebEngineFullScreenRequest)));
+
// Get handles for the aspects of the WebEngine.
webEngineHistoryPointer = webEnginePagePointer->history();
webEngineSettingsPointer = webEngineViewPointer->settings();
webEngineCookieStorePointer = webEngineProfilePointer->cookieStore();
+ // 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().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 <https://redmine.stoutner.com/issues/857>.
+ // 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->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;
+ });
+
// Process cookie changes.
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<QNetworkCookie*> *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();
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.
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.
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::javaScript());
+ 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 local storage.
- switch (domainRecord.field(DomainsDatabaseHelper::LOCAL_STORAGE).value().toInt())
+ // Set the local storage status.
+ switch (domainRecord.field(DomainsDatabase::LOCAL_STORAGE).value().toInt())
{
- case (DomainsDatabaseHelper::SYSTEM_DEFAULT):
+ // Set the default local storage status.
+ case (DomainsDatabase::SYSTEM_DEFAULT):
{
- // Set the default local storage status.
- webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::localStorage());
+ currentPrivacyWebEnginePointer->localStorageEnabled = Settings::localStorageEnabled();
break;
}
- case (DomainsDatabaseHelper::DISABLED):
+ // 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())
+ {
+ // Set the default DOM storage status.
+ case (DomainsDatabase::SYSTEM_DEFAULT):
+ {
+ webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::domStorageEnabled());
+
+ break;
+ }
+
+ // Disable DOM storage.
+ case (DomainsDatabase::DISABLED):
{
- // Disable local storage.
webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, false);
break;
}
- case (DomainsDatabaseHelper::ENABLED):
+ // Enable DOM storage.
+ case (DomainsDatabase::ENABLED):
{
- // Enable local storage.
webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, true);
break;
}
// 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
{
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::javaScript());
+ webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScriptEnabled());
+
+ // Set the local storage status.
+ currentPrivacyWebEnginePointer->localStorageEnabled = Settings::localStorageEnabled();
- // Set local storage.
- webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::localStorage());
+ // Set DOM storage.
+ webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::domStorageEnabled());
// Set the user agent.
webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent()));
// Emit the update actions signals.
emit updateJavaScriptAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::JavascriptEnabled));
- emit updateLocalStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled));
- emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent());
+ emit updateLocalStorageAction(currentPrivacyWebEnginePointer->localStorageEnabled);
+ emit updateDomStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled));
+ emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent(), true);
emit updateZoomFactorAction(webEngineViewPointer->zoomFactor());
// Reload the website if requested.
if (reloadWebsite)
- {
webEngineViewPointer->reload();
- }
}
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
// Apply the user agent.
webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromTranslatedName(userAgentName));
+ // Update the user agent actions.
+ emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent(), false);
+
// Reload the website.
webEngineViewPointer->reload();
}
webEngineViewPointer->forward();
}
+void BrowserView::fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest) const
+{
+ // Make it so.
+ emit fullScreenRequested(fullScreenRequest.toggleOn());
+
+ // Accept the request.
+ fullScreenRequest.accept();
+}
+
void BrowserView::home() const
{
// Load the homepage.
void BrowserView::mouseBack() const
{
// Go back if possible.
- if (webEngineHistoryPointer->canGoBack())
+ if (webEngineViewPointer->isActiveWindow() && webEngineHistoryPointer->canGoBack())
{
// Clear the URL line edit focus.
emit clearUrlLineEditFocus();
void BrowserView::mouseForward() const
{
// Go forward if possible.
- if (webEngineHistoryPointer->canGoForward())
+ if (webEngineViewPointer->isActiveWindow() && webEngineHistoryPointer->canGoForward())
{
// Clear the URL line edit focus.
emit clearUrlLineEditFocus();
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();
projects / PrivacyBrowserPC.git / blobdiff