Backport several PR's into 2.6.3

docs/topics/BrowserPlugin.adoc

@@ -23,6 +23,10 @@ You can download the KeePassXC-Browser extension from your web browser. To downl
 
 2. Click the button to install/add the extension to the browser. Accept any confirmation dialogs.
 
+// tag::advanced[]
+NOTE: When Microsoft Edge is installed as a managed application, system administrators are required to deploy a custom native messaging configuration. Instructions for this are found in the advanced section below.
+// end::advanced[]
+
 === Configure KeePassXC-Browser
 To start using KeePassXC-Browser, you must configure it so that it can communicate with the KeePassXC application on your desktop.
 
@@ -104,5 +108,38 @@ WARNING: We do not recommend changing any of these settings as they may break th
 
 .Advanced browser settings
 image::browser_advanced_settings.png[]
+
+=== Advanced Setup
+==== Managed Microsoft Edge on Windows
+1. Deploy *org.keepassxc.keepassxc_browser_edge.json* to, for example, `C:\ProgramData\KeepassXC` on all managed platforms.
++
+----
+{
+    "allowed_origins": [
+        "chrome-extension://pdffhmdngciaglkoonimfcmckehcpafo/"
+    ],
+    "description": "KeePassXC integration with native messaging support",
+    "name": "org.keepassxc.keepassxc_browser",
+    "path": "C:\\Program Files\\KeePassXC\\keepassxc-proxy.exe",
+    "type": "stdio"
+}
+----
+
+2. Configure GPO options (registry result):
++
+----
+Windows Registry Editor Version 5.00
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Edge\NativeMessagingHosts\org.keepassxc.keepassxc_browser]
+@="C:\ProgramData\KeepassXC\org.keepassxc.keepassxc_browser_edge.json"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Edge]
+"NativeMessagingUserLevelHosts"=dword:00000000
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Edge\ExtensionInstallAllowlist]
+"1"="pdffhmdngciaglkoonimfcmckehcpafo"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Edge\NativeMessagingAllowlist]
+"1"="org.keepassxc.keepassxc_browser"
+----
 // end::advanced[]
 // end::content[]

src/browser/BrowserService.cpp

