// 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;
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() << "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)));
webEnginePagePointer->deleteLater();
}
-// The cookie is copied instead of referenced so that changes made to the cookie do not create a race condition with the display of the cookie in the dialog.
-void BrowserView::addCookieToStore(QNetworkCookie cookie) const
+void BrowserView::addCookieToStore(QNetworkCookie &cookie) const
{
// Create a url.
QUrl url;
// 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;
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()));
// 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());
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();