Use the in-memory buffer for loading add-ons (#10960)

Author: bakulf

src/addons/manager/addonindex.cpp

@@ -264,7 +264,7 @@ QList<AddonData> AddonIndex::extractAddonsFromIndex(
     QJsonObject addon = item.toObject();
     addons.append(
         {QByteArray::fromHex(addon["sha256"].toString().toLocal8Bit()),
-         addon["id"].toString(), nullptr});
+         QByteArray(), addon["id"].toString(), nullptr});
   }
 
   return addons;

src/addons/manager/addonindex.h

@@ -23,6 +23,7 @@ constexpr const char* ADDON_INDEX_SIGNATURE_FILENAME = "manifest.json.sig";
 // addon does not need to be loaded for unmatched conditions.
 struct AddonData {
   QByteArray m_sha256;
+  QByteArray m_buffer;
   QString m_addonId;
   Addon* m_addon;
 };

src/addons/manager/addonmanager.cpp

@@ -204,12 +204,9 @@ void AddonManager::unload(const QString& addonId) {
       addon->disable();
     }
 
-    QDir dir;
-    if (m_addonDirectory.getDirectory(&dir)) {
-      QString addonFileName(QString("%1.rcc").arg(addonId));
-      QString addonFilePath(dir.filePath(addonFileName));
-      QResource::unregisterResource(addonFilePath, mountPath(addonId));
-    }
+    QResource::unregisterResource(
+        reinterpret_cast<const uchar*>(m_addons[addonId].m_buffer.constData()),
+        mountPath(addonId));
 
     addon->deleteLater();
   }
@@ -242,41 +239,43 @@ bool AddonManager::validateAndLoad(const QString& addonId,
     return false;
   }
 
-  m_addons.insert(addonId, {QByteArray(), addonId, nullptr});
+  m_addons.insert(addonId, {QByteArray(), QByteArray(), addonId, nullptr});
 
   QString addonFileName(QString("%1.rcc").arg(addonId));
 
   QDir dir;
   if (!m_addonDirectory.getDirectory(&dir)) {
     return false;
   }
-  QString addonFilePath(dir.filePath(addonFileName));
+  QByteArray addonFileContents;
+  if (!m_addonDirectory.readFile(addonFileName, &addonFileContents)) {
+    return false;
+  }
 
   // Hash validation
-  if (checkSha256) {
-    QByteArray addonFileContents;
-
-    if (!m_addonDirectory.readFile(addonFileName, &addonFileContents)) {
-      return false;
-    }
-
-    if (QCryptographicHash::hash(addonFileContents,
-                                 QCryptographicHash::Sha256) != sha256) {
-      logger.warning() << "Addon hash does not match" << addonId;
-      return false;
-    }
+  if (checkSha256 &&
+      QCryptographicHash::hash(addonFileContents, QCryptographicHash::Sha256) !=
+          sha256) {
+    logger.warning() << "Addon hash does not match" << addonId;
+    return false;
   }
 
   m_addons[addonId].m_sha256 = sha256;
+  m_addons[addonId].m_buffer = addonFileContents;
+
   QString addonMountPath = mountPath(addonId);
 
-  if (!QResource::registerResource(addonFilePath, addonMountPath)) {
+  if (!QResource::registerResource(reinterpret_cast<const uchar*>(
+                                       m_addons[addonId].m_buffer.constData()),
+                                   addonMountPath)) {
     logger.warning() << "Unable to load resource from file" << addonId;
     return false;
   }
 
   if (!loadManifest(QString(":%1/manifest.json").arg(addonMountPath))) {
-    QResource::unregisterResource(addonFilePath, addonMountPath);
+    QResource::unregisterResource(
+        reinterpret_cast<const uchar*>(m_addons[addonId].m_buffer.constData()),
+        addonMountPath);
     return false;
   }