@@ -745,7 +745,7 @@ BrowserService::sortEntries(QList<Entry*>& pwEntries, const QString& siteUrlStr,
         // Sort same priority entries by Title or UserName
         auto entries = priorities.values(key);
         std::sort(entries.begin(), entries.end(), [&sortField](Entry* left, Entry* right) {
-            return QString::localeAwareCompare(left->attribute(sortField), right->attribute(sortField));
+            return QString::localeAwareCompare(left->attribute(sortField), right->attribute(sortField)) < 0;
         });
         results << entries;
         if (browserSettings()->bestMatchOnly() && !results.isEmpty()) {

src/core/Entry.cpp

@@ -465,7 +465,8 @@ void Entry::setTotp(QSharedPointer<Totp::Settings> settings)
         m_data.totpSettings.reset();
     } else {
         m_data.totpSettings = std::move(settings);
-        auto text = Totp::writeSettings(m_data.totpSettings, title(), username());
+        auto text = Totp::writeSettings(
+            m_data.totpSettings, resolveMultiplePlaceholders(title()), resolveMultiplePlaceholders(username()));
         if (m_data.totpSettings->format != Totp::StorageFormat::LEGACY) {
             m_attributes->set(Totp::ATTRIBUTE_OTP, text, true);
         } else {
@@ -493,6 +494,15 @@ QSharedPointer<Totp::Settings> Entry::totpSettings() const
     return m_data.totpSettings;
 }
 
+QString Entry::totpSettingsString() const
+{
+    if (m_data.totpSettings) {
+        return Totp::writeSettings(
+            m_data.totpSettings, resolveMultiplePlaceholders(title()), resolveMultiplePlaceholders(username()), true);
+    }
+    return {};
+}
+
 void Entry::setUuid(const QUuid& uuid)
 {
     Q_ASSERT(!uuid.isNull());

src/core/Entry.h

@@ -106,6 +106,7 @@ class Entry : public QObject
     QString notes() const;
     QString attribute(const QString& key) const;
     QString totp() const;
+    QString totpSettingsString() const;
     QSharedPointer<Totp::Settings> totpSettings() const;
     int size() const;
 

src/format/CsvExporter.cpp

@@ -67,6 +67,10 @@ QString CsvExporter::exportHeader()
     addColumn(header, "Password");
     addColumn(header, "URL");
     addColumn(header, "Notes");
+    addColumn(header, "TOTP");
+    addColumn(header, "Icon");
+    addColumn(header, "Last Modified");
+    addColumn(header, "Created");
     return header + QString("\n");
 }
 
@@ -88,6 +92,10 @@ QString CsvExporter::exportGroup(const Group* group, QString groupPath)
         addColumn(line, entry->password());
         addColumn(line, entry->url());
         addColumn(line, entry->notes());
+        addColumn(line, entry->totpSettingsString());
+        addColumn(line, QString::number(entry->iconNumber()));
+        addColumn(line, entry->timeInfo().lastModificationTime().toString(Qt::ISODate));
+        addColumn(line, entry->timeInfo().creationTime().toString(Qt::ISODate));
 
         line.append("\n");
         response.append(line);

src/gui/csvImport/CsvImportWidget.cpp

@@ -27,6 +27,7 @@
 #include "format/KeePass2Writer.h"
 #include "gui/MessageBox.h"
 #include "gui/MessageWidget.h"
+#include "totp/totp.h"
 
 // I wanted to make the CSV import GUI future-proof, so if one day you need a new field,
 // all you have to do is add a field to m_columnHeader, and the GUI will follow:
@@ -39,7 +40,8 @@ CsvImportWidget::CsvImportWidget(QWidget* parent)
     , m_comboModel(new QStringListModel(this))
     , m_columnHeader(QStringList() << QObject::tr("Group") << QObject::tr("Title") << QObject::tr("Username")
                                    << QObject::tr("Password") << QObject::tr("URL") << QObject::tr("Notes")
-                                   << QObject::tr("Last Modified") << QObject::tr("Created"))
+                                   << QObject::tr("TOTP") << QObject::tr("Icon") << QObject::tr("Last Modified")
+                                   << QObject::tr("Created"))
     , m_fieldSeparatorList(QStringList() << ","
                                          << ";"
                                          << "-"
@@ -54,7 +56,7 @@ CsvImportWidget::CsvImportWidget(QWidget* parent)
     m_ui->messageWidget->setHidden(true);
 
     m_combos << m_ui->groupCombo << m_ui->titleCombo << m_ui->usernameCombo << m_ui->passwordCombo << m_ui->urlCombo
-             << m_ui->notesCombo << m_ui->lastModifiedCombo << m_ui->createdCombo;
+             << m_ui->notesCombo << m_ui->totpCombo << m_ui->iconCombo << m_ui->lastModifiedCombo << m_ui->createdCombo;
 
     for (auto combo : m_combos) {
         combo->setModel(m_comboModel);
@@ -206,17 +208,38 @@ void CsvImportWidget::writeDatabase()
         entry->setUrl(m_parserModel->data(m_parserModel->index(r, 4)).toString());
         entry->setNotes(m_parserModel->data(m_parserModel->index(r, 5)).toString());
 
-        TimeInfo timeInfo;
         if (m_parserModel->data(m_parserModel->index(r, 6)).isValid()) {
-            qint64 lastModified = m_parserModel->data(m_parserModel->index(r, 6)).toString().toLongLong();
-            if (lastModified) {
-                timeInfo.setLastModificationTime(Clock::datetimeUtc(lastModified * 1000));
+            auto totp = Totp::parseSettings(m_parserModel->data(m_parserModel->index(r, 6)).toString());
+            entry->setTotp(totp);
+        }
+
+        bool ok;
+        int icon = m_parserModel->data(m_parserModel->index(r, 7)).toInt(&ok);
+        if (ok) {
+            entry->setIcon(icon);
+        }
+
+        TimeInfo timeInfo;
+        if (m_parserModel->data(m_parserModel->index(r, 8)).isValid()) {
+            auto datetime = m_parserModel->data(m_parserModel->index(r, 8)).toString();
+            if (datetime.contains(QRegularExpression("^\\d+$"))) {
+                timeInfo.setLastModificationTime(Clock::datetimeUtc(datetime.toLongLong() * 1000));
+            } else {
+                auto lastModified = QDateTime::fromString(datetime, Qt::ISODate);
+                if (lastModified.isValid()) {
+                    timeInfo.setLastModificationTime(lastModified);
+                }
             }
         }
-        if (m_parserModel->data(m_parserModel->index(r, 7)).isValid()) {
-            qint64 created = m_parserModel->data(m_parserModel->index(r, 7)).toString().toLongLong();
-            if (created) {
-                timeInfo.setCreationTime(Clock::datetimeUtc(created * 1000));
+        if (m_parserModel->data(m_parserModel->index(r, 9)).isValid()) {
+            auto datetime = m_parserModel->data(m_parserModel->index(r, 9)).toString();
+            if (datetime.contains(QRegularExpression("^\\d+$"))) {
+                timeInfo.setCreationTime(Clock::datetimeUtc(datetime.toLongLong() * 1000));
+            } else {
+                auto created = QDateTime::fromString(datetime, Qt::ISODate);
+                if (created.isValid()) {
+                    timeInfo.setCreationTime(created);
+                }
             }
         }
         entry->setTimeInfo(timeInfo);