X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;h=777d12efcda177e1ed877a615cd03938045625f0;hb=2facce32fb6d97b52a7dc148044cae4b36a65d4c;hp=07ce5f5d897039339513fa075e6ed401d3d67906;hpb=8933c941521c591a962034ecf3486c9143bf1f80;p=PrivacyBrowserPC.git

diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp
index 07ce5f5..777d12e 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<PrivacyWebEngine*>;
+
     // 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 cookie filter.
+    webEngineCookieStorePointer->setCookieFilter([this](const QWebEngineCookieStore::FilterRequest &filterRequest)
+    {
+        // qDebug() << "Cookie page URL:  " << filterRequest.firstPartyUrl << ", Cookie 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->cookiesEnabled && (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,27 @@ BrowserView::~BrowserView()
     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
+{
+    // 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.  <https://doc.qt.io/qt-5/qwebenginecookiestore.html#setCookie>
+    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.
@@ -163,7 +216,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
             case (DomainsDatabaseHelper::SYSTEM_DEFAULT):
             {
                 // Set the default JavaScript status.
-                webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScript());
+                webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScriptEnabled());
 
                 break;
             }
@@ -185,20 +238,23 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
             }
         }
 
-        // Set local storage.
-        switch (domainRecord.field(DomainsDatabaseHelper::LOCAL_STORAGE).value().toInt())
+        // Set the cookie status.  TODO.
+        currentPrivacyWebEnginePointer->cookiesEnabled = Settings::cookiesEnabled();
+
+        // Set DOM storage.
+        switch (domainRecord.field(DomainsDatabaseHelper::DOM_STORAGE).value().toInt())
         {
             case (DomainsDatabaseHelper::SYSTEM_DEFAULT):
             {
-                // Set the default local storage status.
-                webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::localStorage());
+                // Set the default DOM storage status.
+                webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::domStorageEnabled());
 
                 break;
             }
 
             case (DomainsDatabaseHelper::DISABLED):
             {
-                // Disable local storage.
+                // Disable DOM storage.
                 webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, false);
 
                 break;
@@ -206,7 +262,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
 
             case (DomainsDatabaseHelper::ENABLED):
             {
-                // Enable local storage.
+                // Enable DOM storage.
                 webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, true);
 
                 break;
@@ -237,10 +293,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 cookie status.
+        currentPrivacyWebEnginePointer->cookiesEnabled = Settings::cookiesEnabled();
+
+        // Set DOM storage.
+        webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::domStorageEnabled());
 
         // Set the user agent.
         webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getUserAgentFromDatabaseName(Settings::userAgent()));
@@ -257,7 +316,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 updateCookiesAction(currentPrivacyWebEnginePointer->cookiesEnabled);
+    emit updateDomStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled));
     emit updateUserAgentActions(webEngineProfilePointer->httpUserAgent());
     emit updateZoomFactorAction(webEngineViewPointer->zoomFactor());
 
@@ -317,12 +377,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,6 +511,18 @@ void BrowserView::refresh() const
     webEngineViewPointer->reload();
 }
 
+void BrowserView::toggleCookies()
+{
+    // Toggle cookies.
+    currentPrivacyWebEnginePointer->cookiesEnabled = !currentPrivacyWebEnginePointer->cookiesEnabled;
+
+    // Update the cookies icon.
+    emit updateCookiesAction(currentPrivacyWebEnginePointer->cookiesEnabled);
+
+    // Reload the website.
+    webEngineViewPointer->reload();
+}
+
 void BrowserView::toggleJavaScript() const
 {
     // Toggle JavaScript.
@@ -451,13 +535,13 @@ void BrowserView::toggleJavaScript() const
     webEngineViewPointer->reload();
 }
 
-void BrowserView::toggleLocalStorage() const
+void BrowserView::toggleDomStorage() const
 {
-    // Toggle local storage.
+    // Toggle DOM storage.
     webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, !webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled));
 
-    // Update the local storage icon.
-    emit updateLocalStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled));
+    // Update the DOM storage action icon.
+    emit updateDomStorageAction(webEngineSettingsPointer->testAttribute(QWebEngineSettings::LocalStorageEnabled));
 
     // Reload the website.
     webEngineViewPointer->reload();