Support multiple URLs in a single entry

src/browser/BrowserService.cpp

@@ -389,7 +389,14 @@ QList<Entry*> BrowserService::searchEntries(QSharedPointer<Database> db, const Q
  return entries;
  }
 
- for (Entry* entry : EntrySearcher().search(baseDomain(hostname), rootGroup)) {
+ // XXX: will this include disabled entries or ones in recycle bin?
+ // TODO: check if this is compatible with https://github.com/keepassxreboot/keepassxc/pull/2253
+ for (Entry* entry : rootGroup->entriesRecursive()) {
+ if (matchAdditionalURLs(entry, hostname, url)) {
+ entries.append(entry);
+ continue;
+ }
+
  QString entryUrl = entry->url();
  QUrl entryQUrl(entryUrl);
  QString entryScheme = entryQUrl.scheme();
@@ -405,13 +412,34 @@ QList<Entry*> BrowserService::searchEntries(QSharedPointer<Database> db, const Q
  // Filter to match hostname in URL field
  if ((!entryUrl.isEmpty() && hostname.contains(entryUrl))
  || (matchUrlScheme(entryUrl) && hostname.endsWith(entryQUrl.host()))) {
- entries.append(entry);
+  entries.append(entry);
  }
  }
 
  return entries;
 }
 
+bool BrowserService::matchAdditionalURLs(const Entry* entry, const QString& hostname, const QString& url)
+{
+ for (QString altURL : entry->altURLs()) {
+ // TODO: match port and scheme
+ if (matchUrlScheme(altURL) && hostname.endsWith(QUrl(altURL).host())) {
+ return true;
+ }
+ }
+
+ for (QString regExURL : entry->regExURLs()) {
+ // XXX: does allowing arbitrary URLs bring security issues
+ QRegularExpression rx(regExURL);
+ auto match = rx.match(url);
+ if (match.hasMatch()) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
 QList<Entry*> BrowserService::searchEntries(const QString& url, const StringPairList& keyList)
 {
  // Get the list of databases to search

src/browser/BrowserService.h

@@ -106,6 +106,7 @@ public slots:
  int
  sortPriority(const Entry* entry, const QString& host, const QString& submitUrl, const QString& baseSubmitUrl) const;
  bool matchUrlScheme(const QString& url);
+ bool matchAdditionalURLs(const Entry* entry, const QString& hostname, const QString& url);
  bool removeFirstDomain(QString& hostname);
  QString baseDomain(const QString& url) const;
  QSharedPointer<Database> getDatabase();

src/core/Entry.cpp

@@ -26,6 +26,7 @@
 #include "core/Metadata.h"
 #include "totp/totp.h"
 
+#include <QDebug>
 #include <QDir>
 #include <QRegularExpression>
 #include <utility>
@@ -394,6 +395,41 @@ QSharedPointer<Totp::Settings> Entry::totpSettings() const
  return m_data.totpSettings;
 }
 
+QStringList Entry::additionalURLs(QString key) const
+{
+ QStringList urlList;
+
+ if (m_attributes->hasKey(key)) {
+ urlList = m_attributes->value(key).split('\n', QString::SkipEmptyParts);
+ }
+
+ return urlList;
+}
+
+void Entry::migrateAttributes()
+{
+ renameAttribute("altURLs", "URL_ALT");
+ renameAttribute("regExURLs", "URL_REGEX");
+}
+
+void Entry::renameAttribute(const QString& from, const QString& to)
+{
+ if (m_attributes->hasKey(from)) {
+ qDebug() << "Migrate the attribute" << from << " in entry" << title() << "to" << to;
+ m_attributes->rename(from, to);
+ }
+}
+
+QStringList Entry::altURLs() const
+{
+ return additionalURLs("URL_ALT");
+}
+
+QStringList Entry::regExURLs() const
+{
+ return additionalURLs("URL_REGEX");
+}
+
 void Entry::setUuid(const QUuid& uuid)
 {
  Q_ASSERT(!uuid.isNull());

src/core/Entry.h

@@ -107,6 +107,8 @@ class Entry : public QObject
  QString notes() const;
  QString totp() const;
  QSharedPointer<Totp::Settings> totpSettings() const;
+ QStringList altURLs() const;
+ QStringList regExURLs() const;
 
  bool hasTotp() const;
  bool isExpired() const;
@@ -218,6 +220,8 @@ class Entry : public QObject
  bool canUpdateTimeinfo() const;
  void setUpdateTimeinfo(bool value);
 
+ void migrateAttributes();
+
 signals:
  /**
  * Emitted when a default attribute has been changed.
@@ -240,6 +244,8 @@ private slots:
  static EntryReferenceType referenceType(const QString& referenceStr);
 
  template <class T> bool set(T& property, const T& value);
+ QStringList additionalURLs(QString key) const;
+ void renameAttribute(const QString& from, const QString& to);
 
  QUuid m_uuid;
  EntryData m_data;

src/format/KdbxXmlWriter.cpp

@@ -251,6 +251,10 @@ void KdbxXmlWriter::writeRoot()
 
  m_xml.writeStartElement("Root");
 
+ for (Entry* entry : m_db->rootGroup()->entriesRecursive()) {
+ entry->migrateAttributes();
+ }
+
  writeGroup(m_db->rootGroup());
  writeDeletedObjects();