Browser connection keys and rules are stored in custom data instead o…

…f attributes
keepassxreboot · Oct 23, 2018 · b9057b9 · b9057b9
1 parent 5c92082
commit b9057b9
Show file tree

Hide file tree

Showing 17 changed files with 673 additions and 213 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -222,6 +222,7 @@ add_subdirectory(browser)
 add_subdirectory(proxy)
 if(WITH_XC_BROWSER)
     set(keepassxcbrowser_LIB keepassxcbrowser)
+    set(keepassx_SOURCES ${keepassx_SOURCES} gui/dbsettings/DatabaseSettingsWidgetBrowser.cpp)
 endif()
 
 add_subdirectory(autotype)

diff --git a/src/browser/BrowserAction.cpp b/src/browser/BrowserAction.cpp
@@ -566,15 +566,3 @@ QString BrowserAction::incrementNonce(const QString& nonce)
     sodium_increment(n.data(), n.size());
     return getQByteArray(n.data(), n.size()).toBase64();
 }
-
-void BrowserAction::removeSharedEncryptionKeys()
-{
-    QMutexLocker locker(&m_mutex);
-    m_browserService.removeSharedEncryptionKeys();
-}
-
-void BrowserAction::removeStoredPermissions()
-{
-    QMutexLocker locker(&m_mutex);
-    m_browserService.removeStoredPermissions();
-}
diff --git a/src/browser/BrowserAction.h b/src/browser/BrowserAction.h
@@ -54,10 +54,6 @@ class BrowserAction : public QObject
 
     QJsonObject readResponse(const QJsonObject& json);
 
-public slots:
-    void removeSharedEncryptionKeys();
-    void removeStoredPermissions();
-
 private:
     QJsonObject handleAction(const QJsonObject& json);
     QJsonObject handleChangePublicKeys(const QJsonObject& json, const QString& action);

diff --git a/src/browser/BrowserEntryConfig.cpp b/src/browser/BrowserEntryConfig.cpp
@@ -21,7 +21,7 @@
 #include "core/EntryAttributes.h"
 #include <QtCore>
 
-static const char KEEPASSBROWSER_NAME[] = "KeePassXC-Browser Settings";
+static const char KEEPASSXCBROWSER_NAME[] = "KeePassXC-Browser Settings";
 
 BrowserEntryConfig::BrowserEntryConfig(QObject* parent)
     : QObject(parent)
@@ -82,7 +82,7 @@ void BrowserEntryConfig::setRealm(const QString& realm)
 
 bool BrowserEntryConfig::load(const Entry* entry)
 {
-    QString s = entry->attributes()->value(KEEPASSBROWSER_NAME);
+    QString s = entry->customData()->value(KEEPASSXCBROWSER_NAME);
     if (s.isEmpty()) {
         return false;
     }
@@ -104,5 +104,5 @@ void BrowserEntryConfig::save(Entry* entry)
     QVariantMap v = qo2qv(this);
     QJsonObject o = QJsonObject::fromVariantMap(v);
     QByteArray json = QJsonDocument(o).toJson(QJsonDocument::Compact);
-    entry->attributes()->set(KEEPASSBROWSER_NAME, json);
+    entry->customData()->set(KEEPASSXCBROWSER_NAME, json);
 }
diff --git a/src/browser/BrowserOptionDialog.cpp b/src/browser/BrowserOptionDialog.cpp
@@ -24,15 +24,12 @@
 #include "ui_BrowserOptionDialog.h"
 
 #include <QFileDialog>
-#include <QMessageBox>
 
 BrowserOptionDialog::BrowserOptionDialog(QWidget* parent)
     : QWidget(parent)
     , m_ui(new Ui::BrowserOptionDialog())
 {
     m_ui->setupUi(this);
-    connect(m_ui->removeSharedEncryptionKeys, SIGNAL(clicked()), this, SIGNAL(removeSharedEncryptionKeys()));
-    connect(m_ui->removeStoredPermissions, SIGNAL(clicked()), this, SIGNAL(removeStoredPermissions()));
 
     m_ui->extensionLabel->setOpenExternalLinks(true);
     m_ui->extensionLabel->setText(tr("KeePassXC-Browser is needed for the browser integration to work. <br />Download it for %1 and %2.").arg(

diff --git a/src/browser/BrowserOptionDialog.h b/src/browser/BrowserOptionDialog.h
@@ -21,6 +21,7 @@
 #define BROWSEROPTIONDIALOG_H
 
 #include <QScopedPointer>
+#include <QPointer>
 #include <QWidget>
 
 namespace Ui
@@ -40,10 +41,6 @@ public slots:
     void loadSettings();
     void saveSettings();
 
-signals:
-    void removeSharedEncryptionKeys();
-    void removeStoredPermissions();
-
 private slots:
     void showProxyLocationFileDialog();
 

diff --git a/src/browser/BrowserOptionDialog.ui b/src/browser/BrowserOptionDialog.ui
@@ -145,7 +145,7 @@
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_3">
+        <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -215,7 +215,7 @@
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer">
+        <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
@@ -230,36 +230,6 @@
          </property>
         </spacer>
        </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QPushButton" name="removeSharedEncryptionKeys">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>&amp;Disconnect all browsers</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="removeStoredPermissions">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Forget all remembered &amp;permissions</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
@@ -376,7 +346,7 @@
         </layout>
        </item>
        <item>
-        <spacer name="verticalSpacer_4">
+        <spacer name="verticalSpacer_5">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>